diff --git a/app/core/timer.py b/app/core/timer.py index 09e3d81..c09bd7f 100644 --- a/app/core/timer.py +++ b/app/core/timer.py @@ -29,6 +29,7 @@ from loguru import logger from PySide6.QtWidgets import QWidget from PySide6.QtCore import QTimer from datetime import datetime +from pathlib import Path import pyautogui from .config import Config @@ -97,6 +98,16 @@ class _MainTimer(QWidget): ): windows = System.get_window_info() + + # 排除雷电名为新通知的窗口 + windows = [ + window + for window in windows + if not ( + window[0] == "新通知" and Path(window[1]) in Config.silence_list + ) + ] + if any( str(emulator_path) in window for window in windows diff --git a/app/models/MAA.py b/app/models/MAA.py index edbef87..c3ccf2a 100644 --- a/app/models/MAA.py +++ b/app/models/MAA.py @@ -567,9 +567,6 @@ class MaaManager(QObject): break time.sleep(1) - # 移除静默进程标记 - Config.silence_list.remove(self.emulator_path) - # 任务结束后释放ADB try: subprocess.run( @@ -908,6 +905,9 @@ class MaaManager(QObject): break time.sleep(1) + # 移除静默进程标记 + Config.silence_list.remove(self.emulator_path) + if "-" in self.ADB_address: ADB_ip = f"{self.ADB_address.split("-")[0]}-" ADB_port = int(self.ADB_address.split("-")[1]) diff --git a/resources/version.json b/resources/version.json index 97ed255..46119a3 100644 --- a/resources/version.json +++ b/resources/version.json @@ -5,7 +5,11 @@ "新增功能": [ "支持为每一个用户执行独立通知", "输入文本框适配文本插入操作", - "计划表功能上线" + "计划表功能上线", + "静默控制时长从全任务内缩短至搜索ADB时段内" + ], + "修复bug": [ + "修复雷电模拟器静默模式无法正常识别模拟器是否隐藏相关问题" ] }, "4.3.8.3": {