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

fix: 优化静默进程标记逻辑

Browse Source
This commit is contained in:
DLmaster361
2025-07-31 13:39:38 +08:00
parent 67c41ab3ee
commit c5f947e14a
8 changed files with 34 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/models/MAA.py
View File

@@ -570,12 +570,14 @@ class MaaManager(QObject):
self.if_open_emulator = True
break
# 添加静默进程标记
# 更新静默进程标记有效时间
logger.info(
f"添加静默进程标记：{self.emulator_path}",
f"更新静默进程标记：{self.emulator_path}，标记有效时间：{datetime.now() + timedelta(seconds=self.wait_time + 10)}",
module=f"MAA调度器-{self.name}",
)
Config.silence_list.append(self.emulator_path)
Config.silence_dict[self.emulator_path] = (
datetime.now() + timedelta(seconds=self.wait_time + 10)
)
self.search_ADB_address()
@@ -1082,15 +1084,6 @@ class MaaManager(QObject):
if self.isInterruptionRequested:
return None
# 10s后移除静默进程标记
QTimer.singleShot(
10000, partial(Config.silence_list.remove, self.emulator_path)
)
logger.info(
f"10s后移除静默进程标记：{self.emulator_path}",
module=f"MAA调度器-{self.name}",
)
if "-" in self.ADB_address:
ADB_ip = f"{self.ADB_address.split("-")[0]}-"
ADB_port = int(self.ADB_address.split("-")[1])

21
app/models/general.py
View File

@@ -317,13 +317,17 @@ class GeneralManager(QObject):
self.script_result = "游戏/模拟器启动失败"
break
# 添加静默进程标记
# 更新静默进程标记
if self.set["Game"]["Style"] == "Emulator":
logger.info(
f"添加静默进程标记：{self.game_path}",
f"更新静默进程标记：{self.game_path}，标记有效时间：{datetime.now() + timedelta(seconds=self.set['Game']['WaitTime'] + 10)}",
module=f"通用调度器-{self.name}",
)
Config.silence_list.append(self.game_path)
Config.silence_dict[
self.game_path
] = datetime.now() + timedelta(
seconds=self.set["Game"]["WaitTime"] + 10
)
self.update_log_text.emit(
f"正在等待游戏/模拟器完成启动\n请等待{self.set['Game']['WaitTime']}s"
@@ -331,17 +335,6 @@ class GeneralManager(QObject):
self.sleep(self.set["Game"]["WaitTime"])
# 10s后移除静默进程标记
if self.set["Game"]["Style"] == "Emulator":
logger.info(
f"10s后移除静默进程标记：{self.game_path}",
module=f"通用调度器-{self.name}",
)
QTimer.singleShot(
10000,
partial(Config.silence_list.remove, self.game_path),
)
# 运行脚本任务
logger.info(
f"运行脚本任务：{self.script_exe_path}，参数：{self.set['Script']['Arguments']}",