Merge remote-tracking branch 'origin/main'

# Conflicts:
#	.idea/workspace.xml
#	Module/DeviceInfo.py
#	build.bat
#	resources/FlashLink.exe
This commit is contained in:
2025-09-17 22:26:04 +08:00
11 changed files with 307 additions and 232 deletions

View File

@@ -266,8 +266,9 @@ def watchLiveForGrowth():
def stopScript():
body = request.get_json()
udid = body.get("udid")
code, massage = ThreadManager.stop(udid)
return ResultData(code=code, data="", massage=massage).toJson()
LogManager.method_info(f"接口收到 /stopScript udid={udid}", method="task")
code, msg = ThreadManager.stop(udid)
return ResultData(code=code, data="", massage=msg).toJson()
# 关注打招呼