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

fix: login

Browse Source
This commit is contained in:
RedDeadDepresso 2024-01-09 01:07:04 +00:00
parent 628fd5c19a
commit 15ece02855
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tasks/base/ui.py
View File

@ -89,12 +89,13 @@ class UI(MainPage):
logger.info("Additional ui page handled") logger.info("Additional ui page handled")
timeout.reset() timeout.reset()
continue continue
if back_timer.reached_and_reset():
# this might be bad but it works # this might be bad but it works
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()
timeout.reset()
continue continue
if back_timer.reached_and_reset():
logger.info("Unknown page, try to back") logger.info("Unknown page, try to back")
if u2_back: if u2_back:
self.device.u2.press("back") self.device.u2.press("back")
@ -129,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(8, 5).start()
logger.hr(f"UI goto {destination}") logger.hr(f"UI goto {destination}")
while 1: while 1:
if skip_first_screenshot: if skip_first_screenshot:
@ -148,6 +149,7 @@ class UI(MainPage):
# Destination page # Destination page
if self.ui_page_appear(destination): if self.ui_page_appear(destination):
logger.info(f'Page arrive: {destination}') logger.info(f'Page arrive: {destination}')
self.close_popup(destination.check_button)
if self.ui_page_confirm(destination): if self.ui_page_confirm(destination):
logger.info(f'Page arrive confirm {destination}') logger.info(f'Page arrive confirm {destination}')
break break
@ -159,6 +161,7 @@ class UI(MainPage):
continue continue
if self.appear(page.check_button, interval=5): if self.appear(page.check_button, interval=5):
logger.info(f'Page switch: {page} -> {page.parent}') logger.info(f'Page switch: {page} -> {page.parent}')
self.close_popup(page.check_button)
# self.handle_lang_check(page) # self.handle_lang_check(page)
if self.ui_page_confirm(page): if self.ui_page_confirm(page):
logger.info(f'Page arrive confirm {page}') logger.info(f'Page arrive confirm {page}')
@ -174,6 +177,10 @@ class UI(MainPage):
if self.ui_additional(): if self.ui_additional():
continue continue
if back_timer.reached_and_reset():
self.device.u2.press("back")
logger.info("Unknown page, try to back")
# Reset connection # Reset connection
Page.clear_connection() Page.clear_connection()