From 0748e75acb27ca6f4c119fb11cdd2841120fde1d Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Sat, 31 Aug 2024 13:31:31 +0800
Subject: [PATCH] update

---
 ui/hand_acid_mainboard_ui.HMI                   | Bin 15800145 -> 15800145 bytes
 usrc/service/page/Page_login.cpp                |   4 ++--
 usrc/service/page/submenu/Page_changePasswd.cpp |  18 ++++++++++++++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/ui/hand_acid_mainboard_ui.HMI b/ui/hand_acid_mainboard_ui.HMI
index 5b6f84a1ab0f1ed5c3c49983abf18da1e261911d..905837f427629222c4655f1a68fd4078046f6f1e 100644
GIT binary patch
delta 1888
zcmeIyeNa?Y7{~FmuS6!$3wMVmi<;@5G?>L^q?S_D$Tf*;vVmzTMHZR3cP$Ic%y^7c
z(sYYk8b#R)Wf_Ke*Q8hrQqT&DqOz2-66k%V{&ecQvNgao^;a|f(V6+oo;lC`oq6Uy
zyW6$BHK7aX9g0;_R-Q2}-yho!uAov*rEJ}qwvFknXDuF4pBNadE9#qU^=T?ABUtiB
zl+VQ4pqi3QKD^iVTfjShcr_=@P@dCy4BipRS>ucoNkv+<XWHuaXWHf+pY4|H)s7mU
zp^THc_59<y3VR(Mn=R~joRjUHF#P`ZCPPKeB_A{5j#WK|DzXpW5pH%EBeUzqhg6uH
z?Ju%t2STdc9$xR(8jGF1r#iC^Ejlmk)Gl&%bWYw{nX6UhYBt#6fD<mbtz0dkzW@Ih
zJ?ty;Z@uW2{z_e|(wT(LBy=XBGYOqZ=uAS_5*q#!4>amp#S+Pui{%pWNse49m&rt#
zB)KwKrpQ#eT=L`!nI?XjE?3G7$(O67Ky;ZYSIaCZlz?0#MN%xY<yx5|bLBdjC-Y^2
zl*sjRgOtjRvQTc4o25){kwtQ=ES7RvBEg+TPMR~Ndq=YMOO~NIYA#$_V5aOgj#@br
zi~~tdm#^}$HM%x<(us;yS{LjaWfpE(c7YZ38HvkXDWw$$Bjzc2MuFeM-$QJ5@`Dt|
z;Jz?PsWao}<)<kXjh|;|N;Sv#18GXFjPJ|FDCIG`QlmcWNS?7G(Hxf?I%Y1g8)ul4
z@(s6@J=3Ul#}4<H4I7NH=G@+<RBKzY;Yo@eHk#@CA_?Y<K*VcCvx1||mieKv*3Ui0
z<~go~1Ec!Ff8Xe@@h1F38ciJ1XxorRr~Y%JYg7O1$z`n>v#ZQrRb3RqQrw2yu?%<M
zPE=qy?!w(zfqSqL_hJ?9LnQ>OaX+f?0M=kF)}a~?Vm&tCA#B7Zgz+#QK@ChiipQ`S
zTktq)@dTbk9iGC|*otTHES|&jsK*O<5!>(*UdDF3f(Gost7ybdG+`GkM6esLVGo+|
zI^IAFqS%W!@fKRqhPSZ~`_YaL9Kb=mgLm;BI?;vq@d3K=AwEJ6KE@~b6o>E`KF47k
kK`*|*mpF>A@HM`{G4!Dy1Nau-;d}gmAFb-5pW0e}2cbN2NB{r;

delta 1898
zcmeIxZBSHI7zglk_by-%sMX$P#}(-XKNw-KGg-DKB$=C<U~N?5(o$+v$hkMO(jt<_
zpeR~h@t7%MM3Rzg;qHOZb`{W!H0g~j2{U`aD7N}oM1MzZhF-oleelfu<~}peIp=xi
zJafCYx5sorQYT}q$WypDb;fKb!ZV9AW=06BlG<(TFZrpi(|HB?)k=dkEj^Wc&K|}0
zyp5bq8;QWTM;S_I!;{Qm)!70IV+yc+eirWVGxy+;s62aux;a&6KP$cxRm=2UrL*}a
zY)fv<NwW{XBa*JOi!a1+NSib~7c*UF&Pz@ezfv9dx8er^I&+;ZzJGu*a1UM(9kx$V
z6FYU5XYw5~YthRN>dbxqsnEAZ^^7^w-7gbyEmo!7V9Moat=-R>Qp}Oj=APDot<0m9
zdo%@1pn@5qAX<8~m`!~?t|gy)@Bi+-%eYp~F%XV{a14ZFARGhX7zo#5ynX+N4NY8g
zak_@CrO9+1IcN%9Pg5y_GU*1IMp<+tO{be^207_wnn|;0Hr+yVD4TL<F5ODEk&AAp
zT)Knqq`PPy<<Wd{Q$F2I9x9-F=w4bt3uzJEM}>4hJwOjq5iO=-;yZPR)x55{#VNBJ
zxoflt$Mbm6KPKo9zxD>=ME`C+SrprXlSIky#x@}%QWM#Ax+YvhMv5#7@hp>2+(v<{
zJ!yCqX_>I(xFQm3^yTJ-c6YVRu<DvBEVX=&$d2WgiDMJ>u&fxXcP2>uo_mX<x+}dy
zE|Js77m1_&hFjEZF*Zo|MZ7{0N#i?43IEl`3K1DFw#ubDcuK5DYT%{v(pGL)!~oYV
z;&7s_$<kds8T;Fs6J+<GF<1GAHfNbc)kq#EGU|<%)4hrl^?IVT&gA1`*Jkk%B9w1j
zA%E)D*UuB)0^KY!f;>}>`z@f3`12(uh<sbnCVIwlO+@0kMb?^wE93q>T{kM|j1!^W
zfI}9xHMgkcRk;Q{1WVvySPGB8qwp9kgXQozJOL%}B$UEaumZ|}U?n^a<xm07z_U;Z
z&%yIh1uuXXR>5lU!5XNBwIE;}ya?;zCD;HPp$0ZVEo_FDp$=YwdUzGKKm)u6TVWeC
z!t1ad{ICPwfH$EDc0vGxAfXvr;4Nr{U9cP8h7g2d5A20DXon8i2m9e2H~{ZLC%gv-
z;SjtJhoK8TfDhp#_!vHcZuk_Az-RC|9EBeE0(#*Xd<n<lD>wmP!#D6Pd<T7S626Ci
P_yK-|0a=wBX$$=U(Js50

diff --git a/usrc/service/page/Page_login.cpp b/usrc/service/page/Page_login.cpp
index 0e0962e..223eab1 100644
--- a/usrc/service/page/Page_login.cpp
+++ b/usrc/service/page/Page_login.cpp
@@ -67,13 +67,13 @@ void Page_login::OnLoginButtonClick(uint8_t bid, const char* userName, const cha
   ZLOGI(TAG, "try login %s %s", userName, passwd);
   const char* curUsrPasswd = getPasswd(userName, &passwdcfgcache);
   if (!curUsrPasswd) {
-    UIS->alert("用户不存在");
     UIS->setVal(PAGE, OBJ(txtPasswd), "");
+    UIS->alert("用户不存在");
     return;
   }
   if (strcmp(curUsrPasswd, passwd) != 0) {
-    UIS->alert("密码错误");
     UIS->setVal(PAGE, OBJ(txtPasswd), "");
+    UIS->alert("密码错误");
     return;
   }
 
diff --git a/usrc/service/page/submenu/Page_changePasswd.cpp b/usrc/service/page/submenu/Page_changePasswd.cpp
index 5df433a..a407497 100644
--- a/usrc/service/page/submenu/Page_changePasswd.cpp
+++ b/usrc/service/page/submenu/Page_changePasswd.cpp
@@ -12,21 +12,35 @@ static CfgItermCache cfgcache;
 
 bool Page_changePasswd::isBelongThisPage(int page) { return page == PAGE; }
 
-void Page_changePasswd::OnPageLoad() {};
+void Page_changePasswd::OnPageLoad() {
+  if (!UIS->isFromPopWin()) {
+    memset(oldpasswdBuf, 0, sizeof(oldpasswdBuf));
+    memset(newpasswdBuf, 0, sizeof(newpasswdBuf));
+    memset(confirmPasswdBuf, 0, sizeof(confirmPasswdBuf));
+  }
+
+  UIS->setVal(PAGE, ob_changePasswd_oldPwd, oldpasswdBuf);
+  UIS->setVal(PAGE, ob_changePasswd_newPwd, newpasswdBuf);
+  UIS->setVal(PAGE, ob_changePasswd_newPwdCfm, confirmPasswdBuf);
+};
 
 void Page_changePasswd::OnInputFieldContentChange(uint8_t bid, const char* text) {
   static CfgItermCache usrpasswdcache;
   const char*          usrpasswd = getPasswd(GSM->getLoginUsr(), &usrpasswdcache);
   if (bid == ob_changePasswd_oldPwd) {  // 旧密码
-    strcpy(oldpasswdBuf, text);
     if (strcmp(usrpasswd, text) != 0) {
       UIS->alert("旧密码错误");
       return;
     }
+    UIS->setVal(PAGE, bid, text);
+    strcpy(oldpasswdBuf, text);
+
   } else if (bid == ob_changePasswd_newPwd) {  // 新密码
     strcpy(newpasswdBuf, text);
+    UIS->setVal(PAGE, bid, text);
   } else if (bid == ob_changePasswd_newPwdCfm) {  // 新密码确认
     strcpy(confirmPasswdBuf, text);
+    UIS->setVal(PAGE, bid, text);
   }
 }
 void Page_changePasswd::OnButton(uint8_t bid, uint8_t val) {