mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-12 00:28:20 +08:00
Opt: Show exceptions under retry decorator
This commit is contained in:
@@ -1,8 +1,7 @@
|
||||
import time
|
||||
from collections import deque
|
||||
|
||||
from retry import retry
|
||||
|
||||
from module.base.retry import retry
|
||||
from module.base.timer import Timer
|
||||
from module.base.utils import *
|
||||
from module.device.minitouch import MiniTouch
|
||||
@@ -79,11 +78,11 @@ class Control(MiniTouch):
|
||||
else:
|
||||
self._click_adb(x, y)
|
||||
|
||||
@retry(tries=10, delay=3, logger=logger)
|
||||
@retry(tries=10, delay=3)
|
||||
def _click_uiautomator2(self, x, y):
|
||||
self.device.click(int(x), int(y))
|
||||
|
||||
@retry(tries=10, delay=3, logger=logger)
|
||||
@retry(tries=10, delay=3)
|
||||
def _click_adb(self, x, y):
|
||||
self.adb_shell(['input', 'tap', str(x), str(y)])
|
||||
|
||||
|
||||
@@ -6,8 +6,8 @@ from io import BytesIO
|
||||
|
||||
from PIL import Image
|
||||
from cached_property import cached_property
|
||||
from retry import retry
|
||||
|
||||
from module.base.retry import retry
|
||||
from module.base.timer import Timer, timer
|
||||
from module.device.ascreencap import AScreenCap
|
||||
from module.exception import ScriptError
|
||||
@@ -54,7 +54,7 @@ class Screenshot(AScreenCap):
|
||||
screenshot = self.adb_shell(['screencap', '-p'])
|
||||
return self._process_screenshot(screenshot)
|
||||
|
||||
@retry(tries=10, delay=3, logger=logger)
|
||||
@retry(tries=10, delay=3)
|
||||
@timer
|
||||
def screenshot(self):
|
||||
"""
|
||||
|
||||
Reference in New Issue
Block a user