From 222a3b35a2cdc817f60e8eb0ece74dcddf9f0045 Mon Sep 17 00:00:00 2001 From: DLmaster361 Date: Thu, 29 May 2025 21:06:09 +0800 Subject: [PATCH] =?UTF-8?q?fix(maa):=20=20=E4=BF=AE=E5=A4=8DADB=E4=B8=8E?= =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E5=99=A8=E7=9B=B8=E5=85=B3=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8A=A5=E9=94=99=E6=97=B6=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/MAA.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/MAA.py b/app/models/MAA.py index d43de4e..1f39c54 100644 --- a/app/models/MAA.py +++ b/app/models/MAA.py @@ -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}")