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

Refactor: Faster device retrying

Browse Source
This commit is contained in:
LmeSzinc
2022-12-29 19:22:55 +08:00
parent 1d96582c1f
commit 2285b716cf
9 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,7 @@ from lxml import etree
from module.base.utils import *
from module.device.connection import Connection
from module.device.method.utils import (RETRY_DELAY, RETRY_TRIES,
from module.device.method.utils import (RETRY_TRIES, retry_sleep,
handle_adb_error, PackageNotInstalled, possible_reasons)
from module.exception import RequestHumanTakeover
from module.logger import logger
@@ -24,14 +24,10 @@ def retry(func):
self (Uiautomator2):
"""
init = None
sleep = True
for _ in range(RETRY_TRIES):
try:
if callable(init):
if sleep:
self.sleep(RETRY_DELAY)
sleep = True
init()
retry_sleep(_)
return func(self, *args, **kwargs)
# Can't handle
except RequestHumanTakeover:
@@ -46,7 +42,6 @@ def retry(func):
# 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()