From a0fe54d504435f085438e486e1d61e4edc13ab3e Mon Sep 17 00:00:00 2001
From: milk <53408947@qq.com>
Date: Tue, 21 Oct 2025 18:19:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=A7=E5=88=B6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |   3 ++-
 Module/FlaskService.py                        |  15 +++++++++------
 .../__pycache__/FlaskService.cpython-312.pyc  | Bin 29797 -> 30029 bytes
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4d4d9c7..e2bb223 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,7 +5,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="eceeff5e-51c1-459c-a911-d21ec090a423" name="Changes" comment="20250904-初步功能已完成">
-      <change beforePath="$PROJECT_DIR$/Module/DeviceInfo.py" beforeDir="false" afterPath="$PROJECT_DIR$/Module/DeviceInfo.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Module/FlaskService.py" beforeDir="false" afterPath="$PROJECT_DIR$/Module/FlaskService.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/Module/FlaskService.py b/Module/FlaskService.py
index 7cdc8ed..0d80379 100644
--- a/Module/FlaskService.py
+++ b/Module/FlaskService.py
@@ -17,7 +17,7 @@ from Entity.ResultData import ResultData
 from Utils.ControlUtils import ControlUtils
 from Utils.ThreadManager import ThreadManager
 from script.ScriptManager import ScriptManager
-from Entity.Variables import addModelToAnchorList
+from Entity.Variables import addModelToAnchorList, wdaFunctionPort
 import Entity.Variables as ev
 from Utils.JsonUtils import JsonUtils
 
@@ -185,7 +185,7 @@ def launchApp():
 def toHome():
     body = request.get_json()
     udid = body.get("udid")
-    client = wda.USBClient(udid)
+    client = wda.USBClient(udid, wdaFunctionPort)
     client.home()
     return ResultData(data="").toJson()
 
@@ -195,7 +195,10 @@ def toHome():
 def tapAction():
     body = request.get_json()
     udid = body.get("udid")
-    client = wda.USBClient(udid)
+    client = wda.USBClient(udid, wdaFunctionPort)
+    print("-----------------------")
+    print(client)
+    print("-----------------------")
     session = client.session()
     session.appium_settings({"snapshotMaxDepth": 0})
     x = body.get("x")
@@ -210,7 +213,7 @@ def swipeAction():
     body = request.get_json()
     udid = body.get("udid")
     direction = body.get("direction")
-    client = wda.USBClient(udid)
+    client = wda.USBClient(udid, wdaFunctionPort)
     session = client.session()
     session.appium_settings({"snapshotMaxDepth": 0})
 
@@ -232,7 +235,7 @@ def longPressAction():
     udid = body.get("udid")
     x = body.get("x")
     y = body.get("y")
-    client = wda.USBClient(udid)
+    client = wda.USBClient(udid, wdaFunctionPort)
     session = client.session()
     session.appium_settings({"snapshotMaxDepth": 5})
     session.tap_hold(x, y, 1.0)
@@ -375,7 +378,7 @@ def addTempAnchorData():
 def getChatTextInfo():
     data = request.get_json()
     udid = data.get("udid")
-    client = wda.USBClient(udid)
+    client = wda.USBClient(udid, wdaFunctionPort)
     session = client.session()
     xml = session.source()
     try:
diff --git a/Module/__pycache__/FlaskService.cpython-312.pyc b/Module/__pycache__/FlaskService.cpython-312.pyc
index 8a3cbf35e4add56d9d2712fab24696bb26c9b273..6a814941ade3131ce533c77ec5c298184428b9ca 100644
GIT binary patch
delta 5637
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
ZY~uaaVlp>eGehf|C$V6l(qhGV{{b#SHUIzs

delta 5335
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