diff --git a/ui/hand_acid_mainboard_ui.HMI b/ui/hand_acid_mainboard_ui.HMI index e94e697..7a3ac95 100644 Binary files a/ui/hand_acid_mainboard_ui.HMI and b/ui/hand_acid_mainboard_ui.HMI differ 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); // µÈ´ýÒ³ÃæÇл» } }