From 6766ac8c208dee365c283f36c1e2e156c510dbde Mon Sep 17 00:00:00 2001 From: milk <53408947@qq.com> Date: Sat, 13 Sep 2025 00:57:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BF=BD=E7=95=A5?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 49 ++++++++++++++++++++++---------------------- Module/DeviceInfo.py | 38 ---------------------------------- 2 files changed, 25 insertions(+), 62 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 65da30f..6f0ee87 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,8 +5,8 @@ + - - { - "keyToString": { - "ASKED_ADD_EXTERNAL_FILES": "true", - "Python.12.executor": "Run", - "Python.123.executor": "Run", - "Python.Main.executor": "Run", - "Python.tidevice_entry.executor": "Run", - "RunOnceActivity.ShowReadmeOnStart": "true", - "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true", - "RunOnceActivity.git.unshallow": "true", - "SHARE_PROJECT_CONFIGURATION_FILES": "true", - "git-widget-placeholder": "main", - "javascript.nodejs.core.library.configured.version": "20.17.0", - "javascript.nodejs.core.library.typings.version": "20.17.58", - "last_opened_file_path": "F:/company code/AI item/20250820/iOSAI", - "node.js.detected.package.eslint": "true", - "node.js.detected.package.tslint": "true", - "node.js.selected.package.eslint": "(autodetect)", - "node.js.selected.package.tslint": "(autodetect)", - "nodejs_package_manager_path": "npm", - "settings.editor.selected.configurable": "preferences.editor.code.editing", - "vue.rearranger.settings.migration": "true" + +}]]> diff --git a/Module/DeviceInfo.py b/Module/DeviceInfo.py index 52dc466..d828f2e 100644 --- a/Module/DeviceInfo.py +++ b/Module/DeviceInfo.py @@ -34,9 +34,6 @@ class Deviceinfo(object): self._port_pool: List[int] = [] # 端口回收池 self._port_in_use: set[int] = set() # 正在使用的端口 - # 🔥1. 启动 WDA 健康检查线程 - threading.Thread(target=self._wda_health_checker, daemon=True).start() - # region iproxy 初始化 try: self.iproxy_path = self._iproxy_path() @@ -127,41 +124,6 @@ class Deviceinfo(object): time.sleep(1) - # 🔥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] # ← 只检查就绪的 - print(len(online)) - for model in online: - udid = model.deviceId - if not self._wda_ok(udid): - LogManager.warning(f"WDA 异常，重启通道：{udid}", udid) - with self._lock: - 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 From 06fd7ce8857825347755e750c828a77b1f336be7 Mon Sep 17 00:00:00 2001 From: milk <53408947@qq.com> Date: Sat, 13 Sep 2025 00:57:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BF=BD=E7=95=A5?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 90e4b38..30c0a87 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ var/ .installed.cfg *.egg out/ +log/ # PyInstaller # Usually these files are written by a python script from a template