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

update

v2
zhaohe 8 months ago
parent
08f448142f
commit
619ee058c7
4 changed files with 339 additions and 241 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split 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. 527
      ui/ui.h
  4. 53
      usrc/uicontroler/page/navi_page.cpp

BIN
ui/hand_acid_mainboard_ui.HMI
View File

BIN
ui/hand_acid_mainboard_ui.tft
View File

527
ui/ui.h
View File

@ -6,21 +6,41 @@
#define pg_navi 4
#define pg_muInterval 5
#define pg_muUsrMgr 6
#define pg_muTmrMgr 7
#define pg_muDateMgr 7
#define pg_muAcidType 8
#define pg_changePasswd 9
#define pg_muSettings 10
#define pg_muChangePasswd 9
#define pg_muCHSetting 10
#define pg_muDeviceInfo 11
#define pg_muAudit 12
#define pg_muPumpTest 13
#define pg_popwin 14
#define pg_keybAcidCh 15
#define pg_keybdB 16
#define pg_keybdAP 17
#define pg_keybdA 18
#define pg_muReCtlerBind 12
#define pg_muAcidTakeMgr 13
#define pg_muAcidUseRecd 14
#define pg_popwin 15
#define pg_keybAcidCh 16
#define pg_keybdB 17
#define pg_keybdAP 18
#define pg_keyPasswd 19
//gvar.objs
#define ob_gvar_gvar 0
#define ob_gvar_edit 1
#define ob_gvar_editDirty 2
#define ob_gvar_t0 3
#define ob_gvar_cfg7 4
#define ob_gvar_del 5
#define ob_gvar_save 6
#define ob_gvar_pwd 7
#define ob_gvar_t1 8
#define ob_gvar_roleVal 9
#define ob_gvar_bak 10
#define ob_gvar_b0 11
#define ob_gvar_statiTrun 12
#define ob_gvar_t2 13
#define ob_gvar_t3 14
#define ob_gvar_t4 15
#define ob_gvar_t5 16
#define ob_gvar_b1 17
#define ob_gvar_b2 18
#define ob_gvar_uName 19
#define ob_gvar_blogin 20
//pStart.objs
#define ob_pStart_pStart 0
#define ob_pStart_j0 1
@ -85,10 +105,10 @@
#define ob_navi_bak 1
#define ob_navi_muInterval 2
#define ob_navi_muChangePwd 3
#define ob_navi_muTmrMgr 4
#define ob_navi_muDateMgr 4
#define ob_navi_muAcidType 5
#define ob_navi_muUsrMgr 6
#define ob_navi_muSettings 7
#define ob_navi_muCHSetting 7
#define ob_navi_muAudit 8
#define ob_navi_muDeviceInfo 9
#define ob_navi_b0 10
@ -101,156 +121,287 @@
#define ob_navi_b7 17
#define ob_navi_muLoginOut 18
#define ob_navi_muAcidTakeMgr 19
#define ob_navi_muAcidTakeRecd 20
#define ob_navi_muAcidUseRecd 21
#define ob_navi_muPumpTest 22
#define ob_navi_muPumpCali 23
#define ob_navi_muReCtlerBind 24
#define ob_navi_muWifiCfg 25
#define ob_navi_nexPage 26
#define ob_navi_muAcidUseRecd 20
#define ob_navi_muReCtlerBind 21
#define ob_navi_muWifiCfg 22
#define ob_navi_nexPage 23
#define ob_navi_pageIndex 24
#define ob_navi_t2 25
#define ob_navi_muNone 26
#define ob_navi_lastPage 27
#define ob_navi_pageIndex 28
#define ob_navi_t2 29
#define ob_navi_muNone 30
//muInterval.objs
#define ob_muInterval_muInterval 0
#define ob_muInterval_t0 1
#define ob_muInterval_t1 2
#define ob_muInterval_bak 3
#define ob_muInterval_stAcidInte 4
#define ob_muInterval_t2 5
#define ob_muInterval_stAcidInte 3
#define ob_muInterval_title 4
#define ob_muInterval_bak 5
//muUsrMgr.objs
#define ob_muUsrMgr_muUsrMgr 0
#define ob_muUsrMgr_bak 1
#define ob_muUsrMgr_usr0name 2
#define ob_muUsrMgr_unameCol 3
#define ob_muUsrMgr_usr1name 4
#define ob_muUsrMgr_usr1en 5
#define ob_muUsrMgr_usr2name 6
#define ob_muUsrMgr_usr2en 7
#define ob_muUsrMgr_usr3name 8
#define ob_muUsrMgr_usr3en 9
#define ob_muUsrMgr_usr4name 10
#define ob_muUsrMgr_usr4en 11
#define ob_muUsrMgr_usr1Rest 12
#define ob_muUsrMgr_usr2Rest 13
#define ob_muUsrMgr_usr3Rest 14
#define ob_muUsrMgr_usr4Rest 15
#define ob_muUsrMgr_usr5name 16
#define ob_muUsrMgr_usr5en 17
#define ob_muUsrMgr_usr5Rest 18
#define ob_muUsrMgr_OperaCol 19
#define ob_muUsrMgr_usr1ReName 20
#define ob_muUsrMgr_usr2ReName 21
#define ob_muUsrMgr_usr3ReName 22
#define ob_muUsrMgr_usr4ReName 23
#define ob_muUsrMgr_usr5ReName 24
#define ob_muUsrMgr_t2 25
//muTmrMgr.objs
#define ob_muTmrMgr_muTmrMgr 0
#define ob_muTmrMgr_select0 1
#define ob_muTmrMgr_select1 2
#define ob_muTmrMgr_select2 3
#define ob_muTmrMgr_bak 4
#define ob_muTmrMgr_select3 5
#define ob_muTmrMgr_select4 6
#define ob_muTmrMgr_select5 7
#define ob_muTmrMgr_b0 8
#define ob_muTmrMgr_t2 9
#define ob_muTmrMgr_t0 10
#define ob_muUsrMgr_uName0 1
#define ob_muUsrMgr_uName1 2
#define ob_muUsrMgr_uName2 3
#define ob_muUsrMgr_uName3 4
#define ob_muUsrMgr_uName4 5
#define ob_muUsrMgr_uName5 6
#define ob_muUsrMgr_OperaCol 7
#define ob_muUsrMgr_cfg0 8
#define ob_muUsrMgr_cfg1 9
#define ob_muUsrMgr_cfg2 10
#define ob_muUsrMgr_cfg3 11
#define ob_muUsrMgr_cfg4 12
#define ob_muUsrMgr_title 13
#define ob_muUsrMgr_bak 14
#define ob_muUsrMgr_t1 15
#define ob_muUsrMgr_t0 16
#define ob_muUsrMgr_index0 17
#define ob_muUsrMgr_index1 18
#define ob_muUsrMgr_index2 19
#define ob_muUsrMgr_index3 20
#define ob_muUsrMgr_index4 21
#define ob_muUsrMgr_index5 22
#define ob_muUsrMgr_cfg5 23
#define ob_muUsrMgr_uName6 24
#define ob_muUsrMgr_uName7 25
#define ob_muUsrMgr_cfg6 26
#define ob_muUsrMgr_index6 27
#define ob_muUsrMgr_index7 28
#define ob_muUsrMgr_cfg7 29
#define ob_muUsrMgr_new 30
#define ob_muUsrMgr_index 31
#define ob_muUsrMgr_usrName 32
#define ob_muUsrMgr_role 33
#define ob_muUsrMgr_passwd 34
#define ob_muUsrMgr_indexVal 35
#define ob_muUsrMgr_usrNameVal 36
#define ob_muUsrMgr_passwdRest 37
#define ob_muUsrMgr_roleVal 38
#define ob_muUsrMgr_del 39
#define ob_muUsrMgr_save 40
#define ob_muUsrMgr_isEdited 41
//muDateMgr.objs
#define ob_muDateMgr_muDateMgr 0
#define ob_muDateMgr_year 1
#define ob_muDateMgr_month 2
#define ob_muDateMgr_day 3
#define ob_muDateMgr_hour 4
#define ob_muDateMgr_min 5
#define ob_muDateMgr_sec 6
#define ob_muDateMgr_t2 7
#define ob_muDateMgr_bak 8
#define ob_muDateMgr_t0 9
#define ob_muDateMgr_t1 10
#define ob_muDateMgr_save 11
//muAcidType.objs
#define ob_muAcidType_muAcidType 0
#define ob_muAcidType_bak 1
#define ob_muAcidType_t1 2
#define ob_muAcidType_t2 3
#define ob_muAcidType_t3 4
#define ob_muAcidType_t4 5
#define ob_muAcidType_t5 6
#define ob_muAcidType_t6 7
#define ob_muAcidType_t7 8
#define ob_muAcidType_t8 9
#define ob_muAcidType_t9 10
#define ob_muAcidType_t10 11
#define ob_muAcidType_t11 12
#define ob_muAcidType_t12 13
#define ob_muAcidType_t13 14
#define ob_muAcidType_t14 15
#define ob_muAcidType_t15 16
#define ob_muAcidType_t0 17
//changePasswd.objs
#define ob_changePasswd_changePasswd 0
#define ob_changePasswd_newPwdTil 1
#define ob_changePasswd_newPwd 2
#define ob_changePasswd_newPwdCfmTil 3
#define ob_changePasswd_newPwdCfm 4
#define ob_changePasswd_confirm 5
#define ob_changePasswd_bak 6
#define ob_changePasswd_oldPwdTil 7
#define ob_changePasswd_oldPwd 8
#define ob_changePasswd_t0 9
//muSettings.objs
#define ob_muSettings_muSettings 0
#define ob_muSettings_irunTil 1
#define ob_muSettings_bak 2
#define ob_muSettings_irun0 3
#define ob_muSettings_pageTitle 4
#define ob_muSettings_irun1 5
#define ob_muSettings_irun2 6
#define ob_muSettings_irun3 7
#define ob_muSettings_pumpCoefTil 8
#define ob_muSettings_pumpCoef0 9
#define ob_muSettings_pumpCoef1 10
#define ob_muSettings_pumpCoef2 11
#define ob_muSettings_pumpCoef3 12
#define ob_muSettings_pipeLenTil 13
#define ob_muSettings_pipeLen3 14
#define ob_muSettings_addAcidVelTil 15
#define ob_muSettings_addAcidVel3 16
#define ob_muSettings_bleCliTil 17
#define ob_muSettings_bleCliName 18
#define ob_muSettings_bleScan 19
#define ob_muSettings_pumpTest 20
#define ob_muSettings_addAcidVel0 21
#define ob_muSettings_addAcidVel1 22
#define ob_muSettings_addAcidVel2 23
#define ob_muSettings_pipeLen0 24
#define ob_muSettings_pipeLen2 25
#define ob_muSettings_pipeLen1 26
#define ob_muAcidType_t1 1
#define ob_muAcidType_t2 2
#define ob_muAcidType_t3 3
#define ob_muAcidType_t4 4
#define ob_muAcidType_t5 5
#define ob_muAcidType_t6 6
#define ob_muAcidType_t7 7
#define ob_muAcidType_t8 8
#define ob_muAcidType_t9 9
#define ob_muAcidType_t10 10
#define ob_muAcidType_t11 11
#define ob_muAcidType_t12 12
#define ob_muAcidType_t13 13
#define ob_muAcidType_t14 14
#define ob_muAcidType_t15 15
#define ob_muAcidType_til 16
#define ob_muAcidType_bak 17
//muChangePasswd.objs
#define ob_muChangePasswd_muChangePasswd0
#define ob_muChangePasswd_newPwdTil 1
#define ob_muChangePasswd_newPwdCfmTil 2
#define ob_muChangePasswd_oldPwdTil 3
#define ob_muChangePasswd_t0 4
#define ob_muChangePasswd_bak 5
#define ob_muChangePasswd_pwd 6
#define ob_muChangePasswd_pwdEMsg 7
#define ob_muChangePasswd_newPwd 8
#define ob_muChangePasswd_newPwdMsg 9
#define ob_muChangePasswd_cfirmPwd 10
#define ob_muChangePasswd_cfirmPwdMsg 11
#define ob_muChangePasswd_save 12
//muCHSetting.objs
#define ob_muCHSetting_muCHSetting 0
#define ob_muCHSetting_pageTitle 1
#define ob_muCHSetting_bak 2
#define ob_muCHSetting_pumpIdTil 3
#define ob_muCHSetting_cfgtil2 4
#define ob_muCHSetting_cfg2 5
#define ob_muCHSetting_cfgUint2 6
#define ob_muCHSetting_cfg3 7
#define ob_muCHSetting_cfgUint3 8
#define ob_muCHSetting_cfgtil3 9
#define ob_muCHSetting_pumpId 10
#define ob_muCHSetting_cfg1 11
#define ob_muCHSetting_cfgUint1 12
#define ob_muCHSetting_cfgtil1 13
#define ob_muCHSetting_cfg0 14
#define ob_muCHSetting_cfgUint0 15
#define ob_muCHSetting_cfgtil0 16
#define ob_muCHSetting_stop 17
#define ob_muCHSetting_bakTurn 18
#define ob_muCHSetting_forTurn 19
#define ob_muCHSetting_statiTrun 20
#define ob_muCHSetting_statiVolum 21
#define ob_muCHSetting_statiTrunTil 22
#define ob_muCHSetting_statiVolumTil 23
#define ob_muCHSetting_t7 24
#define ob_muCHSetting_t8 25
#define ob_muCHSetting_statRst 26
#define ob_muCHSetting_statTil 27
#define ob_muCHSetting_cfg4 28
#define ob_muCHSetting_cfgUint4 29
#define ob_muCHSetting_cfgtil4 30
//muDeviceInfo.objs
#define ob_muDeviceInfo_muDeviceInfo 0
#define ob_muDeviceInfo_bak 1
#define ob_muDeviceInfo_softVersTil 2
#define ob_muDeviceInfo_softVers 3
#define ob_muDeviceInfo_deviceIdTil 4
#define ob_muDeviceInfo_deviceId 5
#define ob_muDeviceInfo_manufaTil 6
#define ob_muDeviceInfo_manufa 7
#define ob_muDeviceInfo_t0 8
//muAudit.objs
#define ob_muAudit_muAudit 0
#define ob_muAudit_bak 1
#define ob_muAudit_t0 2
#define ob_muAudit_t1 3
#define ob_muAudit_t2 4
#define ob_muAudit_b0 5
#define ob_muAudit_b1 6
#define ob_muAudit_t3 7
//muPumpTest.objs
#define ob_muPumpTest_muPumpTest 0
#define ob_muPumpTest_frompage 1
#define ob_muPumpTest_fromPopUpWin 2
#define ob_muPumpTest_bak 3
#define ob_muPumpTest_statiTrun 4
#define ob_muPumpTest_t0 5
#define ob_muPumpTest_statiVolum 6
#define ob_muPumpTest_statiTrunTil 7
#define ob_muPumpTest_statiVolumTil 8
#define ob_muPumpTest_clearStati 9
#define ob_muPumpTest_forward 10
#define ob_muPumpTest_bakward 11
#define ob_muPumpTest_stop 12
#define ob_muPumpTest_pumpId 13
#define ob_muPumpTest_pumpIdTil 14
#define ob_muDeviceInfo_softVersTil 1
#define ob_muDeviceInfo_softVers 2
#define ob_muDeviceInfo_deviceIdTil 3
#define ob_muDeviceInfo_deviceId 4
#define ob_muDeviceInfo_manufaTil 5
#define ob_muDeviceInfo_manufa 6
#define ob_muDeviceInfo_t0 7
#define ob_muDeviceInfo_bak 8
//muReCtlerBind.objs
#define ob_muReCtlerBind_muReCtlerBind 0
#define ob_muReCtlerBind_sec 1
#define ob_muReCtlerBind_t2 2
#define ob_muReCtlerBind_bak 3
#define ob_muReCtlerBind_scan 4
#define ob_muReCtlerBind_bleCliName 5
#define ob_muReCtlerBind_bleCliNameTil 6
#define ob_muReCtlerBind_bleEvent 7
#define ob_muReCtlerBind_bleEventTil 8
#define ob_muReCtlerBind_t0 9
#define ob_muReCtlerBind_infoWin 10
//muAcidTakeMgr.objs
#define ob_muAcidTakeMgr_muAcidTakeMgr 0
#define ob_muAcidTakeMgr_t0 1
#define ob_muAcidTakeMgr_bak 2
#define ob_muAcidTakeMgr_val01 3
#define ob_muAcidTakeMgr_h1 4
#define ob_muAcidTakeMgr_h2 5
#define ob_muAcidTakeMgr_h0 6
#define ob_muAcidTakeMgr_val00 7
#define ob_muAcidTakeMgr_val10 8
#define ob_muAcidTakeMgr_val20 9
#define ob_muAcidTakeMgr_val30 10
#define ob_muAcidTakeMgr_val40 11
#define ob_muAcidTakeMgr_val50 12
#define ob_muAcidTakeMgr_val60 13
#define ob_muAcidTakeMgr_val70 14
#define ob_muAcidTakeMgr_val11 15
#define ob_muAcidTakeMgr_val21 16
#define ob_muAcidTakeMgr_val31 17
#define ob_muAcidTakeMgr_val41 18
#define ob_muAcidTakeMgr_val51 19
#define ob_muAcidTakeMgr_val61 20
#define ob_muAcidTakeMgr_val71 21
#define ob_muAcidTakeMgr_val02 22
#define ob_muAcidTakeMgr_export 23
#define ob_muAcidTakeMgr_val12 24
#define ob_muAcidTakeMgr_val22 25
#define ob_muAcidTakeMgr_val32 26
#define ob_muAcidTakeMgr_val42 27
#define ob_muAcidTakeMgr_val52 28
#define ob_muAcidTakeMgr_val62 29
#define ob_muAcidTakeMgr_val72 30
#define ob_muAcidTakeMgr_h3 31
#define ob_muAcidTakeMgr_val03 32
#define ob_muAcidTakeMgr_val13 33
#define ob_muAcidTakeMgr_val23 34
#define ob_muAcidTakeMgr_val33 35
#define ob_muAcidTakeMgr_val43 36
#define ob_muAcidTakeMgr_val53 37
#define ob_muAcidTakeMgr_val63 38
#define ob_muAcidTakeMgr_val73 39
#define ob_muAcidTakeMgr_h4 40
#define ob_muAcidTakeMgr_val04 41
#define ob_muAcidTakeMgr_val14 42
#define ob_muAcidTakeMgr_val24 43
#define ob_muAcidTakeMgr_val34 44
#define ob_muAcidTakeMgr_val44 45
#define ob_muAcidTakeMgr_val54 46
#define ob_muAcidTakeMgr_val64 47
#define ob_muAcidTakeMgr_val74 48
#define ob_muAcidTakeMgr_h5 49
#define ob_muAcidTakeMgr_val05 50
#define ob_muAcidTakeMgr_val15 51
#define ob_muAcidTakeMgr_val25 52
#define ob_muAcidTakeMgr_val35 53
#define ob_muAcidTakeMgr_val45 54
#define ob_muAcidTakeMgr_val55 55
#define ob_muAcidTakeMgr_val65 56
#define ob_muAcidTakeMgr_val75 57
#define ob_muAcidTakeMgr_nxtBut 58
#define ob_muAcidTakeMgr_preBut 59
#define ob_muAcidTakeMgr_pageIndex 60
#define ob_muAcidTakeMgr_t1 61
//muAcidUseRecd.objs
#define ob_muAcidUseRecd_muAcidUseRecd 0
#define ob_muAcidUseRecd_til 1
#define ob_muAcidUseRecd_bak 2
#define ob_muAcidUseRecd_chTil 3
#define ob_muAcidUseRecd_chId 4
#define ob_muAcidUseRecd_val01 5
#define ob_muAcidUseRecd_h1 6
#define ob_muAcidUseRecd_volumeVal 7
#define ob_muAcidUseRecd_volumeTil 8
#define ob_muAcidUseRecd_volumeUint 9
#define ob_muAcidUseRecd_addNew 10
#define ob_muAcidUseRecd_takePers 11
#define ob_muAcidUseRecd_takePersTil 12
#define ob_muAcidUseRecd_distPersoTil 13
#define ob_muAcidUseRecd_distPerso 14
#define ob_muAcidUseRecd_h2 15
#define ob_muAcidUseRecd_h3 16
#define ob_muAcidUseRecd_h4 17
#define ob_muAcidUseRecd_h0 18
#define ob_muAcidUseRecd_val04 19
#define ob_muAcidUseRecd_val00 20
#define ob_muAcidUseRecd_val10 21
#define ob_muAcidUseRecd_val20 22
#define ob_muAcidUseRecd_val30 23
#define ob_muAcidUseRecd_val40 24
#define ob_muAcidUseRecd_val50 25
#define ob_muAcidUseRecd_val60 26
#define ob_muAcidUseRecd_val70 27
#define ob_muAcidUseRecd_val11 28
#define ob_muAcidUseRecd_val21 29
#define ob_muAcidUseRecd_val31 30
#define ob_muAcidUseRecd_val41 31
#define ob_muAcidUseRecd_val51 32
#define ob_muAcidUseRecd_val61 33
#define ob_muAcidUseRecd_val71 34
#define ob_muAcidUseRecd_val02 35
#define ob_muAcidUseRecd_val12 36
#define ob_muAcidUseRecd_val22 37
#define ob_muAcidUseRecd_val32 38
#define ob_muAcidUseRecd_val42 39
#define ob_muAcidUseRecd_val52 40
#define ob_muAcidUseRecd_val62 41
#define ob_muAcidUseRecd_val72 42
#define ob_muAcidUseRecd_val03 43
#define ob_muAcidUseRecd_val13 44
#define ob_muAcidUseRecd_val23 45
#define ob_muAcidUseRecd_val33 46
#define ob_muAcidUseRecd_val43 47
#define ob_muAcidUseRecd_val53 48
#define ob_muAcidUseRecd_val63 49
#define ob_muAcidUseRecd_val73 50
#define ob_muAcidUseRecd_val14 51
#define ob_muAcidUseRecd_val24 52
#define ob_muAcidUseRecd_val34 53
#define ob_muAcidUseRecd_val44 54
#define ob_muAcidUseRecd_val54 55
#define ob_muAcidUseRecd_val64 56
#define ob_muAcidUseRecd_val74 57
#define ob_muAcidUseRecd_export 58
//popwin.objs
#define ob_popwin_popwin 0
#define ob_popwin_t0 1
@ -282,6 +433,7 @@
#define ob_keybAcidCh_loadcmname 19
#define ob_keybAcidCh_txt 20
#define ob_keybAcidCh_fn0 21
#define ob_keybAcidCh_t0 22
//keybdB.objs
#define ob_keybdB_keybdB 0
#define ob_keybdB_b0 1
@ -304,15 +456,16 @@
#define ob_keybdB_temp 18
#define ob_keybdB_inputlenth 19
#define ob_keybdB_t2 20
#define ob_keybdB_b251 21
#define ob_keybdB_temp2 22
#define ob_keybdB_tempstr 23
#define ob_keybdB_b10 24
#define ob_keybdB_b11 25
#define ob_keybdB_loadcmname 26
#define ob_keybdB_b249 27
#define ob_keybdB_clear 28
#define ob_keybdB_m0 29
#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
//keybdAP.objs
#define ob_keybdAP_keybdAP 0
#define ob_keybdAP_loadpageid 1
@ -393,59 +546,7 @@
#define ob_keybdAP_tempstr 76
#define ob_keybdAP_temp2 77
#define ob_keybdAP_loadcmname 78
//keybdA.objs
#define ob_keybdA_keybdA 0
#define ob_keybdA_loadpageid 1
#define ob_keybdA_loadcmpid 2
#define ob_keybdA_b0 3
#define ob_keybdA_b251 4
#define ob_keybdA_b210 5
#define ob_keybdA_b1 6
#define ob_keybdA_b2 7
#define ob_keybdA_b3 8
#define ob_keybdA_b4 9
#define ob_keybdA_b5 10
#define ob_keybdA_b6 11
#define ob_keybdA_b7 12
#define ob_keybdA_b8 13
#define ob_keybdA_b200 14
#define ob_keybdA_b20 15
#define ob_keybdA_b21 16
#define ob_keybdA_b22 17
#define ob_keybdA_b23 18
#define ob_keybdA_b24 19
#define ob_keybdA_b25 20
#define ob_keybdA_b26 21
#define ob_keybdA_b27 22
#define ob_keybdA_b28 23
#define ob_keybdA_b220 24
#define ob_keybdA_b40 25
#define ob_keybdA_b41 26
#define ob_keybdA_b42 27
#define ob_keybdA_b43 28
#define ob_keybdA_b44 29
#define ob_keybdA_b45 30
#define ob_keybdA_b46 31
#define ob_keybdA_b230 32
#define ob_keybdA_b240 33
#define ob_keybdA_b242 34
#define ob_keybdA_b241 35
#define ob_keybdA_b243 36
#define ob_keybdA_b231 37
#define ob_keybdA_b244 38
#define ob_keybdA_refshow 39
#define ob_keybdA_tm0 40
#define ob_keybdA_input 41
#define ob_keybdA_show 42
#define ob_keybdA_temp 43
#define ob_keybdA_inputlenth 44
#define ob_keybdA_b249 45
#define ob_keybdA_b201 46
#define ob_keybdA_b9 47
#define ob_keybdA_b232 48
#define ob_keybdA_tempstr 49
#define ob_keybdA_temp2 50
#define ob_keybdA_loadcmname 51
#define ob_keybdAP_title 79
//keyPasswd.objs
#define ob_keyPasswd_keyPasswd 0
#define ob_keyPasswd_b0 1

53
usrc/uicontroler/page/navi_page.cpp
View File

@ -93,7 +93,11 @@ class NaviPage : public IPageProcesser {
ZLOGI(TAG, "on muButton muIndex=%d ", muIndex);
if (buttonIndex < m_menuTotalNum) {
UIControler::ins()->chpage(m_muInfo[buttonIndex].page);
if (m_muInfo[buttonIndex].page != 0) {
UIControler::ins()->chpage(m_muInfo[buttonIndex].page);
} else {
}
}
}
}
@ -106,14 +110,14 @@ class NaviPage : public IPageProcesser {
} else if (GStateMgr::ins()->getLoginUsrType() == kuser) {
initUsrMenu();
}
syncMenu(0);
syncMenu(0 /*pageNum*/);
}
}
private:
void syncState() {
initAdminMenu();
syncMenu(0);
syncMenu(0 /*pageNum*/);
}
void onLogin() {}
@ -133,43 +137,36 @@ class NaviPage : public IPageProcesser {
void initAdminMenu() {
int i = 0;
m_muInfo[i++] = {ob_navi_muInterval, pg_muInterval};
m_muInfo[i++] = {ob_navi_muChangePwd, pg_muInterval};
m_muInfo[i++] = {ob_navi_muTmrMgr, pg_muInterval};
m_muInfo[i++] = {ob_navi_muAcidType, pg_muInterval};
m_muInfo[i++] = {ob_navi_muUsrMgr, pg_muInterval};
m_muInfo[i++] = {ob_navi_muSettings, pg_muInterval};
m_muInfo[i++] = {ob_navi_muAudit, pg_muInterval};
m_muInfo[i++] = {ob_navi_muDeviceInfo, pg_muInterval};
m_muInfo[i++] = {ob_navi_muAcidTakeMgr, pg_muInterval};
m_muInfo[i++] = {ob_navi_muAcidTakeRecd, pg_muInterval};
m_muInfo[i++] = {ob_navi_muAcidUseRecd, pg_muInterval};
m_muInfo[i++] = {ob_navi_muPumpTest, pg_muInterval};
m_muInfo[i++] = {ob_navi_muPumpCali, pg_muInterval};
m_muInfo[i++] = {ob_navi_muReCtlerBind, pg_muInterval};
m_muInfo[i++] = {ob_navi_muWifiCfg, pg_muInterval};
m_muInfo[i++] = {ob_navi_muWifiCfg, pg_muInterval};
m_muInfo[i++] = {ob_navi_muLoginOut, pg_muInterval};
m_muInfo[i++] = {ob_navi_muInterval, pg_muInterval}; // 加酸间隔
m_muInfo[i++] = {ob_navi_muCHSetting, pg_muCHSetting}; // 通道设置
m_muInfo[i++] = {ob_navi_muAcidType, pg_muAcidType}; // 酸类型管理
m_muInfo[i++] = {ob_navi_muUsrMgr, pg_muUsrMgr}; // 用户管理
m_muInfo[i++] = {ob_navi_muDateMgr, pg_muDateMgr}; // 修改时间
m_muInfo[i++] = {ob_navi_muAcidTakeMgr, pg_muAcidTakeMgr}; // 领酸管理
m_muInfo[i++] = {ob_navi_muAcidUseRecd, pg_muAcidUseRecd}; // 用酸记录
m_muInfo[i++] = {ob_navi_muReCtlerBind, pg_muReCtlerBind}; // 手柄绑定
m_muInfo[i++] = {ob_navi_muChangePwd, pg_muChangePasswd}; // 修改密码
m_muInfo[i++] = {ob_navi_muDeviceInfo, pg_muDeviceInfo}; // 设备信息
m_muInfo[i++] = {ob_navi_muLoginOut, 0}; // 退出登录
m_menuTotalNum = i;
m_maxPageNum = (m_menuTotalNum - 1) / 8 + 1;
}
void initUsrMenu() {
int i = 0;
m_muInfo[i++] = {ob_navi_muInterval, pg_muInterval};
m_muInfo[i++] = {ob_navi_muChangePwd, pg_muInterval};
m_muInfo[i++] = {ob_navi_muSettings, pg_muInterval};
m_muInfo[i++] = {ob_navi_muLoginOut, pg_muInterval};
m_muInfo[i++] = {ob_navi_muInterval, pg_muInterval}; // 加酸间隔
m_muInfo[i++] = {ob_navi_muChangePwd, pg_muChangePasswd}; // 修改密码
m_muInfo[i++] = {ob_navi_muLoginOut, 0}; // 退出登录
m_menuTotalNum = i;
m_maxPageNum = (m_menuTotalNum - 1) / 8 + 1;
}
void initStoreKeeperMenu() {
int i = 0;
m_muInfo[i++] = {ob_navi_muChangePwd, pg_muInterval};
m_muInfo[i++] = {ob_navi_muAcidTakeMgr, pg_muInterval};
m_muInfo[i++] = {ob_navi_muAcidTakeRecd, pg_muInterval};
m_muInfo[i++] = {ob_navi_muLoginOut, pg_muInterval};
m_muInfo[i++] = {ob_navi_muChangePwd, pg_muChangePasswd}; // 修改密码
m_muInfo[i++] = {ob_navi_muAcidTakeMgr, pg_muAcidTakeMgr}; // 领酸管理
m_muInfo[i++] = {ob_navi_muAcidUseRecd, pg_muAcidUseRecd}; // 用酸记录
m_muInfo[i++] = {ob_navi_muLoginOut, 0}; // 退出登录
m_menuTotalNum = i;
m_maxPageNum = (m_menuTotalNum - 1) / 8 + 1;
}

Write Preview
Loading…
Cancel
Save