diff --git a/README.md b/README.md index 6e245f8..23ea0b5 100644 --- a/README.md +++ b/README.md @@ -24,5 +24,6 @@ UI 3. 去掉加载页面自动跳转功能 4. 主页控制模式,支持触摸 5. 调整5s的位置 + 6. 首页添加加酸间隔时间单位显示 ``` diff --git a/ui/ui.h b/ui/ui.h index b1a8e94..cf5e6fd 100644 --- a/ui/ui.h +++ b/ui/ui.h @@ -74,6 +74,7 @@ #define ob_main_acidch3 21 #define ob_main_acidname3 22 #define ob_main_acideval3 23 +#define ob_main_RunModeValUint 24 //keybAcidCh.objs #define ob_keybAcidCh_keybAcidCh 0 #define ob_keybAcidCh_bak 1 diff --git a/usrc/service/page/Page_main.cpp b/usrc/service/page/Page_main.cpp index 70e34a7..24039b0 100644 --- a/usrc/service/page/Page_main.cpp +++ b/usrc/service/page/Page_main.cpp @@ -15,6 +15,18 @@ static CfgItermCache cfgcache; * 2.对接阀门控制板的状态(直接隐藏掉) * */ +void Page_main::updateRunModeState() { + // 更新底部状态栏 + UIS->setEnumComponentState(PAGE, ob_main_RunMode, (int32_t)GSM->getRunMode()); // 运行模式 + if (GSM->getRunMode() == khand_acid_m_jog_mode) { + UIS->vis(ob_main_RunModeVal, 0); + UIS->vis(ob_main_RunModeValUint, 0); + } else { + UIS->vis(ob_main_RunModeVal, 1); + UIS->vis(ob_main_RunModeValUint, 1); + UIS->setVal(PAGE, ob_main_RunModeVal, CS->getStr(kcfg_distrInterval, &cfgcache)); // 加酸间隔状态更新 + } +} bool Page_main::isBelongThisPage(int page) { return page == PAGE; } @@ -47,9 +59,7 @@ void Page_main::OnPageLoad() { UIS->setAph(PAGE, ob_main_AcidState, 0); // 暂时隐藏掉Aph UIS->setEnumComponentState(PAGE, ob_main_RemoterS, GSM->getRemoterS()); // 遥控器是否在线 - // 更新底部状态栏 - UIS->setEnumComponentState(PAGE, ob_main_RunMode, (int32_t)GSM->getRunMode()); // 运行模式 - UIS->setVal(PAGE, ob_main_RunModeVal, CS->getStr(kcfg_distrInterval, &cfgcache)); // 加酸间隔状态更新 + updateRunModeState(); UIS->setVal(PAGE, ob_main_acidch0, GSM->getPumpSelectState(0)); UIS->setVal(PAGE, ob_main_acidch1, GSM->getPumpSelectState(1)); @@ -71,7 +81,7 @@ void Page_main::OnPageLoad() { void Page_main::OnAppEvent(AppEvent_t* event) { if (event->type == kAppEvent_RunModeChangeEvent) { - UIS->setEnumComponentState(PAGE, ob_main_RunMode, (int32_t)GSM->getRunMode()); + updateRunModeState(); } if (event->type == kAppEvent_RemoterConnectStateChangeEvent) { diff --git a/usrc/service/page/Page_main.hpp b/usrc/service/page/Page_main.hpp index c502cce..23cddcf 100644 --- a/usrc/service/page/Page_main.hpp +++ b/usrc/service/page/Page_main.hpp @@ -24,6 +24,7 @@ class Page_main : public IPageProcesser { private: void processAcidevalUpdateEvent(uint8_t bid, const char* text, int ch, config_index_t cfgid); + void updateRunModeState(); }; } // namespace iflytop