临时提交

.idea/workspace.xml

@@ -5,30 +5,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="eceeff5e-51c1-459c-a911-d21ec090a423" name="Changes" comment="20250904-初步功能已完成">
-      <change afterPath="$PROJECT_DIR$/Utils/TencentOCRUtils.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/git_toolbox_blame.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/git_toolbox_prj.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/iOSAI.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/iOSAI.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/jsLibraryMappings.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Entity/Variables.py" beforeDir="false" afterPath="$PROJECT_DIR$/Entity/Variables.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Module/DeviceInfo.py" beforeDir="false" afterPath="$PROJECT_DIR$/Module/DeviceInfo.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Module/FlaskService.py" beforeDir="false" afterPath="$PROJECT_DIR$/Module/FlaskService.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Module/IOSActivator.py" beforeDir="false" afterPath="$PROJECT_DIR$/Module/IOSActivator.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Utils/AiUtils.py" beforeDir="false" afterPath="$PROJECT_DIR$/Utils/AiUtils.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Utils/ControlUtils.py" beforeDir="false" afterPath="$PROJECT_DIR$/Utils/ControlUtils.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Utils/IOSAIStorage.py" beforeDir="false" afterPath="$PROJECT_DIR$/Utils/IOSAIStorage.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Utils/JsonUtils.py" beforeDir="false" afterPath="$PROJECT_DIR$/Utils/JsonUtils.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Utils/Requester.py" beforeDir="false" afterPath="$PROJECT_DIR$/Utils/Requester.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Utils/ThreadManager.py" beforeDir="false" afterPath="$PROJECT_DIR$/Utils/ThreadManager.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build.bat" beforeDir="false" afterPath="$PROJECT_DIR$/build.bat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/requirements.txt" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/script/ScriptManager.py" beforeDir="false" afterPath="$PROJECT_DIR$/script/ScriptManager.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

Module/FlaskService.py

@@ -197,9 +197,6 @@ def tapAction():
     body = request.get_json()
     udid = body.get("udid")
     client = wda.USBClient(udid, wdaFunctionPort)
-    print("-----------------------")
-    print(client)
-    print("-----------------------")
     session = client.session()
     session.appium_settings({"snapshotMaxDepth": 0})
     x = body.get("x")
@@ -213,19 +210,17 @@ def tapAction():
 def swipeAction():
     body = request.get_json()
     udid = body.get("udid")
-    direction = body.get("direction")
+    duration = body.get("duration") # 时长
+    sx = body.get("sx") # 起始X点
+    sy = body.get("sy") # 起始Y点
+    ex = body.get("ex") # 结束X点
+    ey = body.get("ey") # 结束Y点
+
     client = wda.USBClient(udid, wdaFunctionPort)
     session = client.session()
     session.appium_settings({"snapshotMaxDepth": 0})
 
-    if direction == 1:
+    session.swipe(sx, sy, ex, ey, duration)
-        session.swipe_up()
-    elif direction == 2:
-        session.swipe_left()
-    elif direction == 3:
-        session.swipe_down()
-    else:
-        session.swipe_right()
     return ResultData(data="").toJson()
 
 

Utils/ControlUtils.py

@@ -6,6 +6,8 @@ from typing import Tuple, List
 import tidevice
 import wda
 from wda import Client
+
+from Entity.Variables import wdaFunctionPort
 from Utils.AiUtils import AiUtils
 from Utils.LogManager import LogManager
 
@@ -280,3 +282,14 @@ class ControlUtils(object):
         print("开始微滑动")
         session.swipe(center_x, center_y, end_x, end_y, duration_ms / 1000)
         print("随机微滑动：", trajectory)
+
+    # 向上滑动 脚本内部使用
+    def swipe_up(self, udid):
+        dev = wda.USBClient(udid, wdaFunctionPort)
+        dev.swipe(200,350,200,250,0.05)
+
+    # 向下滑动，脚本内使用
+    def swipe_down(self, udid):
+        dev = wda.USBClient(udid, wdaFunctionPort)
+        dev.swipe(200,250,200,350,0.05)
+