From 2bcb68a1f4533d355f1f12c130f342c886125c5a Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Tue, 26 Nov 2024 16:34:00 +0800
Subject: [PATCH] update

---
 ui/hand_acid_mainboard_ui.HMI         | Bin 18638442 -> 18638442 bytes
 usrc/uicontroler/page/home_page.cpp   |   7 +------
 usrc/uicontroler/page/navi_page.cpp   |  11 +++++------
 usrc/uicontroler/page/popwin_page.cpp |   1 +
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/ui/hand_acid_mainboard_ui.HMI b/ui/hand_acid_mainboard_ui.HMI
index e94e697b29402c9d84f950621c4f1674a91c7b78..7a3ac957a0a3b7ceb0e72941f57bb6117d1700d6 100644
GIT binary patch
delta 2272
zcmeIxdr(wW90%}wmStI7lvQB!G2`w`V@WV5j!kP>KFZXP0u&$d5-Q6Oxg@<b4Y)sC
ze8n}=i&?HDVV3C<*0IuDdx#b(Aw*_|nj(@J<d&ANzGrtGh3VgB`lFrseD|L7JHK<!
zoY`%!>om3lyRDk#GJ8(u?71-$;wMV}k3L?OI*b?`3}sSqX)ojO1p(eMraZ~A<grK+
zYYb&I%h?WHnAENNSf^aJ)zq&nU%%##ZlzV$JnzQrA2u!?oG0CSZR5d#Z6Ws9p)qpi
zwKL&6feNJ)Ry+uMLs@-oC_C#v-tfvoX$Yp-prt7_(S3$9d+e~T-E9L&8YW|j(5<_F
zDM`&S{_gTHb3i|-Tle8G)!WT#c3T|5`pm1wGfIWcQDI}Cg8<M&AQ*UsEhwW!C;flD
z-rvr@bG?eo=5XQuUATW2?%##`cj5kBxPO-|D52%Qu%O0e%iBP98bNo`T{M#Jrh8}<
zjixa)mhPqdXdK;7<7om-qz5RDCQ&>+NDom0B~lVirYV$6Q)wDary2AxrBEuRQ95PN
zOv<DzdW0UO$7mKkPEXKmdXlnf4&~5X%H1aG<2n9@oyM}5aD(&GC=*NO2~*{9`^0RA
zk;gU`<eD8GdmcOm^B^CdhG*becn+S2`LF<9fQ7IKUW5Yfu@|Ps=~pg^ZQ;gvxhX(f
ze;~hLV_Kr@d(y146oYm&MK<$uQ{>Y+Z&^dx;#A{8n8g{rq6f2R&O|v{Tgyta`Rz00
zLH<>um812tZ_Lv&<SRFnyt`^Ko&p0upCxw&YenUS106|~g;2zkDwWmq^#gJa<nfj;
zb#jRB#pX>V2EN^<o(=Ym`wmkrd}NfGYVeLZ#*v}dOIp3U*s@wyqcvG995Pldy0LNm
zB(<WqZ}p@G#ljb*tF8V6im}t3Wnva?&Qcq0nB_<ID``wqS#i13U1nn8T5G-1>U%x9
z=5;A$H!6pHr9Dml(lo9%E0N4MJL1r_Sq-yexGl1<PN&VRrU>rNS8M&N<{ZT;r`*HD
zHuGi2l{y_a4^^izZA+^X>)R*eRF{3U(HHVpY6a<X6u+fixml;Vb1A~vveU$-YqCaB
z{)4NEx==egfVOaVbg`2;S6F+p2yN!b;=o<Di#^%8aEG;upcoc|14>{CEQMvT99F<f
zPzoxngqNWVUV&Ax8Z;<}HSj8|h1cM9SO-p64;AnRY=BC56RKb%yak)!ZFmPZ!@IBr
zwt@?);XSB<ZSX#P035c%hwu@63_D;ad;+_`4ZGn}_zXUWFJKSU!d}=1U&2>V2VcW}
zH~{tV4K%<(XoM#C7MkHZI0WCrVfX=#z>m-ZN8uP8ho9gCoP<_51#NH|+Tmw71HZso
z_!T;!6Mlnp;DO)a4>%7O;7|AqF2W_a3|HXlGHVqp1ra(C0V4Dw0!0`^1c@+;2o}*p
ugh@n*h@K*Pi3k;87SUTo9}!_9!bL=gu!y)xL|+m8MD%C7tW^V8ocnL9vuhXt

delta 5093
zcmeI!dr(wW90%}wmdj&>MUYph<L)>yP34dbHesbwX+cD-hD3rPJxqLF%*1E=`sGq;
zP-M5#M1;r+^V&+c2L_g8B371|76lq95)l-pMMmG_#?a2}^j~xPV|V8B-8sKK_x0Pe
zXSTDcH>eZX6}#CIHacN^yp$&ly~K1$Xg6Z4cj{d`SgkI0QC|My_>}b2!8s>;C7~w>
zqtdlv^{7P8!#5cVgcuyo^ixA!bNo9(Mho%zgGXL^H<L|>Fk!|CS#ViLOkhcZ=P87a
zF(kC7W5)g*+=f0h>)I9_AM;n!LK5PpyFYVvMTGgWgwl)AF-&kp#W?li{N(N1O6Qp-
zm=2t?_q&g9r_~U{I<x$7g5fg^=dVg|l$)I8CI&k20}=coKrJ@~=C<ktUw{6sKMuv@
zR4_q70~It-K?4;uP(cF~Q=qx^|1iO&m<lQ=i6+wZbOYT;lV~zcp=7#=Zl+skDovwX
z={8ECRJxtg=nhJ!JLxVm({!3acT)z<q)fVpvglr#McI@?v*|v{r8$&G_tOLPAU#BL
z>0z2j`81yv&_Y^7i)qOoNlX_n7p{p_GsxELCnqOKR(W==6s^`3**bOZv2m^=KyJ&H
z!qh1nY-j&2@=0YSX(24SY~03SELtwhmBz`NS<wP{pwu>A4O>y7W3r?;Bh}Tjq>&Bc
z%I@$Sb=o0ocC526sQ{M3Bd`n}h2>BPD_|w8g4M7F*1}_80jt`VWXnmD4M(Mrs9M&~
z`tcjqN4kGI^$hQ_?dq+&n4q%M;zp+Sbgy%S%jPYG0hYaj7&j27Sz5HcykODv=>^fE
zW%JQ{i-zAl|LQH;Exk)C&$s@yU4Xvzui4h?TmRU5eEYw)8?bNx*Y*#HZ~be#{xkoZ
z%R3V*ZD3auD;+hf#GWe~s@0t}_V{2~s&FiqtsVAA+1y|^s7v?RGyH~%DvEjk7`rE>
z9Q2svE+!uKQXF%{OHtqKrPz1eOR=@ZOR=%dOR=WiKGS`lDjueA=$6N-#a)9R@#h??
zuIcd{=l6MzGcVY$3zp53BvCFowJf~Odd$EkPjniq2p)%Z;DjQ00-l8RumLv0Q&0>g
z@H9LFrSL3lg6BYn=ivo-5jMjXcnP*b8Ek`c*bWs?2`@txyaGGmRd@|vhicdfZ@?~4
zU^l!8F4zM#@D`}>HoODx!h28)d*OYkgL>EpAHavO9~$5zH~=5RL1=_S&;*C!6ZjN9
zgCp=cd;v$H8IHl1a2!s+SMW8oz&G$Mv_c!4gj4Vxw8Qss8qPomoP|#K0lMHv=!T!5
z2YTUW_yzjl9Q+FB;R5^yze7L#0T<y<7+7ztV#UBi$HR|@$itsU0FOW(K|J(4hVcmI
s5yHd3Bb3K*9$`Gfd5qu@!6TAK6pv^gF+48g5zAvFt20)OVrlh%0k$3}{{R30

diff --git a/usrc/uicontroler/page/home_page.cpp b/usrc/uicontroler/page/home_page.cpp
index f3ec2d8..293dc22 100644
--- a/usrc/uicontroler/page/home_page.cpp
+++ b/usrc/uicontroler/page/home_page.cpp
@@ -24,17 +24,12 @@ class HomePage : public IPageProcesser {
   virtual void initialize() override {
     IPageProcesser::initialize();
     syncState();
+    visEx(ob_home_AcidState, false);  // Òþ²ØËáҺͰ״̬
   }
 
  private:
   virtual void onPageLoad(OnPageLoadContext* cxt) override {
     ZLOGI(TAG, "OnPageLoad");
-    UIControler::ins()->vis(ob_home_AcidState, 0);  // Òþ²ØËáҺͰ״̬
-    UIS->setTouchEnableState(ob_home_acidname0, 0);
-    UIS->setTouchEnableState(ob_home_acidname1, 0);
-    UIS->setTouchEnableState(ob_home_acidname2, 0);
-    UIS->setTouchEnableState(ob_home_acidname3, 0);
-    UIS->setTouchEnableState(ob_home_RunModeVal, 0);
     syncState();
   }
   virtual void onBackKey() override {}
diff --git a/usrc/uicontroler/page/navi_page.cpp b/usrc/uicontroler/page/navi_page.cpp
index 7d938c7..813d1ba 100644
--- a/usrc/uicontroler/page/navi_page.cpp
+++ b/usrc/uicontroler/page/navi_page.cpp
@@ -96,8 +96,7 @@ class NaviPage : public IPageProcesser {
         if (m_muInfo[buttonIndex].page != 0) {
           UIControler::ins()->chpage(m_muInfo[buttonIndex].page);
         } else {
-          
-        }
+                }
       }
     }
   }
@@ -185,15 +184,15 @@ class NaviPage : public IPageProcesser {
     }
 
     if (m_pageNum == m_maxPageNum - 1) {
-      UIControler::ins()->vis(ob_navi_nexPage, 0);
+      visEx(ob_navi_nexPage, 0);
     } else {
-      UIControler::ins()->vis(ob_navi_nexPage, 1);
+      visEx(ob_navi_nexPage, 1);
     }
 
     if (m_pageNum == 0) {
-      UIControler::ins()->vis(ob_navi_lastPage, 0);
+      visEx(ob_navi_lastPage, 0);
     } else {
-      UIControler::ins()->vis(ob_navi_lastPage, 1);
+      visEx(ob_navi_lastPage, 1);
     }
 
     UIControler::ins()->setTxt(pg_navi, ob_navi_pageIndex, "%d/%d", m_pageNum + 1, m_maxPageNum);
diff --git a/usrc/uicontroler/page/popwin_page.cpp b/usrc/uicontroler/page/popwin_page.cpp
index 9846fc7..7d80252 100644
--- a/usrc/uicontroler/page/popwin_page.cpp
+++ b/usrc/uicontroler/page/popwin_page.cpp
@@ -66,6 +66,7 @@ class PopWinPage : public IPageProcesser {
         if (!handupInfoFlag) {
           if (UIControler::ins()->getNowPage() == thisPage) {
             UIControler::ins()->chpage(lastPage);
+            osDelay(200);  // µÈ´ýÒ³ÃæÇл»
           }
         }