sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-18 19:33:33 +08:00
Code Activity

Fix:a A hint when trying to use '127.0.0.1:58526' but not 'wsa-0' as serial

Browse Source
This commit is contained in:
SarContDeli
2022-03-18 23:25:39 +08:00
parent f7b95014ef
commit b12edf27ca
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/device/app_control.py
View File

@@ -27,7 +27,7 @@ class AppControl(Adb, WSA, Uiautomator2):
method = self.config.Emulator_ControlMethod method = self.config.Emulator_ControlMethod
logger.info(f'App start: {package}') logger.info(f'App start: {package}')
if self.config.Emulator_Serial == 'wsa-0': if self.config.Emulator_Serial == 'wsa-0':
self.app_start_wsa(package, display = 0) self.app_start_wsa(package, display=0)
elif method == 'uiautomator2' or method == 'minitouch': elif method == 'uiautomator2' or method == 'minitouch':
self.app_start_uiautomator2(package) self.app_start_uiautomator2(package)
else: else:

2
module/device/connection.py
View File

@@ -36,6 +36,8 @@ class Connection:
self.serial = self.find_bluestacks4_hyperv(self.serial) self.serial = self.find_bluestacks4_hyperv(self.serial)
if "bluestacks5-hyperv" in self.serial: if "bluestacks5-hyperv" in self.serial:
self.serial = self.find_bluestacks5_hyperv(self.serial) self.serial = self.find_bluestacks5_hyperv(self.serial)
if "127.0.0.1:58526" in self.serial:
raise RequestHumanTakeover('Serial 127.0.0.1:58526 seems to be WSA, please use "wsa-0" or others to instead')
if "wsa" in self.serial: if "wsa" in self.serial:
self.serial = '127.0.0.1:58526' self.serial = '127.0.0.1:58526'

3
module/device/method/wsa.py
View File

@@ -95,8 +95,7 @@ class WSA(Connection):
ret = next(ms).group('activity') ret = next(ms).group('activity')
return ret return ret
except StopIteration: except StopIteration:
logger.critical("Couldn't get activity name, please check setting Emulator.PackageName") raise RequestHumanTakeover("Couldn't get activity name, please check setting Emulator.PackageName")
raise RequestHumanTakeover
@retry @retry
def get_display_id(self): def get_display_id(self):