p_chinagoldgroup_hand_acid
/
hand_acid_mainboard_bak
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

v2.1

v2
zhaohe 8 months ago
parent
625d97f3d7
commit
c5c9fc1abe
7 changed files with 54 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      ui/hand_acid_mainboard_ui.HMI
  2. BIN
      ui/hand_acid_mainboard_ui.tft
  3. BIN
      ui/hand_acid_mainboard_ui.zip
  4. 99
      ui/ui.h
  5. 1
      usrc/service/remote_controler_event_processer.cpp
  6. 6
      usrc/uicontroler/page/mupage/muInterval_page.cpp
  7. 20
      usrc/uicontroler/ui_controler.cpp

BIN
ui/hand_acid_mainboard_ui.HMI
View File

BIN
ui/hand_acid_mainboard_ui.tft
View File

BIN
ui/hand_acid_mainboard_ui.zip
View File

99
ui/ui.h
View File

@ -18,9 +18,8 @@
#define pg_popwin 16 #define pg_popwin 16
#define pg_keybdB 17 #define pg_keybdB 17
#define pg_keybdAP 18 #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 //gvar.objs
#define ob_gvar_gvar 0 #define ob_gvar_gvar 0
#define ob_gvar_edit 1 #define ob_gvar_edit 1
@ -457,37 +456,39 @@
#define ob_popwin_tc0 10 #define ob_popwin_tc0 10
//keybdB.objs //keybdB.objs
#define ob_keybdB_keybdB 0 #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 //keybdAP.objs
#define ob_keybdAP_keybdAP 0 #define ob_keybdAP_keybdAP 0
#define ob_keybdAP_p0 1 #define ob_keybdAP_p0 1
@ -572,36 +573,6 @@
#define ob_keybdAP_loadcmname 80 #define ob_keybdAP_loadcmname 80
#define ob_keybdAP_title 81 #define ob_keybdAP_title 81
#define ob_keybdAP_tc0 82 #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 //keybMutSel.objs
#define ob_keybMutSel_keybMutSel 0 #define ob_keybMutSel_keybMutSel 0
#define ob_keybMutSel_loadpageid 1 #define ob_keybMutSel_loadpageid 1

1
usrc/service/remote_controler_event_processer.cpp
View File

@ -192,7 +192,6 @@ void RemoteControlerEventProcesser::processKeyEventFromRemoter(hand_acid_remoter
case pg_popwin: case pg_popwin:
case pg_keybdB: case pg_keybdB:
case pg_keybdAP: case pg_keybdAP:
case pg_keyPasswd:
case pg_keybMutSel: case pg_keybMutSel:
case pg_keybMutSelFix: case pg_keybMutSelFix:
break; break;

6
usrc/uicontroler/page/mupage/muInterval_page.cpp
View File

@ -48,7 +48,11 @@ class MuIntervalPage : public IPageProcesser {
syncState(); 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); } void syncState() { UIS->setTxt(thisPage, ob_muInterval_stAcidInte, "%.1f", DeviceSettingDao::get()->distrIntervalS); }
}; };

20
usrc/uicontroler/ui_controler.cpp
View File

@ -495,12 +495,16 @@ void UIControler::popPasswdKeyBoard(uint8_t fromPid, uint8_t fromBid, int limitL
zlock_guard lg(m_cmdlock); zlock_guard lg(m_cmdlock);
UIStateMgr::ins()->setKeyboardFrom(fromPid, fromBid); 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, ...) { 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].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].pw=0", pg_keybdB, ob_keybdB_show);
sendcmd("p[%d].b[%d].val=%d", pg_keybdB, ob_keybdB_inputlenth, limitLength); 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); chpage(pg_keybdB, false);
} }

Write Preview
Loading…
Cancel
Save