mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-12 12:08:21 +08:00
Refactor: Faster device retrying
This commit is contained in:
@@ -14,7 +14,7 @@ from module.base.decorator import Config, cached_property, del_cached_property
|
||||
from module.base.timer import Timer
|
||||
from module.base.utils import *
|
||||
from module.device.connection import Connection
|
||||
from module.device.method.utils import RETRY_DELAY, RETRY_TRIES, handle_adb_error
|
||||
from module.device.method.utils import RETRY_TRIES, retry_sleep, handle_adb_error
|
||||
from module.exception import RequestHumanTakeover, ScriptError
|
||||
from module.logger import logger
|
||||
|
||||
@@ -42,6 +42,7 @@ def insert_swipe(p0, p3, speed=15, min_distance=10):
|
||||
p0: Start point.
|
||||
p3: End point.
|
||||
speed: Average move speed, pixels per 10ms.
|
||||
min_distance:
|
||||
|
||||
Returns:
|
||||
list[list[int]]: List of points.
|
||||
@@ -286,13 +287,10 @@ def retry(func):
|
||||
self (Minitouch):
|
||||
"""
|
||||
init = None
|
||||
sleep = True
|
||||
for _ in range(RETRY_TRIES):
|
||||
try:
|
||||
if callable(init):
|
||||
if sleep:
|
||||
self.sleep(RETRY_DELAY)
|
||||
sleep = True
|
||||
retry_sleep(_)
|
||||
init()
|
||||
return func(self, *args, **kwargs)
|
||||
# Can't handle
|
||||
@@ -313,7 +311,6 @@ def retry(func):
|
||||
# MinitouchNotInstalledError: Received empty data from minitouch
|
||||
except MinitouchNotInstalledError as e:
|
||||
logger.error(e)
|
||||
sleep = False
|
||||
|
||||
def init():
|
||||
self.install_uiautomator2()
|
||||
@@ -323,7 +320,6 @@ def retry(func):
|
||||
# MinitouchOccupiedError: Timeout when connecting to minitouch
|
||||
except MinitouchOccupiedError as e:
|
||||
logger.error(e)
|
||||
sleep = False
|
||||
|
||||
def init():
|
||||
self.restart_atx()
|
||||
|
||||
Reference in New Issue
Block a user