From 2310333a60b3f9133098a07c49696bf25e5e48b2 Mon Sep 17 00:00:00 2001
From: milk <53408947@qq.com>
Date: Wed, 22 Oct 2025 19:17:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  21 ------------------
 Module/FlaskService.py                        |  19 ++++++----------
 .../__pycache__/FlaskService.cpython-312.pyc  | Bin 31940 -> 31820 bytes
 Utils/ControlUtils.py                         |  13 +++++++++++
 4 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 11266f0..4fec44a 100644
--- a/.idea/workspace.xml
+++ b/.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" />
diff --git a/Module/FlaskService.py b/Module/FlaskService.py
index a4e4f3a..8617680 100644
--- a/Module/FlaskService.py
+++ b/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_up()
-    elif direction == 2:
-        session.swipe_left()
-    elif direction == 3:
-        session.swipe_down()
-    else:
-        session.swipe_right()
+    session.swipe(sx, sy, ex, ey, duration)
     return ResultData(data="").toJson()
 
 
diff --git a/Module/__pycache__/FlaskService.cpython-312.pyc b/Module/__pycache__/FlaskService.cpython-312.pyc
index b8ca36e864741e4bae96ecd0d197e2b9c4c239df..888c39eada1759e3d316091e8a0294f4a8da5ee0 100644
GIT binary patch
delta 1606
zcma)+dr;I>6vw&0-QTj07RVM_dAB?lW<iHxL`ViSib9k^?Fj_#f)E1T-y)A$C#4uG
zM_4=}sQp1H8uA$F8seZf4mHhGQ#tk^W>73*WX7DG><^myqjPpKVWvO2GyB<d&$;(^
z?)lyC`F;8)`)ZLHzcd>4emH6`F7A4K)c8j%tAOm9t?+itbMVAdX0=_itANGFK<YXj
zT(HM6oQ0X7Dn8Ko2<@X`*9`eXs4c-?yM;S&4qwD4LW3;|LK5oOyU<r_g1*>D$V-U^
zPr}Q3e_W!%-@UIf6F`r>5}u7qll@)(HAc8)2-WP>y0kTcz#OI^ySADQGF*&<`MI=|
z+~QKX)GpbjaY=*n{gCs)X>>z+I!&^{cbaLfy^)tYtLy8gC8ZgEEz^<%{~ay71$T1^
z0S;SwzN|D=H#m48IbT6ob-bQzDv9qWv=QDUyhUgy>>;=iiVhKt1Fj{R^#^crjlAPa
z^&4Tz5|BQnGj^KaF}q_AM(*4AKPPjLo|0;sRT~Zz?k{v(+!ei+-ip4&@6^eMV?xDf
za<(KN#7uL*)+UIsl&cbR!_1mc{SkC>!ta8uRY|M^<TNV-NKLckcT?=&N(ba+l^&%~
z51|*K&>N<zqIm}SPTYrtx1uOZ#RZ6ov@^`$rr>5m7wk^Y*Ldg0U?M$I{s6s!;zqhr
z%?`nx^#zF?v@DCT9kH;0iWrc5n`xWX%ncOmgR)FBI}FX4$-!sILHEp85mE>M<C*cS
z8*XN%Mtn$)0fP6+Ru%$x3qm0;D@Yc&V6}KD>t{7P1sie_-{_|urwL~W^ptJB$9NO2
zJSZQeHA4t%$kGYPVI-6jULZV1AU*J5!U*9%PmckZ%Zc+A@TkPkfv3O>S-HXT7)J8M
z_S{s7orU&IN%BQ>>=x%Y{mp!@wF}1b*0W*o<R!?TV60JuKe<cAj*0fC!<gnOdiW%q
zex^gyg{E~Cyl#tul7dU}w>WJVk(;lmP!Ka)vsoX67e$~fGK(UDR?33E2USI}@^##C
zUbu@|B=$MvRs};;aYE4dl;8)#kAy3*qu3(<gyv^rZ*i7NzK!N}ae2o^&BK?`Y}GY7
zD{UDzrMimGKu}3i1ii<`hY<6}+va=v=DW|$9~$A8(6NR0!}BE>(t-qCCC!*qU)sxV
z!O7CN_&XTpzaggeb&jSo#aZrbRQNnORQCFvd>zF<g1e<5>>H5FGTE;prz}p*B1GlR
zW;KgHd9zAlg<`h)0y9qHT2x#(>KNbDsn=e`OmgjuY!b?9v)DFqqBdN@$#`8727all
zW>uoFejhW8QjR5MPc>LrtN5#-pRoyepPN`GjB)C*SsrEZ>ThYGUJ2K<;g?2frH&Cf
zN+rwa#0Ocm%cQeR)fk#qI~|JiL6ce~Uy~k%8_w12h*)$Ev!HQ0jJG9BWR1Ybd)yo7
z+r#OT;O%~2%ToVwl0GM8aZ(c}*>KVWrz_@kd;GR&Yno?)I+l1(<tHV3B(yxCu*PKy
S4Dk7E9tkZ^tT^71r1}TZ>bJoF

delta 1909
zcmZ`(eN0nV6z_fQqaWB&q$;$4r9vs-15-5uD#IDf#HovJ%gp>jTT6wNdf!9Db&6~W
z#)u-v4`eRU_%%fl_qGs?PPVXwII~FnB8_v-I2=pHSlr@F_Q%d?l_kdAq`&^|@0@e*
zIrp7=ul>z>pEC1zX0u6y<AW_vD)*l^|Cz~-K}FtTNSKxmHCf}66*F0Bc!drYV@#u%
z!7;=7KgO^C*XN~awP7tVyH)4adUbFmYZ4Qo$(;dL-6l~CYu6{iPwpgexn41ki>-<~
z=+78ng(ur#T*Q4SZk`~$d_axM4WD=t!6+p#C#bFs>?mYRbwX!mLdsp8@w#c!O<g9E
z?XHg(j?UqllmT_w@0oPCwibVnd$80Ea5}>Q?emhN33p-Qy08ulu%=St0rp?fVZkd_
zxiuP|hz`u2I+kgIvrvqCE@Dkb<Wx)0g`$2`97keY&=S_Ip8#LWX$dK#^%~9?I~X{Y
zWfta`VkJk6-T?QlRRT3ZUXOlUAh00}5gVek`AmYh5prIEr;~HH%5{N|Z&ht5Vv4b9
z-#X<v_tw+}Bk?hv2mF-^PoU`K6fN=^;&jw}8^K0`FoG;1IB4)fWX~3u6U%EmDmTgL
zON0i^Luisx%@*qc!yZGM{e~s0VLn`vrj*^+TUzEcZW%Bn+%Y8g8<KAsYy-xzEfqV`
zqmr%PV7p~VeTj6RBJBMJ`%Oby>m-|6lvg5%J8`ceH7xxiWbHv3(Y`PHWj(TJme2C!
z`%s9&69`M$YS)yzjO~VIPY&A)-5w{~4-t<o?f`kUK{HP_9U@AgS5v2c&*Euq{suuS
z{59?M{OG(L=Q1@7?G-x^ldRN)magT2kiw6m#fn!$UPC>oHcubavR$AQEx@gNifk@g
zBPW^1;~zglKv#-a5WGuZAb{55ym1}Gk_g5U<P+?L(qb1T?k_H|og(2hLG+u&>Y(XC
z=qi@PFOa6I4~ie?*m3ywRd?wLvYjOOjDW)5ip58F+D+nUGx0MtJ&TYt{#mjhm8MPX
zB>5b{%hL;#x^4T(Jla@1m!=ZIdFUvW#BQYJ>JOy_0_y<t++6V@+0<Ec|6y^_6K;i)
zvLe<Ao654q9<*&%kCjzwS-WbUZ)b7ekasWSm+xY&aJl?pd_M|1=){{C?4II)vzaFK
z_JUnnJaFIQ5*-~f9P-%m_flX1Ld48{q3ZgDK3T5t`(&O-h8L3l6n<ZvDN<u!P?O)R
z7lb|yYzSK6<dSU5ZSucEFhFnx?k#beB1o@N7LBk?va0Dzomz1SwE?y4o!8<Lze2j%
zSgWj)3MDz<=l7s(d2SjVa_ty|!S=?%1BVCqbqzLm^2;bJ;wRw8<%I%ogp?JVSRb^m
zXk!l`Z)Mi(-_Xp55hA9buWpsBR4BDFe?)@TTeFtWAiGLaeI2g|g?v1suMK%C6rY!0
zhvt>V>{qpKWtNUP)!{XpbS&?v-!HHwYGt6CnR_wrl)zK55<KL|RjYC9=Bj0^7amp3
zj9Z4!j=YZwgyG;!wXV94p`|pKi(Xa1fKV;Khf=aS9Q3pJ&nb=Q_iTsNAt&3aeiS;+
z#$Q6Ymb(AZrHemz?Qzt4176+&C7f<$C7<Yy_Hir@y<T{GxQ7xWXj0Gdt&FumfnvkR
za>Z_^NSPkS=MTViawa&aHYjJA<pSDbH_A%v9L(O>GMgSSzLOyOUPRvjy2P9=5bq|4
zHfRqq>NQSX!RdSRA=Okj$UI}1`>|Fd<c$c(MjRSJY)aXdvc2T+yu*bJDL2^UKLkt6
PMH(SC;#QsYx!QjLc1Z`U

diff --git a/Utils/ControlUtils.py b/Utils/ControlUtils.py
index 4f03b7b..c708854 100644
--- a/Utils/ControlUtils.py
+++ b/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)
+    
\ No newline at end of file