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

Fix: Stuck in minitouch init

Browse Source 
- Fix: Handle AdbError(closed)
This commit is contained in:
LmeSzinc
2022-03-05 09:22:20 +08:00
parent bf87a69c17
commit be8269b555
7 changed files with 68 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module/device/method/uiautomator_2.py
View File

@@ -19,10 +19,13 @@ def retry(func):
self (Uiautomator2):
"""
init = None
sleep = True
for _ in range(RETRY_TRIES):
try:
if callable(init):
self.sleep(RETRY_DELAY)
if sleep:
self.sleep(RETRY_DELAY)
sleep = True
init()
return func(self, *args, **kwargs)
# Can't handle
@@ -33,11 +36,13 @@ def retry(func):
logger.error(e)
def init():
self.adb_disconnect(self.serial)
self.adb_connect(self.serial)
# In `device.set_new_command_timeout(604800)`
# json.decoder.JSONDecodeError: Expecting value: line 1 column 2 (char 1)
except JSONDecodeError as e:
logger.error(e)
sleep = False
def init():
self.install_uiautomator2()
@@ -45,6 +50,7 @@ def retry(func):
except AdbError as e:
if handle_adb_error(e):
def init():
self.adb_disconnect(self.serial)
self.adb_connect(self.serial)
else:
break
@@ -52,6 +58,7 @@ def retry(func):
except RuntimeError as e:
if handle_adb_error(e):
def init():
self.adb_disconnect(self.serial)
self.adb_connect(self.serial)
else:
break