From d7e1d993fb193c8950f145824fa95fa0c47689b6 Mon Sep 17 00:00:00 2001
From: zhangkai <2403741920@qq.com>
Date: Thu, 18 Sep 2025 13:07:11 +0800
Subject: [PATCH] =?UTF-8?q?20250904-=E5=88=9D=E6=AD=A5=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml     |  44 +++++++---------
 Module/DeviceInfo.py    | 109 +++++++++++++++++++++++++---------------
 Utils/ControlUtils.py   |  91 +++++++++++++++++++++++----------
 script/ScriptManager.py |  14 +++---
 4 files changed, 158 insertions(+), 100 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 54c1336..e052e9d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,6 +8,7 @@
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Module/DeviceInfo.py" beforeDir="false" afterPath="$PROJECT_DIR$/Module/DeviceInfo.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Utils/ControlUtils.py" beforeDir="false" afterPath="$PROJECT_DIR$/Utils/ControlUtils.py" afterDir="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" />
@@ -58,7 +59,6 @@
     &quot;Python.123.executor&quot;: &quot;Run&quot;,
     &quot;Python.Main.executor&quot;: &quot;Run&quot;,
     &quot;Python.Test.executor&quot;: &quot;Run&quot;,
-    &quot;Python.test.executor&quot;: &quot;Run&quot;,
     &quot;Python.tidevice_entry.executor&quot;: &quot;Run&quot;,
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
     &quot;RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252&quot;: &quot;true&quot;,
@@ -67,7 +67,7 @@
     &quot;git-widget-placeholder&quot;: &quot;main&quot;,
     &quot;javascript.nodejs.core.library.configured.version&quot;: &quot;20.17.0&quot;,
     &quot;javascript.nodejs.core.library.typings.version&quot;: &quot;20.17.58&quot;,
-    &quot;last_opened_file_path&quot;: &quot;F:/company code/AI item/20250820/iOSAI&quot;,
+    &quot;last_opened_file_path&quot;: &quot;C:/Users/zhangkai/Desktop/20250916部署的ios项目/iOSAI&quot;,
     &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
     &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
     &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
@@ -176,31 +176,8 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
-      <module name="iOSAI" />
-      <option name="ENV_FILES" value="" />
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs>
-        <env name="PYTHONUNBUFFERED" value="1" />
-      </envs>
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Utils" />
-      <option name="IS_MODULE_SDK" value="true" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Utils/test.py" />
-      <option name="PARAMETERS" value="" />
-      <option name="SHOW_COMMAND_LINE" value="false" />
-      <option name="EMULATE_TERMINAL" value="false" />
-      <option name="MODULE_MODE" value="false" />
-      <option name="REDIRECT_INPUT" value="false" />
-      <option name="INPUT_FILE" value="" />
-      <method v="2" />
-    </configuration>
     <recent_temporary>
       <list>
-        <item itemvalue="Python.test" />
         <item itemvalue="Python.123" />
         <item itemvalue="Python.Test" />
         <item itemvalue="Python.12" />
@@ -210,7 +187,8 @@
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-python-sdk-ce6832f46686-7b97d883f26b-com.jetbrains.pycharm.pro.sharedIndexes.bundled-PY-252.25557.178" />
+        <option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-PY-241.18034.82" />
+        <option value="bundled-python-sdk-975db3bf15a3-2767605e8bc2-com.jetbrains.pycharm.pro.sharedIndexes.bundled-PY-241.18034.82" />
       </set>
     </attachedChunks>
   </component>
@@ -276,6 +254,18 @@
       <workItem from="1757506636968" duration="5910000" />
       <workItem from="1757567423145" duration="16668000" />
       <workItem from="1757998910052" duration="3676000" />
+      <workItem from="1758085730865" duration="22351000" />
+      <workItem from="1758111847989" duration="1885000" />
+      <workItem from="1758116448324" duration="460000" />
+      <workItem from="1758116914311" duration="5000" />
+      <workItem from="1758117364857" duration="749000" />
+      <workItem from="1758118132336" duration="9000" />
+      <workItem from="1758119195558" duration="42000" />
+      <workItem from="1758119325860" duration="22000" />
+      <workItem from="1758120216359" duration="1499000" />
+      <workItem from="1758121819681" duration="179000" />
+      <workItem from="1758122107459" duration="653000" />
+      <workItem from="1758171695502" duration="333000" />
     </task>
     <task id="LOCAL-00001" summary="ai 开始测试">
       <option name="closed" value="true" />
@@ -356,7 +346,7 @@
     <SUITE FILE_PATH="coverage/iOSAI$123__1_.coverage" NAME="123 (1) 覆盖结果" MODIFIED="1756897091135" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/iOSAI$tidevice_entry.coverage" NAME="tidevice_entry 覆盖结果" MODIFIED="1757061969626" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/iOSAI$ScriptManager.coverage" NAME="ScriptManager 覆盖结果" MODIFIED="1756896057801" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/script" />
-    <SUITE FILE_PATH="coverage/iOSAI$Main.coverage" NAME="Main 覆盖结果" MODIFIED="1758002271600" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
+    <SUITE FILE_PATH="coverage/iOSAI$Main.coverage" NAME="Main 覆盖结果" MODIFIED="1758117454432" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
     <SUITE FILE_PATH="coverage/iOSAI$123.coverage" NAME="123 覆盖结果" MODIFIED="1758002344317" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Module/DeviceInfo.py b/Module/DeviceInfo.py
index 4182e26..abf031f 100644
--- a/Module/DeviceInfo.py
+++ b/Module/DeviceInfo.py
@@ -30,12 +30,14 @@ class Deviceinfo(object):
 
         self._lock = threading.Lock()
         self._model_index: Dict[str, DeviceModel] = {}  # udid -> model
-        # ✅ 1. 失踪时间戳记录（替代原来的 miss_count）
-        self._last_seen: Dict[str, float] = {}
-        self._port_pool: List[int] = []
-        self._port_in_use: set[int] = set()
+        self._miss_count: Dict[str, int] = {}           # udid -> 连续未扫描到次数
+        self._port_pool: List[int] = []                 # 端口回收池
+        self._port_in_use: set[int] = set()             # 正在使用的端口
 
-        # region iproxy 初始化（原逻辑不变）
+        # 🔥1. 启动 WDA 健康检查线程
+        # threading.Thread(target=self._wda_health_checker, daemon=True).start()
+
+        # region iproxy 初始化
         try:
             self.iproxy_path = self._iproxy_path()
             self.iproxy_dir = self.iproxy_path.parent
@@ -83,11 +85,7 @@ class Deviceinfo(object):
             LogManager.error(f"初始化 iproxy 失败：{e}")
         # endregion
 
-    # ------------------------------------------------------------------
-    # ✅ 2. 主监听循环（已用“时间窗口+USB 层兜底”重写）
-    # ------------------------------------------------------------------
     def startDeviceListener(self):
-        MISS_WINDOW = 5.0          # 5 秒连续失踪才判死刑
         while True:
             try:
                 lists = Usbmux().device_list()
@@ -97,23 +95,24 @@ class Deviceinfo(object):
                 continue
 
             now_udids = {d.udid for d in lists if d.conn_type == ConnectionType.USB}
-            # ✅ USB 层真断兜底
-            usb_sn_set = self._usb_enumerate_sn()
 
-            need_remove = None
+            # 1. 失踪登记 & 累加
+            need_remove = None  # ← 新增：放锁外记录
             with self._lock:
                 for udid in list(self._model_index.keys()):
                     if udid not in now_udids:
-                        last = self._last_seen.get(udid, time.time())
-                        if time.time() - last > MISS_WINDOW and udid not in usb_sn_set:
-                            need_remove = udid
+                        self._miss_count[udid] = self._miss_count.get(udid, 0) + 1
+                        if self._miss_count[udid] >= 3:
+                            self._miss_count.pop(udid, None)
+                            need_remove = udid  # ← 只记录，不调用
                     else:
-                        self._last_seen[udid] = time.time()
+                        self._miss_count.pop(udid, None)
 
+            # 🔓 锁已释放，再删设备（不会重入）
             if need_remove:
                 self._remove_model(need_remove)
 
-            # 新增设备（原逻辑不变）
+            # 2. 全新插入（只处理未在线且信任且未满）
             for d in lists:
                 if d.conn_type != ConnectionType.USB:
                     continue
@@ -132,22 +131,14 @@ class Deviceinfo(object):
 
             time.sleep(1)
 
-    # ------------------------------------------------------------------
-    # ✅ 3. USB 层枚举 SN（跨平台）
-    # ------------------------------------------------------------------
-    def _usb_enumerate_sn(self) -> set[str]:
-        try:
-            out = subprocess.check_output(["idevice_id", "-l"], text=True, timeout=3)
-            return {line.strip() for line in out.splitlines() if line.strip()}
-        except Exception:
-            return set()
-
-    # ===================== 以下代码与原文件完全一致 =====================
+    # 🔥2. WDA 健康检查
     def _wda_health_checker(self):
         while True:
             time.sleep(1)
+            print(len(self.deviceModelList))
             with self._lock:
-                online = [m for m in self.deviceModelList if m.ready]
+                online = [m for m in self.deviceModelList if m.ready]  # ← 只检查就绪的
+                print(len(online))
             for model in online:
                 udid = model.deviceId
                 if not self._wda_ok(udid):
@@ -156,24 +147,32 @@ class Deviceinfo(object):
                         self._remove_model(udid)
                     self.connectDevice(udid)
 
+    # 🔥3. 真正做 health-check 的地方
     def _wda_ok(self, udid: str) -> bool:
+        """返回 True 表示 WDA 活着，False 表示已死"""
         try:
+            # 用 2 秒超时快速探测
             c = wda.USBClient(udid, 8100)
+            # 下面这句就是“xctest launched but check failed” 的触发点
+            # 如果 status 里返回了 WebDriverAgent 运行信息就认为 OK
             st = c.status()
             if st.get("state") != "success":
                 return False
+            # 你也可以再苛刻一点，多做一次 /wda/healthcheck
+            # c.http.get("/wda/healthcheck")
             return True
         except Exception as e:
+            # 任何异常（连接拒绝、超时、json 解析失败）都认为已死
             LogManager.error(f"WDA health-check 异常：{e}", udid)
             return False
 
-    # -------------------- 增删改查唯一入口（未改动） --------------------
+    # region ===================== 增删改查唯一入口（线程安全） =====================
     def _has_model(self, udid: str) -> bool:
         return udid in self._model_index
 
     def _add_model(self, model: DeviceModel):
         if model.deviceId in self._model_index:
-            return
+            return  # 防重复
         model.ready = True
         self.deviceModelList.append(model)
         self._model_index[model.deviceId] = model
@@ -181,48 +180,60 @@ class Deviceinfo(object):
             self.manager.send(model.toDict())
         except Exception as e:
             LogManager.warning(f"{model.deviceId} 发送上线事件失败：{e}")
-        LogManager.method_info(f"{model.deviceId} 加入设备成功，当前在线数：{len(self.deviceModelList)}", method="device_count")
+        LogManager.method_info(f"{model.deviceId} 加入设备成功，当前在线数：{len(self.deviceModelList)}",method="device_count")
 
+
+    # 删除设备
     def _remove_model(self, udid: str):
         print(f"【删】进入删除方法  udid={udid}")
         LogManager.method_info(f"【删】进入删除方法  udid={udid}", method="device_count")
+        # 1. 纯内存临界区——毫秒级
         with self._lock:
             print(f"【删】拿到锁  udid={udid}")
-            LogManager.method_info(f"【删】拿到锁  udid={udid}", method="device_count")
+            LogManager.method_info(f"【删】拿到锁  udid={udid}",
+                                   method="device_count")
             model = self._model_index.pop(udid, None)
             if not model:
                 print(f"【删】模型已空，直接返回  udid={udid}")
-                LogManager.method_info(f"【删】模型已空，直接返回  udid={udid}", method="device_count")
+                LogManager.method_info(f"【删】模型已空，直接返回  udid={udid}",method="device_count")
                 return
             if model.deleting:
                 print(f"【删】正在删除中，幂等返回  udid={udid}")
                 LogManager.method_info(method="device_count", text=f"【删】正在删除中，幂等返回  udid={udid}")
                 return
             model.deleting = True
+            # 标记维删除设备
             model.type = 2
             print(f"【删】标记 deleting=True  udid={udid}")
-            LogManager.method_info("【删】标记 deleting=True  udid={udid}", "device_count")
+            LogManager.method_info("【删】标记 deleting=True  udid={udid}","device_count")
+            # 过滤列表
             before = len(self.deviceModelList)
             self.deviceModelList = [m for m in self.deviceModelList if m.deviceId != udid]
             after = len(self.deviceModelList)
             print(f"【删】列表过滤  before={before} → after={after}  udid={udid}")
-            LogManager.method_info(f"【删】列表过滤  before={before} → after={after}  udid={udid}", "device_count")
+            LogManager.method_info(f"【删】列表过滤  before={before} → after={after}  udid={udid}","device_count")
+
+            # 端口
             self._port_in_use.discard(model.screenPort)
             self._port_pool.append(model.screenPort)
             print(f"【删】回收端口  port={model.screenPort}  udid={udid}")
             LogManager.method_info(f"【删】回收端口  port={model.screenPort}  udid={udid}", method="device_count")
+
+            # 进程
             to_kill = [item for item in self.pidList if item.get("id") == udid]
             self.pidList = [item for item in self.pidList if item.get("id") != udid]
             print(f"【删】待杀进程数  count={len(to_kill)}  udid={udid}")
             LogManager.method_info(f"【删】待杀进程数  count={len(to_kill)}  udid={udid}", method="device_count")
 
+        # 2. IO 区无锁
         for idx, item in enumerate(to_kill, 1):
             print(f"【删】杀进程  {idx}/{len(to_kill)}  pid={item.get('target').pid}  udid={udid}")
-            LogManager.method_info(f"【删】杀进程  {idx}/{len(to_kill)}  pid={item.get('target').pid}  udid={udid}", method="device_count")
+            LogManager.method_error(f"【删】杀进程  {idx}/{len(to_kill)}  pid={item.get('target').pid}  udid={udid}", method="device_count")
             self._terminate_proc(item.get("target"))
         print(f"【删】进程清理完成  udid={udid}")
         LogManager.method_info(f"【删】进程清理完成  udid={udid}", method="device_count")
 
+        # 3. 网络 IO
         retry = 3
         while retry:
             try:
@@ -244,7 +255,7 @@ class Deviceinfo(object):
         print(len(self.deviceModelList))
         LogManager.method_info(f"当前剩余设备数量：{len(self.deviceModelList)}", method="device_count")
 
-    # -------------------- 端口分配与回收（未改动） --------------------
+    # region ===================== 端口分配与回收 =====================
     def _alloc_port(self) -> int:
         if self._port_pool:
             port = self._port_pool.pop()
@@ -258,17 +269,20 @@ class Deviceinfo(object):
         if port in self._port_in_use:
             self._port_in_use.remove(port)
             self._port_pool.append(port)
+    # endregion
 
-    # -------------------- 单台设备连接（未改动） --------------------
+    # region ===================== 单台设备连接 =====================
     def connectDevice(self, udid: str):
         if not self.is_device_trusted(udid):
             LogManager.warning("设备未信任，跳过 WDA 启动", udid)
             return
+
         try:
             d = wda.USBClient(udid, 8100)
         except Exception as e:
             LogManager.error(f"启动 WDA 失败: {e}", udid)
             return
+
         width, height, scale = 0, 0, 1.0
         try:
             size = d.window_size()
@@ -276,21 +290,26 @@ class Deviceinfo(object):
             scale = d.scale
         except Exception as e:
             LogManager.warning(f"读取屏幕信息失败：{e}", udid)
+
         port = self._alloc_port()
         model = DeviceModel(udid, port, width, height, scale, type=1)
         self._add_model(model)
+
         try:
             d.app_start(WdaAppBundleId)
             d.home()
         except Exception as e:
             LogManager.warning(f"启动/切回桌面失败：{e}", udid)
+
         time.sleep(2)
+
+        # 先清旧进程再启动新进程
         self.pidList = [item for item in self.pidList if item.get("id") != udid]
         target = self.relayDeviceScreenPort(udid, port)
         if target:
             self.pidList.append({"target": target, "id": udid})
 
-    # -------------------- 工具方法（未改动） --------------------
+    # region ===================== 工具方法 =====================
     def is_device_trusted(self, udid: str) -> bool:
         try:
             d = BaseDevice(udid)
@@ -300,16 +319,22 @@ class Deviceinfo(object):
             return False
 
     def relayDeviceScreenPort(self, udid: str, port: int) -> Optional[subprocess.Popen]:
+        """启动 iproxy 前：端口若仍被占用则先杀掉占用者，再启动"""
         if not self._spawn_iproxy:
             LogManager.error("iproxy 启动器未就绪", udid)
             return None
+
+        # --- 新增：端口冲突检查 + 强制清理 ---
         while self._port_in_use and self._is_port_open(port):
+            # 先查是哪个进程占用
             pid = self._get_pid_by_port(port)
             if pid and pid != os.getpid():
                 LogManager.warning(f"端口 {port} 仍被 PID {pid} 占用，尝试释放", udid)
                 self._kill_pid_gracefully(pid)
             else:
                 break
+        # -------------------------------------
+
         try:
             p = self._spawn_iproxy(udid, port, 9100)
             self._port_in_use.add(port)
@@ -319,12 +344,14 @@ class Deviceinfo(object):
             LogManager.error(f"启动 iproxy 失败：{e}", udid)
             return None
 
+    # ------------------- 新增三个小工具 -------------------
     def _is_port_open(self, port: int) -> bool:
         import socket
         with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
             return s.connect_ex(("127.0.0.1", port)) == 0
 
     def _get_pid_by_port(self, port: int) -> Optional[int]:
+        """跨平台根据端口号查 PID，失败返回 None"""
         try:
             if os.name == "nt":
                 cmd = ["netstat", "-ano", "-p", "tcp"]
@@ -340,6 +367,7 @@ class Deviceinfo(object):
             return None
 
     def _kill_pid_gracefully(self, pid: int):
+        """先 terminate 再 kill -9"""
         try:
             os.kill(pid, signal.SIGTERM)
             time.sleep(1)
@@ -347,6 +375,7 @@ class Deviceinfo(object):
         except Exception:
             pass
 
+
     def _terminate_proc(self, p: Optional[subprocess.Popen]):
         if not p or p.poll() is not None:
             return
diff --git a/Utils/ControlUtils.py b/Utils/ControlUtils.py
index 028983f..79393b7 100644
--- a/Utils/ControlUtils.py
+++ b/Utils/ControlUtils.py
@@ -1,6 +1,8 @@
+import math
 import random
 import re
 import time
+from typing import Tuple, List
 
 import tidevice
 import wda
@@ -70,13 +72,15 @@ class ControlUtils(object):
                 return True
             elif session.xpath("//*[@name='nav_bar_start_back']").exists:
                 back = session.xpath("//*[@name='nav_bar_start_back']")
-                back.click()
+                if back.exists:
+                    back.click()
                 return True
             elif session.xpath(
                     "//Window[1]/Other[1]/Other[1]/Other[1]/Other[1]/Other[1]/Other[1]/Other[1]/Other[1]/Other[1]/Other[1]/Other[1]/Other[1]/Other[1]").exists:
                 back = session.xpath(
                     "//Window[1]/Other[1]/Other[1]/Other[1]/Other[1]/Other[1]/Other[1]/Other[1]/Other[1]/Other[1]/Other[1]/Other[1]/Other[1]/Other[1]")
-                back.click()
+                if back.exists:
+                    back.click()
                 return True
             else:
                 return False
@@ -129,6 +133,7 @@ class ControlUtils(object):
         videoCell = session.xpath(
             '(//XCUIElementTypeCollectionView//XCUIElementTypeCell[.//XCUIElementTypeImage[@name="profile_video"]])[1]')
 
+
         tab = session.xpath(
             '//XCUIElementTypeButton[@name="TTKProfileTabVideoButton_0" or contains(@label,"作品") or contains(@name,"作品")]'
         ).get(timeout=5)        # 某些版本 tab.value 可能就是数量；或者 tab.label 类似 “作品 7”
@@ -204,33 +209,65 @@ class ControlUtils(object):
             print(e)
             return False
 
-
-
-
-
-    # 随机滑动一点点距离
     @classmethod
-    def tap_mini_cluster(cls, center_x: int, center_y: int, session, points=5, duration_ms=60):
-        try:
-            response = session.http.post(
-                "touchAndHold",
-                data={
-                    "x": 100,
-                    "y": 100,+
-                    "duration": 0.1
-                }
-            )
-            print(response)
-            return response
-        except Exception as e:
-            print(e)
-            return None
-
-    # 检测五分钟前和当前的状态是否相同
-        # @classmethod
-    # def compareCurrentWithPreviousState(cls,xml):
-
+    def random_micro_swipe(
+            cls,
+            center_x: int,
+            center_y: int,
+            session,
+            points: int = 6,
+            duration_ms: int = 15,
+    ) -> None:
+        """
+        在 (center_x, center_y) 附近做 20px 左右的不规则微滑动。
+        使用 facebook-wda 的 session.swipe(x1, y1, x2, y2, duration) 接口。
+        """
+        # 1. 随机方向
+        angle = random.uniform(0, 2 * math.pi)
+        length = random.uniform(18, 22)  # 20px 左右
+        end_x = center_x + length * math.cos(angle)
+        end_y = center_y + length * math.sin(angle)
 
+        # 2. 限制在 20px 圆内（防止超出）
+        def clamp_to_circle(x, y, cx, cy, r):
+            dx = x - cx
+            dy = y - cy
+            if dx * dx + dy * dy > r * r:
+                scale = r / math.hypot(dx, dy)
+                x = cx + dx * scale
+                y = cy + dy * scale
+            return int(round(x)), int(round(y))
+
+        end_x, end_y = clamp_to_circle(end_x, end_y, center_x, center_y, 20)
+
+        # 3. 加入轻微噪声，制造“不规则”曲线
+        noise = 3  # 最大偏移像素
+        mid_count = points - 2
+        mid_points: List[Tuple[int, int]] = []
+        for i in range(1, mid_count + 1):
+            t = i / (mid_count + 1)
+            # 线性插值 + 垂直方向噪声
+            x = center_x * (1 - t) + end_x * t
+            y = center_y * (1 - t) + end_y * t
+            perp_angle = angle + math.pi / 2  # 垂直方向
+            offset = random.uniform(-noise, noise)
+            x += offset * math.cos(perp_angle)
+            y += offset * math.sin(perp_angle)
+            x, y = clamp_to_circle(x, y, center_x, center_y, 20)
+            mid_points.append((int(round(x)), int(round(y))))
+
+        # 4. 构造完整轨迹
+        trajectory: List[Tuple[int, int]] = (
+                [(center_x, center_y)] + mid_points + [(end_x, end_y)]
+        )
+
+        # 5. 使用 facebook-wda 的 swipe 接口（逐段 swipe）
+        #    由于总时长太短，我们一次性 swipe 到终点，但用多点轨迹模拟
+        #    facebook-wda 支持 swipe(x1, y1, x2, y2, duration)
+        #    我们直接用起点 -> 终点，duration 用总时长
+        print("开始微滑动")
+        session.swipe(center_x, center_y, end_x, end_y, duration_ms / 1000)
+        print("随机微滑动：", trajectory)
 
 
 
diff --git a/script/ScriptManager.py b/script/ScriptManager.py
index b48a3d4..3823b04 100644
--- a/script/ScriptManager.py
+++ b/script/ScriptManager.py
@@ -492,16 +492,18 @@ class ScriptManager():
                     else:
                         msg = text
                     LogManager.method_info(f"即将发送的私信内容：{msg}", "关注打招呼", udid)
+                    chatInput = session.xpath("//TextView")
 
                     # 准备发送一条信息
-                    chatInput.click()
-                    time.sleep(2)
-                    # 发送消息
-                    chatInput.set_text(f"{msg or '暂无数据'}\n")
+                    if chatInput.exists:
+                        chatInput.click()
+                        time.sleep(2)
+                        # 发送消息
+                        chatInput.set_text(f"{msg or '暂无数据'}\n")
 
-                    # input.set_text(f"{aid or '暂无数据'}\n")
+                        # input.set_text(f"{aid or '暂无数据'}\n")
 
-                    time.sleep(1)
+                        time.sleep(1)
 
                 else:
                     print("无法发送信息")