fix: 修复雷电模拟器静默模式无法正常识别模拟器是否隐藏相关问题
This commit is contained in:
@@ -29,6 +29,7 @@ from loguru import logger
|
|||||||
from PySide6.QtWidgets import QWidget
|
from PySide6.QtWidgets import QWidget
|
||||||
from PySide6.QtCore import QTimer
|
from PySide6.QtCore import QTimer
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
from pathlib import Path
|
||||||
import pyautogui
|
import pyautogui
|
||||||
|
|
||||||
from .config import Config
|
from .config import Config
|
||||||
@@ -97,6 +98,16 @@ class _MainTimer(QWidget):
|
|||||||
):
|
):
|
||||||
|
|
||||||
windows = System.get_window_info()
|
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(
|
if any(
|
||||||
str(emulator_path) in window
|
str(emulator_path) in window
|
||||||
for window in windows
|
for window in windows
|
||||||
|
|||||||
@@ -567,9 +567,6 @@ class MaaManager(QObject):
|
|||||||
break
|
break
|
||||||
time.sleep(1)
|
time.sleep(1)
|
||||||
|
|
||||||
# 移除静默进程标记
|
|
||||||
Config.silence_list.remove(self.emulator_path)
|
|
||||||
|
|
||||||
# 任务结束后释放ADB
|
# 任务结束后释放ADB
|
||||||
try:
|
try:
|
||||||
subprocess.run(
|
subprocess.run(
|
||||||
@@ -908,6 +905,9 @@ class MaaManager(QObject):
|
|||||||
break
|
break
|
||||||
time.sleep(1)
|
time.sleep(1)
|
||||||
|
|
||||||
|
# 移除静默进程标记
|
||||||
|
Config.silence_list.remove(self.emulator_path)
|
||||||
|
|
||||||
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])
|
||||||
|
|||||||
@@ -5,7 +5,11 @@
|
|||||||
"新增功能": [
|
"新增功能": [
|
||||||
"支持为每一个用户执行独立通知",
|
"支持为每一个用户执行独立通知",
|
||||||
"输入文本框适配文本插入操作",
|
"输入文本框适配文本插入操作",
|
||||||
"计划表功能上线"
|
"计划表功能上线",
|
||||||
|
"静默控制时长从全任务内缩短至搜索ADB时段内"
|
||||||
|
],
|
||||||
|
"修复bug": [
|
||||||
|
"修复雷电模拟器静默模式无法正常识别模拟器是否隐藏相关问题"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"4.3.8.3": {
|
"4.3.8.3": {
|
||||||
|
|||||||
Reference in New Issue
Block a user