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

8
app/core/config.py
View File

@@ -275,11 +275,11 @@ class QueueConfig(LQConfig):
def __init__(self) -> None: def __init__(self) -> None:
super().__init__() super().__init__()
self.queueSet_Name = ConfigItem("QueueSet", "Name", "") self.QueueSet_Name = ConfigItem("QueueSet", "Name", "")
self.queueSet_TimeEnabled = ConfigItem( self.QueueSet_TimeEnabled = ConfigItem(
"QueueSet", "TimeEnabled", False, BoolValidator() "QueueSet", "TimeEnabled", False, BoolValidator()
) )
self.queueSet_AfterAccomplish = OptionsConfigItem( self.QueueSet_AfterAccomplish = OptionsConfigItem(
"QueueSet", "QueueSet",
"AfterAccomplish", "AfterAccomplish",
"NoAction", "NoAction",
@@ -705,7 +705,7 @@ class AppConfig(GlobalConfig):
self.main_window = None self.main_window = None
self.PASSWORD = "" self.PASSWORD = ""
self.running_list = [] self.running_list = []
self.silence_list = [] self.silence_dict: Dict[Path, datetime] = {}
self.info_bar_list = [] self.info_bar_list = []
self.stage_dict = { self.stage_dict = {
"ALL": {"value": [], "text": []}, "ALL": {"value": [], "text": []},

4
app/core/task_manager.py
View File

@@ -380,14 +380,14 @@ class _TaskManager(QObject):
# 根据调度队列情况设置电源状态 # 根据调度队列情况设置电源状态
if ( if (
Config.queue_dict[name]["Config"].get( Config.queue_dict[name]["Config"].get(
Config.queue_dict[name]["Config"].queueSet_AfterAccomplish Config.queue_dict[name]["Config"].QueueSet_AfterAccomplish
) )
!= "NoAction" != "NoAction"
and Config.power_sign == "NoAction" and Config.power_sign == "NoAction"
): ):
Config.set_power_sign( Config.set_power_sign(
Config.queue_dict[name]["Config"].get( Config.queue_dict[name]["Config"].get(
Config.queue_dict[name]["Config"].queueSet_AfterAccomplish Config.queue_dict[name]["Config"].QueueSet_AfterAccomplish
) )
) )

11
app/core/timer.py
View File

@@ -79,7 +79,7 @@ class _MainTimer(QObject):
for name, info in Config.queue_dict.items(): for name, info in Config.queue_dict.items():
if not info["Config"].get(info["Config"].queueSet_TimeEnabled): if not info["Config"].get(info["Config"].QueueSet_TimeEnabled):
continue continue
data = info["Config"].toDict() data = info["Config"].toDict()
@@ -114,9 +114,12 @@ class _MainTimer(QObject):
emulator_windows = [] emulator_windows = []
for window in windows: for window in windows:
for emulator_path in Config.silence_list: for emulator_path, endtime in Config.silence_dict.items():
# 此处排除雷电名为新通知的窗口 if (
if str(emulator_path) in window and window[0] != "新通知": datetime.now() < endtime
and str(emulator_path) in window
and window[0] != "新通知" # 此处排除雷电名为新通知的窗口
):
emulator_windows.append(window) emulator_windows.append(window)
if emulator_windows: if emulator_windows:

17
app/models/MAA.py
View File

@@ -570,12 +570,14 @@ class MaaManager(QObject):
self.if_open_emulator = True self.if_open_emulator = True
break break
# 添加静默进程标记 # 更新静默进程标记有效时间
logger.info( logger.info(
f"添加静默进程标记：{self.emulator_path}", f"更新静默进程标记：{self.emulator_path}，标记有效时间：{datetime.now() + timedelta(seconds=self.wait_time + 10)}",
module=f"MAA调度器-{self.name}", 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() self.search_ADB_address()
@@ -1082,15 +1084,6 @@ class MaaManager(QObject):
if self.isInterruptionRequested: if self.isInterruptionRequested:
return None 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: if "-" in self.ADB_address:
ADB_ip = f"{self.ADB_address.split("-")[0]}-" ADB_ip = f"{self.ADB_address.split("-")[0]}-"
ADB_port = int(self.ADB_address.split("-")[1]) 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 = "游戏/模拟器启动失败" self.script_result = "游戏/模拟器启动失败"
break break
# 添加静默进程标记 # 更新静默进程标记
if self.set["Game"]["Style"] == "Emulator": if self.set["Game"]["Style"] == "Emulator":
logger.info( logger.info(
f"添加静默进程标记：{self.game_path}", f"更新静默进程标记：{self.game_path}，标记有效时间：{datetime.now() + timedelta(seconds=self.set['Game']['WaitTime'] + 10)}",
module=f"通用调度器-{self.name}", 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( self.update_log_text.emit(
f"正在等待游戏/模拟器完成启动\n请等待{self.set['Game']['WaitTime']}s" f"正在等待游戏/模拟器完成启动\n请等待{self.set['Game']['WaitTime']}s"
@@ -331,17 +335,6 @@ class GeneralManager(QObject):
self.sleep(self.set["Game"]["WaitTime"]) 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( logger.info(
f"运行脚本任务：{self.script_exe_path}，参数：{self.set['Script']['Arguments']}", f"运行脚本任务：{self.script_exe_path}，参数：{self.set['Script']['Arguments']}",

8
app/ui/dispatch_center.py
View File

@@ -240,8 +240,8 @@ class DispatchCenter(QWidget):
self.script_list["主调度台"].top_bar.object.addItem( self.script_list["主调度台"].top_bar.object.addItem(
( (
"队列" "队列"
if info["Config"].get(info["Config"].queueSet_Name) == "" if info["Config"].get(info["Config"].QueueSet_Name) == ""
else f"队列 - {info["Config"].get(info["Config"].queueSet_Name)}" else f"队列 - {info["Config"].get(info["Config"].QueueSet_Name)}"
), ),
userData=name, userData=name,
) )
@@ -312,8 +312,8 @@ class DispatchCenter(QWidget):
continue continue
text_list.append( text_list.append(
"队列" "队列"
if info["Config"].get(info["Config"].queueSet_Name) == "" if info["Config"].get(info["Config"].QueueSet_Name) == ""
else f"队列 - {info["Config"].get(info["Config"].queueSet_Name)}" else f"队列 - {info["Config"].get(info["Config"].QueueSet_Name)}"
) )
data_list.append(name) data_list.append(name)

6
app/ui/queue_manager.py
View File

@@ -399,7 +399,7 @@ class QueueManager(QWidget):
content="用于标识调度队列的名称", content="用于标识调度队列的名称",
text="请输入调度队列名称", text="请输入调度队列名称",
qconfig=self.config, qconfig=self.config,
configItem=self.config.queueSet_Name, configItem=self.config.QueueSet_Name,
parent=self, parent=self,
) )
self.card_Enable = SwitchSettingCard( self.card_Enable = SwitchSettingCard(
@@ -407,7 +407,7 @@ class QueueManager(QWidget):
title="定时运行状态", title="定时运行状态",
content="调度队列定时运行状态，仅启用时会执行定时任务", content="调度队列定时运行状态，仅启用时会执行定时任务",
qconfig=self.config, qconfig=self.config,
configItem=self.config.queueSet_TimeEnabled, configItem=self.config.QueueSet_TimeEnabled,
parent=self, parent=self,
) )
self.card_AfterAccomplish = ComboBoxSettingCard( self.card_AfterAccomplish = ComboBoxSettingCard(
@@ -423,7 +423,7 @@ class QueueManager(QWidget):
"关机（强制）", "关机（强制）",
], ],
qconfig=self.config, qconfig=self.config,
configItem=self.config.queueSet_AfterAccomplish, configItem=self.config.QueueSet_AfterAccomplish,
parent=self, parent=self,
) )

3
resources/version.json
View File

@@ -3,7 +3,8 @@
"version_info": { "version_info": {
"4.4.1.5": { "4.4.1.5": {
"程序优化": [ "程序优化": [
"优化调度队列配置逻辑" "优化调度队列配置逻辑",
"优化静默进程标记逻辑，避免未能及时移除导致相关功能持续开启"
] ]
}, },
"4.4.1.4": { "4.4.1.4": {