1
0
mirror of https://github.com/TheFunny/ArisuAutoSweeper synced 2025-12-16 22:05:12 +00:00

perf(popup): optimize popup handle method

This commit is contained in:
YoursFunny 2023-11-04 16:08:44 +08:00
parent 826a6b2348
commit 0551207714
Signed by: YoursFunny
GPG Key ID: 207EDC3CD5B40F9C

View File

@ -5,7 +5,7 @@ from tasks.base.assets.assets_base_page import LOADING_CHECK
class PopupHandler(ModuleBase): class PopupHandler(ModuleBase):
def handle_loading(self, interval=5) -> bool: def handle_loading(self) -> bool:
""" """
Args: Args:
interval: interval:
@ -13,7 +13,7 @@ class PopupHandler(ModuleBase):
Returns: Returns:
If handled. If handled.
""" """
if self.appear(LOADING_CHECK, interval=interval): if self.appear(LOADING_CHECK):
timer = Timer(0.5).start() timer = Timer(0.5).start()
while 1: while 1:
if timer.reached_and_reset(): if timer.reached_and_reset():
@ -52,13 +52,13 @@ class PopupHandler(ModuleBase):
if self.appear_then_click(GET_REWARD_SKIP, interval=interval): if self.appear_then_click(GET_REWARD_SKIP, interval=interval):
return True return True
def handle_daily_news(self, interval=5) -> bool: def handle_daily_news(self, interval=2) -> bool:
if self.appear_then_click(DAILY_NEWS, interval=interval): if self.appear_then_click(DAILY_NEWS, interval=interval):
return True return True
return False return False
def handle_daily_reward(self, interval=5) -> bool: def handle_daily_reward(self, interval=2) -> bool:
if self.appear_then_click(DAILY_REWARD, interval=interval): if self.appear_then_click(DAILY_REWARD, interval=interval):
return True return True
@ -70,16 +70,14 @@ class PopupHandler(ModuleBase):
return False return False
def handle_affection_level_up(self, interval=5) -> bool: def handle_affection_level_up(self) -> bool:
if self.appear_then_click(AFFECTION_LEVEL_UP, interval=interval): if self.appear_then_click(AFFECTION_LEVEL_UP):
timer = Timer(0.2).start()
while 1: while 1:
if timer.reached_and_reset(): self.device.screenshot()
self.device.screenshot() if self.appear(AFFECTION_LEVEL_UP):
if self.appear(AFFECTION_LEVEL_UP): self.click_with_interval(AFFECTION_LEVEL_UP, interval=1)
self.device.click(AFFECTION_LEVEL_UP) else:
else: break
break
return True return True
return False return False