From a8caafb29274d67db440319159cdc98659201888 Mon Sep 17 00:00:00 2001 From: RedDeadDepresso <94017243+RedDeadDepresso@users.noreply.github.com> Date: Wed, 10 Jan 2024 21:06:14 +0000 Subject: [PATCH] fix: login --- assets/en/base/popup/QUIT.BUTTON.png | Bin 0 -> 9676 bytes assets/en/base/popup/QUIT.png | Bin 0 -> 6215 bytes tasks/base/assets/assets_base_popup.py | 12 ++++++++++++ tasks/base/popup.py | 9 ++++++++- tasks/base/ui.py | 20 +++++++++++--------- 5 files changed, 31 insertions(+), 10 deletions(-) create mode 100644 assets/en/base/popup/QUIT.BUTTON.png create mode 100644 assets/en/base/popup/QUIT.png diff --git a/assets/en/base/popup/QUIT.BUTTON.png b/assets/en/base/popup/QUIT.BUTTON.png new file mode 100644 index 0000000000000000000000000000000000000000..c1d211fb515bb9a6ba155e2376cf4eb5ec58256f GIT binary patch literal 9676 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 E0|7>clK=n! literal 0 HcmV?d00001 diff --git a/assets/en/base/popup/QUIT.png b/assets/en/base/popup/QUIT.png new file mode 100644 index 0000000000000000000000000000000000000000..effffef45b555e1fb77417880f8b471096fe3481 GIT binary patch literal 6215 zcmeHJcUTkI79T(*C?acltca3CEXcwn0Rjm{rASx=Y0`@!86Xc*HpNh+sJI9gWYxvO ziVav1LB#?D#0G*aph%G>B8x}|MOcWyyP@sw`*inv`^Wo>`M#OCbIf8i|hGY>YMxA_E0Xgil2WF#}mVa*z>rQZE^dCDSk#Jqh6l7-6?c45D4E zZPBJ|E`la$;WcSE93HI)Mmj`-K8f@Vnt&r{!#E;L(A6a1$T&P%R~J2fVSza=-Ir`{ zwr$!N_%g!!^Z6Vy3=4%qEupp+o9hSTNhA`CBftcLCO~NNf?0fOkS2?_c1D94!lQ8+ z96p21LQ6DKeb@rN5f->Q6$6tqtCq!^<_Rzc2T?gNUJECQX%a}M&Ehx$Zs4SGIt@kw z5hlXo^8gkQU*mOvm zA4v&MRt1^D;DO8vo^A>b$amADKn8lU5Xe;8R1`Ex4kC2y^fcoi@7|PJp+5rn`h0Fq zA$V+GzL3gAw)z2n|2FMm;5RJkLQ^5Y{~g_=><=Al1`gVwWH{S^!N+V1M_8b5b3udt z)?(p72wEy-X|~ldD6yw0l;c>vTDCu{P8UA6w=)u*ymO74VwGF`6^C^A){=mgDf_Vp zmfP8FNiW<)3y!IYPr%+LcRu?r@an$h-Uko1OC$SKWahH8FN=xSE~dL zR(<0}|Bj{5`8wn_U-E;@F+|-5FZw(w@Mj!(7!Aol(6O)P?E-UzeULo(k=~{l34p~Y zX&jhaxfNOfLFlz#SfnoVMi;Y&y02_f zSATUozz-F({+k7mTQbE;34+Qlrl+UNWjeXLk3C!z5&Z9g7qY^!*H1Nyj;uO+{CMbL zhrD@X z+uJRML5an3?o1li$*_>A(K`Fg7-p zmOc-1(=fOX-LkR1E#qNt@1Z}GGCHbQ65D7%t9SML>2yLuQg_<5YvbKn6Th4iuq{jO zP}B&#BBS;Q@h94;O?Dn0l{aY7L}oovB_zD$hYd-ik8UPc5VzNJ^6nXb*Rd{P`SRsv zSXYeN9X6cL`1Cj}ElqWzKW(6uZCsht1IZkd1DoZRx_;sPmg&kOHIbW?M-SEzY>I_+rkk@kDxS$p$4omGrcFPuCprAvn$coV{m$>P@Z?Y3to~ zG_b+xhd@Usr}d&u8bZ~6{lW3kk6j6YRW&ul(JTmUDt8~^P&B;USDJjir$v}6=&CQi z?yp1i9V}LS7<=-nvVzSizW92}+PCFrlir^=so}hMm9fvu{;w8WI2DZ4!f|SE2HtmQ z`;PDVC7WJbY^2kB$B!1fopeGxYHRXChduPTd{57&>q%Z=k6xN|C_&29)AJ&$-hXINTNRyk#oal9 zLJS$yzqT@fT>L|_Raa-{_g>*w1{XmLS9K}$?Q-vXqas0oW&MNdYO!&Jf&a4+;P%$o zSYvriV@Ow74IiSE`hfTZJ@xC9%NAntCdPAb?YFWLs;z35R|(Qrf?;^`=+hwwC#N+a z{q_u_pvq;DK=W~%r^bDWdofW+sdw7dtIR$9c_T{>C|-Q-zkBFjA7_S+0xEG6MqoceS^VsJ`a>YbPxk0MRvGC&y zJaPUdyo$kILC9I+NKOtZI5;QuT>Zxz7D}&-gSlWk$%0Mqs;-=;a&$E6FNBE{dK!8n z4up@Dhrbyx-;mTuf?>T48&W+*cbY^(_Pd_uf(T%!`|`_Y7ZP+EGG!xc)>eYb-IBFY zLnEN3i{0eLeRSk*RaMnspRi_ZxQzUKvzeo4phD6urR KG0QO7weLTBz5 bool: + if self.appear_then_click(QUIT, interval=interval): + return True + + return False + \ No newline at end of file diff --git a/tasks/base/ui.py b/tasks/base/ui.py index c2fa296..f70fcdc 100644 --- a/tasks/base/ui.py +++ b/tasks/base/ui.py @@ -130,7 +130,7 @@ class UI(MainPage): self.interval_clear(list(Page.iter_check_buttons())) # loading_timer = Timer(0.5) - back_timer = Timer(10, 10) + #back_timer = Timer(10, 10) logger.hr(f"UI goto {destination}") while 1: if skip_first_screenshot: @@ -177,14 +177,14 @@ class UI(MainPage): if self.ui_additional(): continue - back_timer.start() - if back_timer.reached_and_reset(): - if self.match_color(LOGIN_LOADING, interval=5, threshold=80) or self.appear_trademark_year(): - from tasks.login.login import Login - Login(self.config, self.device).handle_app_login() - continue - self.device.back() - logger.info("Unknown page, try to back") + #back_timer.start() + #if back_timer.reached_and_reset(): + # if self.match_color(LOGIN_LOADING, interval=5, threshold=80) or self.appear_trademark_year(): + # from tasks.login.login import Login + # Login(self.config, self.device).handle_app_login() + # continue + # self.device.back() + # logger.info("Unknown page, try to back") # Reset connection Page.clear_connection() @@ -372,6 +372,8 @@ class UI(MainPage): return True if self.handle_daily_news(): return True + if self.handle_quit(): + return True if self.handle_network_reconnect(): return True if self.handle_affection_level_up():