YoursFunny/ArisuAutoSweeper
1
0
Fork 0
mirror of https://github.com/TheFunny/ArisuAutoSweeper synced 2025-12-16 22:05:12 +00:00
Code Releases Wiki Activity

fix: login

Browse Source
This commit is contained in:
RedDeadDepresso 2024-01-10 21:06:14 +00:00 committed by YoursFunny
parent 7e1070e740
commit a8caafb292
Signed by: YoursFunny
GPG Key ID: 207EDC3CD5B40F9C
5 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/en/base/popup/QUIT.BUTTON.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.4 KiB

BIN
assets/en/base/popup/QUIT.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.1 KiB

12
tasks/base/assets/assets_base_popup.py
View File

@ -261,3 +261,15 @@ NETWORK_RECONNECT_OK = ButtonWrapper(
button=(540, 471, 744, 530), button=(540, 471, 744, 530),
), ),
) )
QUIT = ButtonWrapper(
name='QUIT',
jp=None,
en=Button(
file='./assets/en/base/popup/QUIT.png',
area=(587, 309, 688, 357),
search=(567, 289, 708, 377),
color=(225, 225, 225),
button=(410, 473, 623, 532),
),
zht=None,
)

9
tasks/base/popup.py
View File

@ -116,4 +116,11 @@ class PopupHandler(ModuleBase):
if self.appear_then_click(LEVEL_UP, interval=interval): if self.appear_then_click(LEVEL_UP, interval=interval):
return True return True
return False return False
def handle_quit(self, interval=5) -> bool:
if self.appear_then_click(QUIT, interval=interval):
return True
return False

20
tasks/base/ui.py
View File

@ -130,7 +130,7 @@ class UI(MainPage):
self.interval_clear(list(Page.iter_check_buttons())) self.interval_clear(list(Page.iter_check_buttons()))
# loading_timer = Timer(0.5) # loading_timer = Timer(0.5)
back_timer = Timer(10, 10) #back_timer = Timer(10, 10)
logger.hr(f"UI goto {destination}") logger.hr(f"UI goto {destination}")
while 1: while 1:
if skip_first_screenshot: if skip_first_screenshot:
@ -177,14 +177,14 @@ class UI(MainPage):
if self.ui_additional(): if self.ui_additional():
continue continue
back_timer.start() #back_timer.start()
if back_timer.reached_and_reset(): #if back_timer.reached_and_reset():
if self.match_color(LOGIN_LOADING, interval=5, threshold=80) or self.appear_trademark_year(): # if self.match_color(LOGIN_LOADING, interval=5, threshold=80) or self.appear_trademark_year():
from tasks.login.login import Login # from tasks.login.login import Login
Login(self.config, self.device).handle_app_login() # Login(self.config, self.device).handle_app_login()
continue # continue
self.device.back() # self.device.back()
logger.info("Unknown page, try to back") # logger.info("Unknown page, try to back")
# Reset connection # Reset connection
Page.clear_connection() Page.clear_connection()
@ -372,6 +372,8 @@ class UI(MainPage):
return True return True
if self.handle_daily_news(): if self.handle_daily_news():
return True return True
if self.handle_quit():
return True
if self.handle_network_reconnect(): if self.handle_network_reconnect():
return True return True
if self.handle_affection_level_up(): if self.handle_affection_level_up():