From c3d036ce037fdb6f67e525c7162d5b4d1b4b4b09 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sat, 31 Aug 2024 12:04:29 +0800 Subject: [PATCH] update --- ui/hand_acid_mainboard_ui.HMI | Bin 15800145 -> 15800145 bytes usrc/service/page/Page_login.cpp | 7 ++----- usrc/service/page/Page_login.hpp | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ui/hand_acid_mainboard_ui.HMI b/ui/hand_acid_mainboard_ui.HMI index 60ca53ee2429dcb92b4aa933670328dee8455e55..5b6f84a1ab0f1ed5c3c49983abf18da1e261911d 100644 GIT binary patch delta 6217 zcmeI0c~DeG9>@DJ3?ReeaKU)6{CzCM24 zzv*B1uZL6Ht?s9Q|2Kq?4^pS;LJ|ijLCTMw5LZaB+~3-oIMw$a<*1iXze2J`_6X6Z zDm`tV$=mcK%?H9p6LtdVNhAw5x}SnBw6nB|F7(bK7KObdg(uk?bx z8$t}^o+S6xs`L`EY*6`1l4YN2>6=<7L#tIraz7L!S$7a34{m=)(c&;8kvhPTtmiw)+|P>2u+P%&qU^ph%gj8~*#>=q z`?~xL;`=ibT7~n@K586WnOz0#ylCzi6$;PH9M((=1$$?Im|c!ki5!*YEii z+XLi9uDkmelccVeC2ktaPS0BrQO}!A4Jskmhr(jLrM17KC~Zxox=$lc z(Ya^5mG~S+1JEt}dBaEjD#(#IL|8q;_IDUwo>EC%@cE)I&4Rkq7OA(!5l#cr zn&ZS9gVi@`e@D^E&rgs8^Xx_~DxasWmk;c1o!wTG(^ew^7oY;JKn>h@TaCN*=BqvH z97?bD?5jOne|!Df_U!jJv$dKWEjG0ln_7!at;MF+VpD6eskIvS>R&~JBCY1Ejz-cb z+KWch7#d6CXm1)%6KEgWm-eIm=>R&ACekE2i2jBq)4_BI9ZHAM;dBHYN#CTS=x92I zzD38_qm$_rI+aeN)9L$k2K|8Q=*&I(zy$>tcY%Jg@&GjEiJf+qcBk}wD3|&20jk`XJud^D$ zBv!N8;KP?ZF-A*L57zs%DZ0NciM^jT=iNztLQGRQznC>1UMC?$u+V#W!Ua>l zyJJ~GyBXd1nvTWuT%-sVA6T3)#CCgpG1qe@rWhFMK1S@ z6Jg-pTl9S+o)Dw#*s{KaoRD?OKtep^zLOL2(?)8K)y6X&KYIdXkCzV?x@0&8U^Tn- z(QMg7YYW~bxa462<{zaGupVpxpM#Cy58w;132X*mf-PVx_zG+T zg{-i$c)s5jPl++hVO;}r81`FyBFPB6<_hupSE*7uPV8p-E| zgo97fjoS#_202eD5Aq}Ab-8a}6c;DA%?#3hS1QT(o}aedQP^{x$0SgUqiOEHKHSC=pUJA(uGkEcz^Dt2m+-iIH$Xu|&;aH#WT!3LAW zwbjNXi6v_d19MV`7H>`+%D+?J{pzIeb#^fjHzp;8YVltYC52{qi>$U5R}dxj9d04? z4MdMp-Uv~m=_JRH20Qe*L8XN?rpbQ)Whe0{_Gh4T=S7)D# zEjhxr`d9SiWi`hiNp-8x=WF3m(m~&+n~rLV{$ST}8+?S%)4YBv{tts)f!y zBWx}^D>OStNCU^YU?%I&iwo@+7YI4v;`m}FULqtz-p}W*5VBStz<5pQMmL1s`jgND z?h5_G1EClEOX!x*Y})J?tXL)04KM=hR3Hyli?vsDp107QH9}Xm6#6|sp-Bg!3j&4i z6)g1m@NN>>Ef1C(A(7j%&Wx7o;>8>zAzmC4&5o5wL&wdkCdb&E`D@D5{7Q$4`6{Lh zF~zbgrqUojZ<2Mfn(ypg(Mw{b)2)TPv$i6&&=F0#)RVgwva8bm581?sS;;wR6DmO! zI0BA>KY?$+F`hQzxZgtckkgetz4^ZJ)=-ye%AO6_CRQ_~P((}gb`dSHyG682EheOk z?AnU`goMbt43Va|W<{haTjUrYKG7PrrEbcjRNSj!#lfa*$*{^kEdH@o!{SGq#_+NY zl}%MV{=soqiO;-V@y|>gKW^-H*NR%cY;DDb!+33A|JA|ntk+NGi$_*o^2*WGo&?q4 z6gUn349rMQ{mx2QGsv;CoO5u7V%HHSibkBls)04sL*(;BVmX;3sek O+y=E=S9|ALz`p_B4U0?w delta 6794 zcmeI0eRxb)9>;%o-trGk1~^4MsRM1Wj~s zx+0piRjnnfP2vP4DVZn@9b2kJ3GEiuHnH7ytF7AKOzw5A)IR&i{T2VVzy=ydTPNzCy3NhE~fDtGeuWKPBK(+KKnwPOWB<6;Tbpq~p!$ zP{G<<^_V!Q)&5jYtAn7U*uX`rH9HaFfJ@TA5c6QqJ3}2%nX(G^jA>-&suJNIXd(Lr5YS zN|MMhGMprnC&&mglKg>;BBMzP8AHaBCrK(9N5+#hVjxeEbTWZVB$LR~WHNb%Od-#b zsU(9;Bh$$Yl1Z}2O!7za9GOLClR4yhGMCIF^T`6TkSrpLD~+jpgfN;FF9y+-#1LKj*d1(9r2^(ADH^H{Cna^74s@Fj_}2J+i`EXrhBLRMr8a)vMAU|BcINl~9k++E&&f9bv$=mcx;ca@P z@;2TEK1s}1AS;_KI8{~XPv;)14pT+;pqq}HMzd*+RqMiN&6TRemhwUF^3L@0u0}m= zZfgu;rJDU?+9+B?{jP-}MNIUii#A$1P-nc!i$u)rPw&Sy8OZhS zD1gu9U9dgQEA}P;w3W8};1GaWk`5UP;3Me>%+FMk9xx2RL((z0Bl5k;$pE4>u?pOs z(~{1|-SL##ufrr%BLw1J;I(lqK!`NsJ>%&PjhIC5l!}2YctCZZHneE77)W<`IXbe# zG3M0*yA@wOJ(;B&EMEz%>2*s#0S}OutCfa2yBIyFF*184o3+ebl0xm4`U2WKG^4phUGa2+<$80aDjl{&UJ>-11oZ(>76)pCz`*>If0Ie zH+QDhRVE)=G}EM^&85cKborAX>FM~-s-B=brkL~$Lx7LBYkw*3Z-fv`pK3G*x{tQD zs3`Bp)3ih_rdfZGmf>s61FIzcsxQ|Q@g&OSUU(8^eFRUUtj&1hWF3zC9<6mRAWZGU zw`dNYGOe`C3;N#Qq9`z{pfA%g3CJc)Ao+5ub_vJ#EB(SwG*Wn4)M?^Nm7J|A(J zie?y0N7?c-=G-uww?{UT!@NB#OQIh68sNY5^|WO7%OE1pTt-Wsq6fkj1A)Anw5j(OO*@A3EDDn#OCuAE^jBH0rkR8aYNGVc=yoS7v zyn*aQ-b8jGZy|3ZyOBR5dyu_IIr0}|AMy_JE>eM1vbf@^labm+VRrTvS3DhTO_!ob z0iFvvCho)UJUPyWE8^@TMV#HNh_eS3akfzrXLX7=+g}l9(|Me=Larjv?%;tI@)U8l zOc7_x6>&B|5obdbakjf6&V~=?aW+;FXLq^dEFNUnm7@r>%iV#tr958|XG>ef*{fkn2sAa) zG}@MxwtrVv8oQ)T@4Tw$7kVMw%u|3MT=!9ueW&_y`{v_IQnvE0j$EI@q)aaVK9uWV zOt|FoVHo~pJqshdtk(}xqyW#y@`{(@xxI?frg91Zn0(18fDhVKP667XP32cd5ZY8u z0eTGQDZu6tJO!9Jnx_Es(4`sy(?-{|2yNO&n*Ek>T))R|Cs@+FA9RxMXu85`I%W&8 zRwD)QQ1gSx4k@u0K$T1dTt=nBnzwPF@q-{D`6;Ml0hd2gXzn9*{yFB>w zS9>B;45dU73w8zYrl;WF-w+^7I! zhO8eS%=I;l6RFZ*1BV0bmGs4tT(8A7l*?nsbA2tH>%z%gCuX>`)xG|3Gm}?royGNt zc>w36!8$JH<@hVt{lUasu0xh{-H^}q(luQ7UeEQ%)*(g3g-z$R(iE4;jNJ32y2 zbuO0ia?dxpj@`}m%yNJ`xP`83D&sb;t>)G}dZ6XC;GTcNVeaGPBisk$Yw!l?fegn0 zA|#!6oNrB^20rjaC)fFBd7o>~ab5TcfR~h?y>cF`_mj1fPXP|8TAuouivSkMn5QoT zY?lU}_XXFw8(hEk4cAGxxxVlN*Os5T_P-}=smHH7P*!nocN&UMrPu0I+iz`K#sVEK;=@SUU=4-xKvDJ)48Fif1juhp`O9A~JCW;TiKSY&TUn(%MmW9?^~2eZ`cr`Bs(W0E65pf&UA_R?kN zs`S*Uuhp~67oGETTfcC$WxirvoJMNoSBxL@E5=*4P~W_IJ*!<(_m0X{b)m!^lo)=P zEL5|>jgE{JwmCEEk>kh*$O+^m@*&c|=FB+NHDB9h!u(YY4CBsYs{0>*qZH;Fr!e2M z3iD+s%x6=WFIr)~OojP2D$KW8VZLH+J}bO&o_{I4tuWtn3iDl1n9rgxpTEL<*peGYTQ;AM?;5XPiD1c_5Ny>S>V(N zY;l0&CCR+3$@o#UX!94H$Qk6X$j8W8setVal(PAGE, OBJ(cUsrName), getCfgStr((config_index_t)(kusr_name0))); if (!UIS->isFromPopWin()) { - memset(txtPasswdCache, 0, sizeof(txtPasswdCache)); + UIS->setVal(PAGE, OBJ(txtPasswd), ""); } - - UIS->setVal(PAGE, OBJ(txtPasswd), txtPasswdCache); } void Page_login::OnInputFieldContentChange(uint8_t bid, const char* text) { if (bid == OBJ(txtPasswd)) { - strncpy(txtPasswdCache, text, sizeof(txtPasswdCache)); UIS->setVal(PAGE, bid, text); UIS->virtualClick(PAGE, OBJ(blogin), 0); // 触发一次登录按钮虚拟点击事件 } @@ -87,8 +84,8 @@ void Page_login::OnLoginButtonClick(uint8_t bid, const char* userName, const cha ZLOGI(TAG, "%s login success ", userName); GSM->setLogin(false, userName); } + UIS->chpage(pg_main); - UIS->setVal(PAGE, OBJ(txtPasswd), ""); GSM->setMenuPage(GSM->isAdmin() ? pg_menuAdmin2 : pg_menuUsr); return; } diff --git a/usrc/service/page/Page_login.hpp b/usrc/service/page/Page_login.hpp index dfa3a6d..3bf760d 100644 --- a/usrc/service/page/Page_login.hpp +++ b/usrc/service/page/Page_login.hpp @@ -7,7 +7,6 @@ class Page_login : public IPageProcesser { private: /* data */ - char txtPasswdCache[20] = {0}; public: static Page_login* ins() {