Merge branch 'main' of http://49.235.115.212:3000/zw/iOSAI

# Conflicts:
#	.idea/workspace.xml
#	Module/FlaskService.py
#	Utils/AiUtils.py
#	tidevice_entry.py

.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>

.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>

.idea/workspace.xml

@@ -4,12 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="eceeff5e-51c1-459c-a911-d21ec090a423" name="Changes" comment="20250904-初步功能已完成">
+    <list default="true" id="eceeff5e-51c1-459c-a911-d21ec090a423" name="Changes" comment="ai 开始测试">
-      <change afterPath="$PROJECT_DIR$/tidevice_entry.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Entity/AnchorModel.py" beforeDir="false" afterPath="$PROJECT_DIR$/Entity/AnchorModel.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Entity/Variables.py" beforeDir="false" afterPath="$PROJECT_DIR$/Entity/Variables.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Module/FlaskService.py" beforeDir="false" afterPath="$PROJECT_DIR$/Module/FlaskService.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/LogManager.py" beforeDir="false" afterPath="$PROJECT_DIR$/Utils/LogManager.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -49,27 +48,27 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
+  <component name="PropertiesComponent"><![CDATA[{
-  &quot;keyToString&quot;: {
+  "keyToString": {
-    &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
+    "ASKED_ADD_EXTERNAL_FILES": "true",
-    &quot;Python.123.executor&quot;: &quot;Run&quot;,
+    "Python.123.executor": "Run",
-    &quot;Python.Main.executor&quot;: &quot;Run&quot;,
+    "Python.Main.executor": "Run",
-    &quot;Python.tidevice_entry.executor&quot;: &quot;Run&quot;,
+    "Python.tidevice_entry.executor": "Run",
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    "RunOnceActivity.ShowReadmeOnStart": "true",
-    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
+    "git-widget-placeholder": "main",
-    &quot;javascript.nodejs.core.library.configured.version&quot;: &quot;20.17.0&quot;,
+    "javascript.nodejs.core.library.configured.version": "22.18.0",
-    &quot;javascript.nodejs.core.library.typings.version&quot;: &quot;20.17.58&quot;,
+    "javascript.nodejs.core.library.typings.version": "22.18.1",
-    &quot;last_opened_file_path&quot;: &quot;F:/company code/AI item/20250820/iOSAI&quot;,
+    "last_opened_file_path": "F:/company code/AI item/20250820/iOSAI",
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    "node.js.detected.package.eslint": "true",
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    "node.js.detected.package.tslint": "true",
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    "node.js.selected.package.eslint": "(autodetect)",
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    "node.js.selected.package.tslint": "(autodetect)",
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    "nodejs_package_manager_path": "npm",
-    &quot;settings.editor.selected.configurable&quot;: &quot;vcs.Git&quot;,
+    "settings.editor.selected.configurable": "com.gitee.ui.GiteeSettingsConfigurable",
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
       <recent name="E:\Code\python\iOSAI\resources" />
@@ -181,9 +180,8 @@
       <workItem from="1756902713950" duration="1669000" />
       <workItem from="1756905956255" duration="1709000" />
       <workItem from="1756962238298" duration="14230000" />
-      <workItem from="1756979981948" duration="13770000" />
+      <workItem from="1756979981948" duration="4536000" />
-      <workItem from="1757048603166" duration="2718000" />
+      <workItem from="1757053266703" duration="6442000" />
-      <workItem from="1757052291289" duration="7810000" />
     </task>
     <task id="LOCAL-00001" summary="ai 开始测试">
       <option name="closed" value="true" />
@@ -193,15 +191,7 @@
       <option name="project" value="LOCAL" />
       <updated>1756303135240</updated>
     </task>
-    <task id="LOCAL-00002" summary="20250904-初步功能已完成">
+    <option name="localTasksCounter" value="2" />
-      <option name="closed" value="true" />
-      <created>1756985736631</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1756985736631</updated>
-    </task>
-    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -224,19 +214,18 @@
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
     <MESSAGE value="ai 开始测试" />
-    <MESSAGE value="20250904-初步功能已完成" />
+    <option name="LAST_COMMIT_MESSAGE" value="ai 开始测试" />
-    <option name="LAST_COMMIT_MESSAGE" value="20250904-初步功能已完成" />
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/iOSAI$LogManager.coverage" NAME="LogManager 覆盖结果" MODIFIED="1756711414832" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Utils" />
     <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$FlaskService.coverage" NAME="FlaskService 覆盖结果" MODIFIED="1756730187792" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Module" />
+    <SUITE FILE_PATH="coverage/iOSAI$Main.coverage" NAME="Main Coverage Results" MODIFIED="1757059930709" 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$test.coverage" NAME="test 覆盖结果" MODIFIED="1756467664420" 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$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" />
-    <SUITE FILE_PATH="coverage/iOSAI$tidevice_entry.coverage" NAME="tidevice_entry 覆盖结果" MODIFIED="1757051299128" 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$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$tidevice_entry.coverage" NAME="tidevice_entry Coverage Results" MODIFIED="1756886706033" 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="1757059426880" 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$test.coverage" NAME="test 覆盖结果" MODIFIED="1756467664420" 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$123.coverage" NAME="123 覆盖结果" MODIFIED="1756712884433" 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$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$LogManager.coverage" NAME="LogManager 覆盖结果" MODIFIED="1756711414832" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Utils" />
+    <SUITE FILE_PATH="coverage/iOSAI$FlaskService.coverage" NAME="FlaskService 覆盖结果" MODIFIED="1756730187792" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Module" />
+    <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>

Entity/AnchorModel.py

@@ -14,3 +14,8 @@ class AnchorModel:
         model.anchorId = d.get('anchorId', "")
         model.country = d.get('country', "")
         return model
+
+    # 模型转字典
+    @classmethod
+    def modelToDict(cls, model):
+        return {"anchorId": model.anchorId, "country": model.country}

Entity/Variables.py

@@ -2,6 +2,7 @@ import threading
 from typing import Dict, Any
 from Entity.AnchorModel import AnchorModel
 
+
 # wda apple bundle id
 WdaAppBundleId = "com.yolozsAgent.wda.xctrunner"
 

Module/DeviceInfo.py

@@ -10,7 +10,7 @@ import subprocess
 from pathlib import Path
 from typing import List, Dict, Optional
 
-from tidevice import Usbmux
+from tidevice import Usbmux, ConnectionType
 from Entity.DeviceModel import DeviceModel
 from Entity.Variables import WdaAppBundleId
 from Module.FlaskSubprocessManager import FlaskSubprocessManager
@@ -110,13 +110,15 @@ class Deviceinfo(object):
                 continue
             # 新接入设备
             for device in lists:
-                if (device not in self.deviceArray) and (len(self.deviceArray) < self.maxDeviceCount):
+                # usb设备，并且为新设备。并且大于总限制数量
+                if device.conn_type == ConnectionType.USB and (device not in self.deviceArray) and (len(self.deviceArray) < self.maxDeviceCount):
                     self.screenProxy += 1
                     try:
                         self.connectDevice(device.udid)
                         self.deviceArray.append(device)
                     except Exception as e:
                         LogManager.error(f"连接设备失败 {device.udid}: {e}", device.udid)
+
             # 拔出设备处理
             self._removeDisconnected(lists)
             time.sleep(1)
@@ -126,9 +128,9 @@ class Deviceinfo(object):
     # ----------------------------
     def connectDevice(self, identifier: str):
         # 1) 连接 WDA（USBClient -> 设备 8100）
-
         try:
             d = wda.USBClient(identifier, 8100)
+
             LogManager.info("启动 WDA 成功", identifier)
         except Exception as e:
             LogManager.error(f"启动 WDA 失败，请检查手机是否已信任、WDA 是否正常。错误: {e}", identifier)

Module/FlaskService.py

@@ -2,13 +2,12 @@ import json
 import os
 import socket
 import threading
-import warnings
 from queue import Queue
 from typing import Any, Dict
+
+from Entity.AnchorModel import AnchorModel
 from Utils.AiUtils import AiUtils
 from Utils.LogManager import LogManager
-from Utils.Requester import Requester
-
 import tidevice
 import wda
 from flask import Flask, request
@@ -17,8 +16,8 @@ from Entity.ResultData import ResultData
 from Utils.ControlUtils import ControlUtils
 from Utils.ThreadManager import ThreadManager
 from script.ScriptManager import ScriptManager
-from Entity.Variables import anchorList, addModelToAnchorList,prologueList
+from Entity.Variables import anchorList, addModelToAnchorList, prologueList, removeModelFromAnchorList
-
+import Entity.Variables as ev
 app = Flask(__name__)
 CORS(app)
 
@@ -81,17 +80,17 @@ def start_socket_listener():
 listener_thread = threading.Thread(target=start_socket_listener, daemon=True)
 listener_thread.start()
 
-
+# 传递token，暂时用不到了
-@app.route('/passToken', methods=['POST'])
+# @app.route('/passToken', methods=['POST'])
-def passToken():
+# def passToken():
-    try:
+#     try:
-        data = request.get_json()
+#         data = request.get_json()
-        token = data['token']
+#         token = data['token']
-        Requester.requestPrologue(token)
+#         Requester.requestPrologue(token)
-        return ResultData(data="").toJson()
+#         return ResultData(data="").toJson()
-    except Exception as e:
+#     except Exception as e:
-        print(e)
+#         print(e)
-    return ResultData(data="").toJson()
+#     return ResultData(data="").toJson()
 
 
 # 获取设备列表
@@ -245,6 +244,11 @@ def passAnchorData():
     acList = data.get("anchorList", [])
     # 是否需要回复
     needReply = data.get("needReply", True)
+
+    # 获取打招呼数据
+    ev.prologueList = data.get("prologueList", [])
+
+
     # 添加主播数据
     addModelToAnchorList(acList)
     # 启动线程，执行脚本
@@ -252,13 +256,17 @@ def passAnchorData():
         manager = ScriptManager()
         event = threading.Event()
         # 启动脚本
-        # thread = threading.Thread(target=manager.greetNewFollowers, args=(udid, needReply, event))
         thread = threading.Thread(target=manager.safe_greetNewFollowers, args=(udid, needReply, event))
         thread.start()
         # 添加到线程管理
         ThreadManager.add(udid, thread, event)
     return ResultData(data="").toJson()
 
+# 获取私信数据
+@app.route("/getPrologueList", methods=['GET'])
+def getPrologueList():
+    print(ev.prologueList)
+    return ResultData(data=ev.prologueList).toJson()
 
 # 添加临时数据
 @app.route("/addTempAnchorData", methods=['POST'])
@@ -277,7 +285,6 @@ def getChatTextInfo():
     session = client.session()
     xml = session.source()
     try:
-        print(xml)
         result = AiUtils.extract_messages_from_xml(xml)
         print(result)
         return ResultData(data=result).toJson()
@@ -312,24 +319,34 @@ def monitorMessages():
 
 
 @app.route("/setLoginInfo", methods=['POST'])
-def upLoadLogFile():
+def upLoadLogLogs():
     data = request.get_json()  # 解析 JSON
     token = data.get("token")
     userId = data.get("userId")
     tenantId = data.get("tenantId")
     ok = LogManager.upload_all_logs("http://47.79.98.113:8101/api/log/upload", token, userId, tenantId)
-
     if ok:
         return ResultData(data="日志上传成功").toJson()
     else:
         return ResultData(data="", msg="日志上传失败").toJson()
 
-# @app.route("/", methods=['POST'])
+# 获取当前的主播列表数据
-# def upLoadLogFile():
+@app.route("/anchorList", methods=['POST'])
-#     datas = request.get_json()  # 解析 JSON
+def queryAnchorList():
-#     # 先清空打招呼语
+    data = []
-#     prologueList.clear()
+    for model in anchorList:
-#     # 添加新的打招呼语句
+        data.append(AnchorModel.modelToDict(model))
-#     for data in datas:
+    return ResultData(data=data).toJson()
-#         prologueList.append(data)
 
+# 删除主播
+@app.route("/deleteAnchorWithIds", methods=['POST'])
+def deleteAnchorWithIds():
+    ls: list[dict] = request.get_json()
+    for dic in ls:
+        for model in anchorList:
+            if dic.get("anchorId") == model.anchorId:
+                removeModelFromAnchorList(model)
+    return ResultData(data="").toJson()
+
+if __name__ == '__main__':
+    app.run("0.0.0.0", port=5000, debug=True, use_reloader=False)

Module/Main.py

@@ -7,6 +7,7 @@ from Module.FlaskSubprocessManager import FlaskSubprocessManager
 from Utils.DevDiskImageDeployer import DevDiskImageDeployer
 from Utils.LogManager import LogManager
 
+
 # 确定 exe 或 py 文件所在目录
 BASE = Path(getattr(sys, 'frozen', False) and sys.executable or __file__).resolve().parent
 LOG_DIR = BASE / "log"
@@ -25,8 +26,10 @@ if "--role=flask" in sys.argv:
     _run_flask_role()
     sys.exit(0)
 
+
 # 项目入口
 if __name__ == "__main__":
+
     # 添加iOS开发包到电脑上
     deployer = DevDiskImageDeployer(verbose=True)
     deployer.deploy_all()

Utils/AiUtils.py

@@ -459,3 +459,18 @@ class AiUtils(object):
                 return t
 
         return ""
+
+    # 检查字符串中是否包含中文
+    @classmethod
+    def contains_chinese(cls, text):
+        """
+        判断字符串中是否包含中文字符。
+        参数:
+            text (str): 要检测的字符串。
+
+        返回:
+            bool: 如果字符串中包含中文，返回 True；否则返回 False。
+        """
+        # 使用正则表达式匹配中文字符
+        pattern = re.compile(r'[\u4e00-\u9fff]')
+        return bool(pattern.search(text))

Utils/LogManager.py

@@ -1,85 +1,4 @@
-# import logging
+
-# import os
-# import sys
-# import shutil
-# from pathlib import Path
-#
-#
-# class LogManager:
-#     # 运行根目录：打包后取 exe 目录；源码运行取项目目录
-#     if getattr(sys, "frozen", False):
-#         projectRoot = os.path.dirname(sys.executable)
-#     else:
-#         projectRoot = os.path.dirname(os.path.dirname(__file__))
-#
-#     logDir = os.path.join(projectRoot, "log")
-#     _loggers = {}
-#
-#     @classmethod
-#     def _setupLogger(cls, udid, name, logName, level=logging.INFO):
-#         """创建或获取 logger，并绑定到文件"""
-#         deviceLogDir = os.path.join(cls.logDir, udid)
-#         os.makedirs(deviceLogDir, exist_ok=True)
-#         logFile = os.path.join(deviceLogDir, logName)
-#
-#         logger_name = f"{udid}_{name}"
-#         logger = logging.getLogger(logger_name)
-#         logger.setLevel(level)
-#
-#         # 避免重复添加 handler
-#         if not any(
-#             isinstance(h, logging.FileHandler) and h.baseFilename == os.path.abspath(logFile)
-#             for h in logger.handlers
-#         ):
-#             fileHandler = logging.FileHandler(logFile, mode="a", encoding="utf-8")
-#             formatter = logging.Formatter(
-#                 "%(asctime)s - %(name)s - %(levelname)s - %(message)s",
-#                 datefmt="%Y-%m-%d %H:%M:%S"
-#             )
-#             fileHandler.setFormatter(formatter)
-#             logger.addHandler(fileHandler)
-#
-#         return logger
-#
-#     @classmethod
-#     def info(cls, text, udid="system"):
-#         cls._setupLogger(udid, "infoLogger", "info.log", level=logging.INFO).info(f"[{udid}] {text}")
-#
-#     @classmethod
-#     def warning(cls, text, udid="system"):
-#         cls._setupLogger(udid, "warningLogger", "warning.log", level=logging.WARNING).warning(f"[{udid}] {text}")
-#
-#     @classmethod
-#     def error(cls, text, udid="system"):
-#         cls._setupLogger(udid, "errorLogger", "error.log", level=logging.ERROR).error(f"[{udid}] {text}")
-#
-#     # 清空日志
-#     @classmethod
-#     def clearLogs(cls):
-#         """启动时清空 log 目录下所有文件"""
-#         print("开始清空日志...")
-#
-#         # 关闭所有 handler
-#         for name, logger in logging.Logger.manager.loggerDict.items():
-#             if isinstance(logger, logging.Logger):
-#                 for handler in logger.handlers[:]:
-#                     try:
-#                         handler.close()
-#                     except Exception:
-#                         pass
-#                     logger.removeHandler(handler)
-#
-#         # 仅删除目录里的所有文件和子目录
-#         log_path = Path(cls.logDir)
-#         if log_path.exists():
-#             for item in log_path.iterdir():
-#                 if item.is_file():
-#                     item.unlink()
-#                 elif item.is_dir():
-#                     import shutil
-#                     shutil.rmtree(item)
-#
-#         print("日志清空完成")
 import datetime
 import io
 import logging
@@ -89,11 +8,8 @@ import sys
 import shutil
 import zipfile
 from pathlib import Path
-
 import requests
 
-import Entity.Variables
-
 
 class LogManager:
     # 运行根目录：打包后取 exe 目录；源码运行取项目目录
@@ -235,7 +151,6 @@ class LogManager:
     @classmethod
     def clearLogs(cls):
         """启动时清空 log 目录下所有文件"""
-        print("开始清空日志...")
 
         # 关闭所有 handler
         for name, logger in logging.Logger.manager.loggerDict.items():
@@ -258,13 +173,11 @@ class LogManager:
 
         # 清缓存
         cls._method_loggers.clear()
-        print("日志清空完成")
 
     @classmethod
     def upload_all_logs(cls, server_url, token, userId, tenantId):
         log_path = Path(cls.logDir)
         if not log_path.exists():
-            print("[upload_all_logs] 日志目录不存在")
             return False
 
         timestamp = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
@@ -286,20 +199,9 @@ class LogManager:
         files = {
             "file": (filename, io.BytesIO(zip_bytes), "application/zip")
         }
-        print(
-            f"[upload_all_logs] "
-            f"server={server_url} (type={type(server_url)}) "
-            f"tenantId={tenantId} (type={type(tenantId)}) "
-            f"userId={userId} (type={type(userId)}) "
-            f"token={token} (type={type(token)})"
-        )
 
-        print("开始上传")
         # 3) 上传
         resp = requests.post(server_url, headers=headers, data=data, files=files)
-        print(resp.text)
-        print("上传结束")
-
         if resp.json()['data']:
             return True
         return False

build-tidevice.bat

@@ -4,6 +4,6 @@ pyinstaller -F -n tidevice ^
   --hidden-import=tidevice._usbmux ^
   --hidden-import=tidevice._wdaproxy ^
   --collect-all tidevice ^
-  -c ^
+  --noconsole ^
   --add-data="C:\Users\milk\AppData\Local\Programs\Python\Python312\Lib\site-packages\tidevice;tidevice" ^
-  tidevice_entry.py
+  tidevice_entry.py

build.bat

@@ -1,17 +1,11 @@
-@echo off
+python -m nuitka Module/Main.py ^
-python -m nuitka Module\Main.py ^
   --standalone ^
   --msvc=latest ^
   --windows-console-mode=disable ^
   --remove-output ^
   --output-dir=out ^
   --output-filename=IOSAI ^
-  --include-package=Module,Utils,Entity,script,tidevice ^
+  --include-package=Module,Utils,Entity,script ^
-  --include-module=tidevice.__main__ ^
-  --include-module=tidevice._proto ^
-  --include-module=tidevice._instruments ^
-  --include-module=tidevice._usbmux ^
-  --include-module=tidevice._wdaproxy ^
   --include-module=flask ^
   --include-module=flask_cors ^
   --include-module=jinja2 ^
@@ -27,5 +21,4 @@ python -m nuitka Module\Main.py ^
   --include-data-dir="E:/Code/python/iOSAI/SupportFiles=SupportFiles" ^
   --include-data-dir="E:/Code/python/iOSAI/resources=resources" ^
   --include-data-files="E:/Code/python/iOSAI/resources/iproxy/*=resources/iproxy/" ^
-  --windows-icon-from-ico=resources/icon.ico
+  --windows-icon-from-ico=resources/icon.ico
-pause