From 6747de733af781c3dc6dec233c232f83851b0467 Mon Sep 17 00:00:00 2001 From: zw <12345678> Date: Thu, 14 Aug 2025 14:46:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Flask/FlaskService.py | 4 ++-- Utils/ThreadManager.py | 23 ++++++++++++++--------- script/ScriptManager.py | 3 +++ 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Flask/FlaskService.py b/Flask/FlaskService.py index f2aa47c..4b9b8ff 100644 --- a/Flask/FlaskService.py +++ b/Flask/FlaskService.py @@ -203,8 +203,8 @@ def watchLiveForGrowth(): def stopScript(): body = request.get_json() udid = body.get("udid") - ThreadManager.stop(udid) - return ResultData(data="").toJson() + code, msg = ThreadManager.stop(udid) + return ResultData(code=code, data="", msg=msg).toJson() # 传递主播数据 diff --git a/Utils/ThreadManager.py b/Utils/ThreadManager.py index a2f7532..d641e2a 100644 --- a/Utils/ThreadManager.py +++ b/Utils/ThreadManager.py @@ -17,12 +17,17 @@ class ThreadManager(): @classmethod def stop(cls, udid): - print(cls.threads) - info = cls.threads[udid] - if info: - info["stopEvent"].set() # 停止线程 - info["thread"].join(timeout=3) # 等待线程退出 - del cls.threads[udid] - LogManager.info("停止线程成功", udid) - else: - LogManager.info("无此线程,无需关闭", udid) \ No newline at end of file + try: + info = cls.threads[udid] + if info: + info["stopEvent"].set() # 停止线程 + info["thread"].join(timeout=3) # 等待线程退出 + del cls.threads[udid] + LogManager.info("停止线程成功", udid) + return 200, "停止线程成功 " + udid + else: + LogManager.info("无此线程,无需关闭", udid) + return 1001, "无此线程,无需关闭 " + udid + except KeyError as e: + LogManager.info("无此线程,无需关闭", udid) + return 1001, "停止脚本失败 " + udid \ No newline at end of file diff --git a/script/ScriptManager.py b/script/ScriptManager.py index 49adf12..e62e01f 100644 --- a/script/ScriptManager.py +++ b/script/ScriptManager.py @@ -198,6 +198,9 @@ class ScriptManager(): # 点击搜索按钮 ControlUtils.clickSearch(session) + # 创建udid名称的目录 + AiUtils.makeUdidDir(udid) + # 返回上一步 def goBack(count): for i in range(count):