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

Opt: Show unexpected screenshot in ascreencap

Browse Source
This commit is contained in:
LmeSzinc
2022-06-03 01:29:38 +08:00
parent 515beddde5
commit 2555588740
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/device/method/adb.py
View File

@@ -103,7 +103,7 @@ class Adb(Connection):
continue continue
self.__screenshot_method_fixed = self.__screenshot_method self.__screenshot_method_fixed = self.__screenshot_method
if len(screenshot) < 100: if len(screenshot) < 500:
logger.warning(f'Unexpected screenshot: {screenshot}') logger.warning(f'Unexpected screenshot: {screenshot}')
raise OSError(f'cannot load screenshot') raise OSError(f'cannot load screenshot')
@@ -118,7 +118,7 @@ class Adb(Connection):
@retry @retry
def screenshot_adb_nc(self): def screenshot_adb_nc(self):
data = self.adb_shell_nc(['screencap']) data = self.adb_shell_nc(['screencap'])
if len(data) < 100: if len(data) < 500:
logger.warning(f'Unexpected screenshot: {data}') logger.warning(f'Unexpected screenshot: {data}')
# Load data # Load data

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

@@ -158,7 +158,7 @@ class AScreenCap(Connection):
continue continue
self.__screenshot_method_fixed = self.__screenshot_method self.__screenshot_method_fixed = self.__screenshot_method
if len(screenshot) < 100: if len(screenshot) < 500:
logger.warning(f'Unexpected screenshot: {screenshot}') logger.warning(f'Unexpected screenshot: {screenshot}')
raise OSError(f'cannot load screenshot') raise OSError(f'cannot load screenshot')
@@ -173,5 +173,7 @@ class AScreenCap(Connection):
@retry @retry
def screenshot_ascreencap_nc(self): def screenshot_ascreencap_nc(self):
data = self.adb_shell_nc([self.config.ASCREENCAP_FILEPATH_REMOTE, '--pack', '2', '--stdout']) data = self.adb_shell_nc([self.config.ASCREENCAP_FILEPATH_REMOTE, '--pack', '2', '--stdout'])
if len(data) < 500:
logger.warning(f'Unexpected screenshot: {data}')
return self.__uncompress(data) return self.__uncompress(data)