合并代码

2025-09-01 22:07:00 +08:00
parent e20d81144d
commit a68b89ed67
6 changed files with 138 additions and 45 deletions
--- a/.idea/iOSAI.iml
+++ b/.idea/iOSAI.iml
@@ -2,7 +2,7 @@
 <module type="PYTHON_MODULE" version="4">
  <component name="NewModuleRootManager">
    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 3.12 (IOS-AI)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.12" jdkType="Python SDK" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,5 +3,5 @@
  <component name="Black">
    <option name="sdkName" value="Python 3.12" />
  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12 (IOS-AI)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12" project-jdk-type="Python SDK" />
 </project>
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,49 +5,12 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="eceeff5e-51c1-459c-a911-d21ec090a423" name="Changes" comment="ai 开始测试">
+      <change afterPath="$PROJECT_DIR$/script/mac_wda_agent.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/script/windows_run.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/iOSAI.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/iOSAI.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.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$/SupportFiles/15.0/DeveloperDiskImage.dmg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/15.0/DeveloperDiskImage.dmg.signature" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/15.1/DeveloperDiskImage.dmg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/15.1/DeveloperDiskImage.dmg.signature" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/15.2/DeveloperDiskImage.dmg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/15.2/DeveloperDiskImage.dmg.signature" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/15.3.1/DeveloperDiskImage.dmg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/15.3.1/DeveloperDiskImage.dmg.signature" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/15.3/DeveloperDiskImage.dmg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/15.3/DeveloperDiskImage.dmg.signature" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/15.4/DeveloperDiskImage.dmg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/15.4/DeveloperDiskImage.dmg.signature" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/15.5/DeveloperDiskImage.dmg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/15.5/DeveloperDiskImage.dmg.signature" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/15.6.1/DeveloperDiskImage.dmg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/15.6.1/DeveloperDiskImage.dmg.signature" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/15.6/DeveloperDiskImage.dmg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/15.6/DeveloperDiskImage.dmg.signature" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/15.7/DeveloperDiskImage.dmg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/15.7/DeveloperDiskImage.dmg.signature" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/15.8/DeveloperDiskImage.dmg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/15.8/DeveloperDiskImage.dmg.signature" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/16.0/DeveloperDiskImage.dmg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/16.0/DeveloperDiskImage.dmg.signature" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/16.1/DeveloperDiskImage.dmg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/16.1/DeveloperDiskImage.dmg.signature" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/16.2/DeveloperDiskImage.dmg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/16.2/DeveloperDiskImage.dmg.signature" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/16.3.1/DeveloperDiskImage.dmg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/16.3.1/DeveloperDiskImage.dmg.signature" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/16.3/DeveloperDiskImage.dmg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/16.3/DeveloperDiskImage.dmg.signature" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/16.4/DeveloperDiskImage.dmg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/16.4/DeveloperDiskImage.dmg.signature" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/16.5/DeveloperDiskImage.dmg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/16.5/DeveloperDiskImage.dmg.signature" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/16.6/DeveloperDiskImage.dmg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/16.6/DeveloperDiskImage.dmg.signature" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/16.7/DeveloperDiskImage.dmg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/SupportFiles/16.7/DeveloperDiskImage.dmg.signature" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Utils/DevDiskImageDeployer.py" beforeDir="false" afterPath="$PROJECT_DIR$/Utils/DevDiskImageDeployer.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resources/9c1babd72b735f9ed0b0843cffdc4fc0ebd3e449/bgv.png" beforeDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -92,6 +55,8 @@
    &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
    &quot;Python.123.executor&quot;: &quot;Run&quot;,
    &quot;Python.Main.executor&quot;: &quot;Run&quot;,
+    &quot;Python.mac_wda_agent.executor&quot;: &quot;Run&quot;,
+    &quot;Python.windows_run.executor&quot;: &quot;Run&quot;,
    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
@@ -160,8 +125,56 @@
      <option name="INPUT_FILE" value="" />
      <method v="2" />
    </configuration>
+    <configuration name="mac_wda_agent" 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$/script" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/script/mac_wda_agent.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>
+    <configuration name="windows_run" 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$/script" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/script/windows_run.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.windows_run" />
+        <item itemvalue="Python.mac_wda_agent" />
        <item itemvalue="Python.123" />
      </list>
    </recent_temporary>
@@ -210,6 +223,11 @@
      <workItem from="1756370074173" duration="5000" />
      <workItem from="1756370506697" duration="11274000" />
      <workItem from="1756389997073" duration="173000" />
+      <workItem from="1756447365905" duration="14443000" />
+      <workItem from="1756474554313" duration="72000" />
+      <workItem from="1756474770097" duration="1415000" />
+      <workItem from="1756476597268" duration="12000" />
+      <workItem from="1756722738193" duration="3859000" />
    </task>
    <task id="LOCAL-00001" summary="ai 开始测试">
      <option name="closed" value="true" />
@@ -234,7 +252,9 @@
    <option name="LAST_COMMIT_MESSAGE" value="ai 开始测试" />
  </component>
  <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/iOSAI$Main.coverage" NAME="Main Coverage Results" MODIFIED="1756390027877" 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 Coverage Results" MODIFIED="1756476597660" 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$mac_wda_agent.coverage" NAME="mac_wda_agent Coverage Results" MODIFIED="1756473148639" 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$123.coverage" NAME="123 覆盖结果" MODIFIED="1756300694280" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test" />
+    <SUITE FILE_PATH="coverage/iOSAI$windows_run.coverage" NAME="windows_run Coverage Results" MODIFIED="1756473558532" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/script" />
  </component>
 </project>
--- a/resources/9c1babd72b735f9ed0b0843cffdc4fc0ebd3e449/bgv.png
+++ b/resources/9c1babd72b735f9ed0b0843cffdc4fc0ebd3e449/bgv.png
--- a/script/mac_wda_agent.py
+++ b/script/mac_wda_agent.py
@@ -0,0 +1,38 @@
+# windows_run.py（替换你起 iproxy 的那几行）
+import os, subprocess, time, requests, wda
+from pathlib import Path
+
+UDID = "00008110-00067D0014D3B01E"
+MAC = "http://192.168.1.219:8765"
+
+# 让 Mac 起 WDA（不转发）
+requests.post(f"{MAC}/startWDA", json={"udid": UDID}, timeout=600).raise_for_status()
+
+# 计算 iproxy 绝对路径（项目根/resources/iproxy/iproxy.exe）
+BASE = Path(__file__).resolve().parents[1]  # iOSAI/
+IPROXY = BASE / "resources" / "iproxy" / "iproxy.exe"
+if not IPROXY.exists():
+    raise FileNotFoundError(f"iproxy 不在这里: {IPROXY}")
+
+# 可选：把 iproxy 目录加入 PATH，避免 DLL 依赖找不到
+env = os.environ.copy()
+env["PATH"] = str(IPROXY.parent) + os.pathsep + env.get("PATH", "")
+try:
+    os.add_dll_directory(str(IPROXY.parent))  # 仅 Windows 有效
+except Exception:
+    pass
+
+# 起 iproxy：本地 9111 -> 设备 8100
+p = subprocess.Popen([str(IPROXY), "-u", UDID, "9111", "8100"],
+                     cwd=str(IPROXY.parent),
+                     stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
+                     text=True, creationflags=0x08000000)
+
+# 探活 WDA
+c = wda.Client("http://127.0.0.1:9111")
+
+for _ in range(120):
+    try:
+        print(c.status()); break
+    except:
+        time.sleep(1)
--- a/script/windows_run.py
+++ b/script/windows_run.py
@@ -0,0 +1,35 @@
+from pathlib import Path
+import os, subprocess, time, requests, wda
+
+UDID = "00008110-00067D0014D3B01E"
+MAC  = "http://192.168.1.90:8765"
+
+# 让 Mac 起 WDA
+requests.post(f"{MAC}/startWDA", json={"udid": UDID}, timeout=600).raise_for_status()
+
+# 计算 iproxy 绝对路径：项目根/resources/iproxy/iproxy.exe
+BASE = Path(__file__).resolve().parents[1]          # iOSAI/
+IPROXY = BASE / "resources" / "iproxy" / "iproxy.exe"
+if not IPROXY.exists():
+    raise FileNotFoundError(f"iproxy 不在这里：{IPROXY}")
+
+# 避免 DLL 找不到：把目录加入 PATH（以及 Windows 的 DLL 搜索路径）
+env = os.environ.copy()
+env["PATH"] = str(IPROXY.parent) + os.pathsep + env.get("PATH", "")
+try:
+    os.add_dll_directory(str(IPROXY.parent))
+except Exception:
+    pass
+
+# 起 iproxy：本地 9111 -> 设备 8100
+p = subprocess.Popen([str(IPROXY), "-u", UDID, "9111", "8100"],
+                     cwd=str(IPROXY.parent),
+                     stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True)
+
+# 探活 WDA
+c = wda.Client("http://127.0.0.1:9111")
+for _ in range(120):
+    try:
+        print(c.status()); break
+    except Exception:
+        time.sleep(1)