zhaohe 8 months ago
parent
commit
2bcb68a1f4
  1. BIN
      ui/hand_acid_mainboard_ui.HMI
  2. 7
      usrc/uicontroler/page/home_page.cpp
  3. 11
      usrc/uicontroler/page/navi_page.cpp
  4. 1
      usrc/uicontroler/page/popwin_page.cpp

BIN
ui/hand_acid_mainboard_ui.HMI

7
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 {}

11
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);

1
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); // µÈ´ýÒ³ÃæÇл»
}
}

Loading…
Cancel
Save