diff --git a/ui/hand_acid_mainboard_ui.HMI b/ui/hand_acid_mainboard_ui.HMI index 8d824a8..f024f0d 100644 Binary files a/ui/hand_acid_mainboard_ui.HMI and b/ui/hand_acid_mainboard_ui.HMI differ diff --git a/ui/hand_acid_mainboard_ui.tft b/ui/hand_acid_mainboard_ui.tft index 880e40b..d267fc9 100644 Binary files a/ui/hand_acid_mainboard_ui.tft and b/ui/hand_acid_mainboard_ui.tft differ diff --git a/ui/hand_acid_mainboard_ui.zip b/ui/hand_acid_mainboard_ui.zip new file mode 100644 index 0000000..05bc449 Binary files /dev/null and b/ui/hand_acid_mainboard_ui.zip differ diff --git a/ui/ui.h b/ui/ui.h index 2791303..e08a3d1 100644 --- a/ui/ui.h +++ b/ui/ui.h @@ -18,9 +18,8 @@ #define pg_popwin 16 #define pg_keybdB 17 #define pg_keybdAP 18 -#define pg_keyPasswd 19 -#define pg_keybMutSel 20 -#define pg_keybMutSelFix 21 +#define pg_keybMutSel 19 +#define pg_keybMutSelFix 20 //gvar.objs #define ob_gvar_gvar 0 #define ob_gvar_edit 1 @@ -457,37 +456,39 @@ #define ob_popwin_tc0 10 //keybdB.objs #define ob_keybdB_keybdB 0 -#define ob_keybdB_b0 1 -#define ob_keybdB_show 2 -#define ob_keybdB_b210 3 -#define ob_keybdB_b1 4 -#define ob_keybdB_b2 5 -#define ob_keybdB_b3 6 -#define ob_keybdB_b4 7 -#define ob_keybdB_b5 8 -#define ob_keybdB_b6 9 -#define ob_keybdB_b7 10 -#define ob_keybdB_b8 11 -#define ob_keybdB_b200 12 -#define ob_keybdB_b9 13 -#define ob_keybdB_loadpageid 14 -#define ob_keybdB_tm0 15 -#define ob_keybdB_loadcmpid 16 -#define ob_keybdB_input 17 -#define ob_keybdB_temp 18 -#define ob_keybdB_inputlenth 19 -#define ob_keybdB_t2 20 -#define ob_keybdB_temp2 21 -#define ob_keybdB_tempstr 22 -#define ob_keybdB_b10 23 -#define ob_keybdB_b11 24 -#define ob_keybdB_loadcmname 25 -#define ob_keybdB_b249 26 -#define ob_keybdB_clear 27 -#define ob_keybdB_m0 28 -#define ob_keybdB_bak 29 -#define ob_keybdB_title 30 -#define ob_keybdB_tc0 31 +#define ob_keybdB_p0 1 +#define ob_keybdB_p1 2 +#define ob_keybdB_b0 3 +#define ob_keybdB_show 4 +#define ob_keybdB_b210 5 +#define ob_keybdB_b1 6 +#define ob_keybdB_b2 7 +#define ob_keybdB_b3 8 +#define ob_keybdB_b4 9 +#define ob_keybdB_b5 10 +#define ob_keybdB_b6 11 +#define ob_keybdB_b7 12 +#define ob_keybdB_b8 13 +#define ob_keybdB_b200 14 +#define ob_keybdB_b9 15 +#define ob_keybdB_loadpageid 16 +#define ob_keybdB_tm0 17 +#define ob_keybdB_loadcmpid 18 +#define ob_keybdB_input 19 +#define ob_keybdB_temp 20 +#define ob_keybdB_inputlenth 21 +#define ob_keybdB_t2 22 +#define ob_keybdB_temp2 23 +#define ob_keybdB_tempstr 24 +#define ob_keybdB_b10 25 +#define ob_keybdB_b11 26 +#define ob_keybdB_loadcmname 27 +#define ob_keybdB_b249 28 +#define ob_keybdB_clear 29 +#define ob_keybdB_m0 30 +#define ob_keybdB_bak 31 +#define ob_keybdB_title 32 +#define ob_keybdB_tc0 33 //keybdAP.objs #define ob_keybdAP_keybdAP 0 #define ob_keybdAP_p0 1 @@ -572,36 +573,6 @@ #define ob_keybdAP_loadcmname 80 #define ob_keybdAP_title 81 #define ob_keybdAP_tc0 82 -//keyPasswd.objs -#define ob_keyPasswd_keyPasswd 0 -#define ob_keyPasswd_b0 1 -#define ob_keyPasswd_show 2 -#define ob_keyPasswd_b210 3 -#define ob_keyPasswd_b1 4 -#define ob_keyPasswd_b2 5 -#define ob_keyPasswd_b3 6 -#define ob_keyPasswd_b4 7 -#define ob_keyPasswd_b5 8 -#define ob_keyPasswd_b6 9 -#define ob_keyPasswd_b7 10 -#define ob_keyPasswd_b8 11 -#define ob_keyPasswd_b200 12 -#define ob_keyPasswd_b9 13 -#define ob_keyPasswd_loadpageid 14 -#define ob_keyPasswd_tm0 15 -#define ob_keyPasswd_loadcmpid 16 -#define ob_keyPasswd_input 17 -#define ob_keyPasswd_temp 18 -#define ob_keyPasswd_inputlenth 19 -#define ob_keyPasswd_t2 20 -#define ob_keyPasswd_b251 21 -#define ob_keyPasswd_temp2 22 -#define ob_keyPasswd_tempstr 23 -#define ob_keyPasswd_b249 24 -#define ob_keyPasswd_loadcmname 25 -#define ob_keyPasswd_m0 26 -#define ob_keyPasswd_clear 27 -#define ob_keyPasswd_tc0 28 //keybMutSel.objs #define ob_keybMutSel_keybMutSel 0 #define ob_keybMutSel_loadpageid 1 diff --git a/usrc/service/remote_controler_event_processer.cpp b/usrc/service/remote_controler_event_processer.cpp index 5d0ec24..c4dbecb 100644 --- a/usrc/service/remote_controler_event_processer.cpp +++ b/usrc/service/remote_controler_event_processer.cpp @@ -192,7 +192,6 @@ void RemoteControlerEventProcesser::processKeyEventFromRemoter(hand_acid_remoter case pg_popwin: case pg_keybdB: case pg_keybdAP: - case pg_keyPasswd: case pg_keybMutSel: case pg_keybMutSelFix: break; diff --git a/usrc/uicontroler/page/mupage/muInterval_page.cpp b/usrc/uicontroler/page/mupage/muInterval_page.cpp index 7daf33e..ba62974 100644 --- a/usrc/uicontroler/page/mupage/muInterval_page.cpp +++ b/usrc/uicontroler/page/mupage/muInterval_page.cpp @@ -48,7 +48,11 @@ class MuIntervalPage : public IPageProcesser { syncState(); } }; - virtual void onClickRelease(uint8_t bid, uint8_t val, const char* text) override {} + virtual void onClickRelease(uint8_t bid, uint8_t val, const char* text) override { + if (bid == ob_muInterval_stAcidInte) { + UIS->popNumKeyBoard(thisPage, ob_muInterval_stAcidInte, 4, "%.1f", DeviceSettingDao::get()->distrIntervalS); + } + } void syncState() { UIS->setTxt(thisPage, ob_muInterval_stAcidInte, "%.1f", DeviceSettingDao::get()->distrIntervalS); } }; diff --git a/usrc/uicontroler/ui_controler.cpp b/usrc/uicontroler/ui_controler.cpp index fe11845..3cdcd46 100644 --- a/usrc/uicontroler/ui_controler.cpp +++ b/usrc/uicontroler/ui_controler.cpp @@ -495,12 +495,16 @@ void UIControler::popPasswdKeyBoard(uint8_t fromPid, uint8_t fromBid, int limitL zlock_guard lg(m_cmdlock); UIStateMgr::ins()->setKeyboardFrom(fromPid, fromBid); - sendcmd("p[%d].b[%d].val=%d", pg_keyPasswd, ob_keyPasswd_loadpageid, fromPid); - sendcmd("p[%d].b[%d].val=%d", pg_keyPasswd, ob_keyPasswd_loadcmpid, fromBid); - sendcmd("p[%d].b[%d].txt=\"%s\"", pg_keyPasswd, ob_keyPasswd_show, ""); - sendcmd("p[%d].b[%d].pw=1", pg_keyPasswd, ob_keyPasswd_show); - sendcmd("p[%d].b[%d].val=%d", pg_keyPasswd, ob_keyPasswd_inputlenth, limitLength); - chpage(pg_keyPasswd, false); + sendcmd("p[%d].b[%d].val=%d", pg_keybdB, ob_keybdB_loadpageid, fromPid); + sendcmd("p[%d].b[%d].val=%d", pg_keybdB, ob_keybdB_loadcmpid, fromBid); + sendcmd("p[%d].b[%d].txt=\"%s\"", pg_keybdB, ob_keybdB_show, ""); + sendcmd("p[%d].b[%d].pw=1", pg_keybdB, ob_keybdB_show); + sendcmd("p[%d].b[%d].val=%d", pg_keybdB, ob_keybdB_inputlenth, limitLength); + + visEx(pg_keybdB, ob_keybdB_b11, false); // '-' + visEx(pg_keybdB, ob_keybdB_b10, false); // '.' + + chpage(pg_keybdB, false); } void UIControler::popNumKeyBoard(uint8_t fromPid, uint8_t fromBid, int limitLength, const char* initval, ...) { @@ -518,6 +522,10 @@ void UIControler::popNumKeyBoard(uint8_t fromPid, uint8_t fromBid, int limitLeng sendcmd("p[%d].b[%d].txt=\"%s\"", pg_keybdB, ob_keybdB_show, buf); sendcmd("p[%d].b[%d].pw=0", pg_keybdB, ob_keybdB_show); sendcmd("p[%d].b[%d].val=%d", pg_keybdB, ob_keybdB_inputlenth, limitLength); + + visEx(pg_keybdB, ob_keybdB_b11, true); // '-' + visEx(pg_keybdB, ob_keybdB_b10, true); // '.' + chpage(pg_keybdB, false); }