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

fix(maa): 修复ADB与模拟器相关日志信息报错时不显示

Browse Source
This commit is contained in:
DLmaster361
2025-05-29 21:06:09 +08:00
parent 7d5c6b8222
commit 222a3b35a2
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/MAA.py
View File

@@ -426,11 +426,11 @@ class MaaManager(QObject):
# 任务开始前释放ADB
try:
logger.info(f"{self.name} | 释放ADB：{self.ADB_address}")
subprocess.run(
[self.ADB_path, "disconnect", self.ADB_address],
creationflags=subprocess.CREATE_NO_WINDOW,
)
logger.info(f"{self.name} | 释放ADB：{self.ADB_address}")
except subprocess.CalledProcessError as e:
# 忽略错误,因为可能本来就没有连接
logger.warning(f"{self.name} | 释放ADB时出现异常：{e}")
@@ -445,13 +445,13 @@ class MaaManager(QObject):
if self.if_open_emulator_process:
try:
logger.info(
f"{self.name} | 启动模拟器：{self.emulator_path}，参数：{self.emulator_arguments}"
)
self.emulator_process = subprocess.Popen(
[self.emulator_path, *self.emulator_arguments],
creationflags=subprocess.CREATE_NO_WINDOW,
)
logger.info(
f"{self.name} | 启动模拟器：{self.emulator_path}，参数：{self.emulator_arguments}"
)
except Exception as e:
logger.error(f"{self.name} | 启动模拟器时出现异常：{e}")
self.push_info_bar.emit(
@@ -571,11 +571,11 @@ class MaaManager(QObject):
# 任务结束后释放ADB
try:
logger.info(f"{self.name} | 释放ADB：{self.ADB_address}")
subprocess.run(
[self.ADB_path, "disconnect", self.ADB_address],
creationflags=subprocess.CREATE_NO_WINDOW,
)
logger.info(f"{self.name} | 释放ADB：{self.ADB_address}")
except subprocess.CalledProcessError as e:
# 忽略错误,因为可能本来就没有连接
logger.warning(f"{self.name} | 释放ADB时出现异常：{e}")