sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 01:38:21 +08:00
Code Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
LmeSzinc
2023-01-25 00:21:30 +08:00
parent 965c46f800 a7cbb3faa6
commit a5c0b2abb9
66 changed files with 652 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
module/device/method/ascreencap.py
View File

@@ -95,11 +95,8 @@ class AScreenCap(Connection):
filepath = os.path.join(self.config.ASCREENCAP_FILEPATH_LOCAL, ver, arc, 'ascreencap')
if not os.path.exists(filepath):
logger.critical('No suitable version of aScreenCap lib available for this device')
if self.is_mumu_family:
logger.critical('If you are using MuMu X, please set screenshot method to scrcpy')
else:
logger.critical('Please use ADB or uiautomator2 for screenshots instead')
raise RequestHumanTakeover
logger.critical('Please use ADB or uiautomator2 for screenshots instead')
raise RequestHumanTakeover
logger.info(f'pushing {filepath}')
self.adb_push(filepath, self.config.ASCREENCAP_FILEPATH_REMOTE)

2
module/device/screenshot.py
View File

@@ -241,7 +241,7 @@ class Screenshot(Adb, WSA, DroidCast, AScreenCap, Scrcpy):
if self.config.Emulator_ScreenshotMethod == 'DroidCast':
self.droidcast_stop()
else:
logger.warning('If you are using MuMu X, please set screenshot method to scrcpy')
logger.warning('If you are using MuMu X, please upgrade to version >= 12.1.5.0')
self._screen_black_checked = False
return False
else: