automas_admin/AUTO-MAS-test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(models): 修复任务被手动中止项目无法被正常录入的问题

Browse Source
This commit is contained in:
DLmaster
2025-03-06 23:37:51 +08:00
parent c73aca71f7
commit 576fe59bbc
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/MAA.py
View File

@@ -556,7 +556,7 @@ class MaaManager(QObject):
if len(self.log_monitor.files()) != 0: if len(self.log_monitor.files()) != 0:
self.interrupt.emit() self.interrupt.emit()
self.maa_result = "您中止了本次任务" self.maa_result = "任务被手动中止"
self.isInterruptionRequested = True self.isInterruptionRequested = True
def push_question(self, title: str, message: str) -> bool: def push_question(self, title: str, message: str) -> bool:
@@ -636,6 +636,8 @@ class MaaManager(QObject):
minutes=self.set["RunSet"][time_book[mode]] minutes=self.set["RunSet"][time_book[mode]]
): ):
self.maa_result = "检测到MAA进程超时" self.maa_result = "检测到MAA进程超时"
elif self.isInterruptionRequested:
self.maa_result = "任务被手动中止"
else: else:
self.maa_result = "Wait" self.maa_result = "Wait"
@@ -649,6 +651,8 @@ class MaaManager(QObject):
or ("MaaAssistantArknights GUI exited" in log) or ("MaaAssistantArknights GUI exited" in log)
): ):
self.maa_result = "检测到MAA进程异常" self.maa_result = "检测到MAA进程异常"
elif self.isInterruptionRequested:
self.maa_result = "任务被手动中止"
else: else:
self.maa_result = "Wait" self.maa_result = "Wait"