diff --git a/ui/hand_acid_mainboard_ui.HMI b/ui/hand_acid_mainboard_ui.HMI index 8c3651c..e625790 100644 Binary files a/ui/hand_acid_mainboard_ui.HMI and b/ui/hand_acid_mainboard_ui.HMI differ diff --git a/ui/ui.h b/ui/ui.h index 0b0b663..cf63f4c 100644 --- a/ui/ui.h +++ b/ui/ui.h @@ -58,6 +58,7 @@ #define ob_login_uName 3 #define ob_login_uNameEMsg 4 #define ob_login_pwdEMsg 5 +#define ob_login_tc0 6 //home.objs #define ob_home_home 0 #define ob_home_AcidCH0S 1 @@ -106,6 +107,7 @@ #define ob_home_str 44 #define ob_home_weekArr 45 #define ob_home_m0 46 +#define ob_home_tc0 47 //navi.objs #define ob_navi_navi 0 #define ob_navi_bak 1 @@ -136,6 +138,7 @@ #define ob_navi_muNone 26 #define ob_navi_lastPage 27 #define ob_navi_powerOff 28 +#define ob_navi_tc0 29 //muInterval.objs #define ob_muInterval_muInterval 0 #define ob_muInterval_t0 1 @@ -143,6 +146,7 @@ #define ob_muInterval_stAcidInte 3 #define ob_muInterval_title 4 #define ob_muInterval_bak 5 +#define ob_muInterval_tc0 6 //muUsrMgr.objs #define ob_muUsrMgr_muUsrMgr 0 #define ob_muUsrMgr_passwdRest 1 @@ -190,6 +194,7 @@ #define ob_muUsrMgr_delButMask 43 #define ob_muUsrMgr_roleVal 44 #define ob_muUsrMgr_editAreaMask 45 +#define ob_muUsrMgr_tc0 46 //muDateMgr.objs #define ob_muDateMgr_muDateMgr 0 #define ob_muDateMgr_year 1 @@ -206,6 +211,7 @@ #define ob_muDateMgr_tm0 12 #define ob_muDateMgr_changeBid 13 #define ob_muDateMgr_m0 14 +#define ob_muDateMgr_tc0 15 //muAcidType.objs #define ob_muAcidType_muAcidType 0 #define ob_muAcidType_t1 1 @@ -225,6 +231,7 @@ #define ob_muAcidType_t15 15 #define ob_muAcidType_til 16 #define ob_muAcidType_bak 17 +#define ob_muAcidType_tc0 18 //muChangePasswd.objs #define ob_muChangePasswd_muChangePasswd0 #define ob_muChangePasswd_newPwdTil 1 @@ -239,6 +246,7 @@ #define ob_muChangePasswd_cfirmPwd 10 #define ob_muChangePasswd_cfirmPwdMsg 11 #define ob_muChangePasswd_save 12 +#define ob_muChangePasswd_tc0 13 //muCHSetting.objs #define ob_muCHSetting_muCHSetting 0 #define ob_muCHSetting_pageTitle 1 @@ -282,6 +290,7 @@ #define ob_muCHSetting_cfgUint5 39 #define ob_muCHSetting_cfgtil5 40 #define ob_muCHSetting_cfg5mask 41 +#define ob_muCHSetting_tc0 42 //muDeviceInfo.objs #define ob_muDeviceInfo_muDeviceInfo 0 #define ob_muDeviceInfo_softVersTil 1 @@ -292,6 +301,7 @@ #define ob_muDeviceInfo_manufa 6 #define ob_muDeviceInfo_title 7 #define ob_muDeviceInfo_bak 8 +#define ob_muDeviceInfo_tc0 9 //muReCtlerBind.objs #define ob_muReCtlerBind_muReCtlerBind 0 #define ob_muReCtlerBind_sec 1 @@ -304,6 +314,7 @@ #define ob_muReCtlerBind_bleEventTil 8 #define ob_muReCtlerBind_t0 9 #define ob_muReCtlerBind_infoWin 10 +#define ob_muReCtlerBind_tc0 11 //muAcidUseRecd.objs #define ob_muAcidUseRecd_muAcidUseRecd 0 #define ob_muAcidUseRecd_t0 1 @@ -368,6 +379,7 @@ #define ob_muAcidUseRecd_pageIndex 60 #define ob_muAcidUseRecd_t1 61 #define ob_muAcidUseRecd_clearRecord 62 +#define ob_muAcidUseRecd_tc0 63 //muAcidDistMgr.objs #define ob_muAcidDistMgr_muAcidDistMgr 0 #define ob_muAcidDistMgr_til 1 @@ -430,6 +442,7 @@ #define ob_muAcidDistMgr_t1 58 #define ob_muAcidDistMgr_takePers 59 #define ob_muAcidDistMgr_chId 60 +#define ob_muAcidDistMgr_tc0 61 //popwin.objs #define ob_popwin_popwin 0 #define ob_popwin_p0 1 @@ -441,6 +454,7 @@ #define ob_popwin_popTil 7 #define ob_popwin_loadingWin 8 #define ob_popwin_loadingText 9 +#define ob_popwin_tc0 10 //keybdB.objs #define ob_keybdB_keybdB 0 #define ob_keybdB_b0 1 @@ -473,6 +487,7 @@ #define ob_keybdB_m0 28 #define ob_keybdB_bak 29 #define ob_keybdB_title 30 +#define ob_keybdB_tc0 31 //keybdAP.objs #define ob_keybdAP_keybdAP 0 #define ob_keybdAP_loadpageid 1 @@ -554,6 +569,7 @@ #define ob_keybdAP_temp2 77 #define ob_keybdAP_loadcmname 78 #define ob_keybdAP_title 79 +#define ob_keybdAP_tc0 80 //keyPasswd.objs #define ob_keyPasswd_keyPasswd 0 #define ob_keyPasswd_b0 1 @@ -583,6 +599,7 @@ #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 @@ -595,42 +612,45 @@ #define ob_keybMutSel_frompage 8 #define ob_keybMutSel_title 9 #define ob_keybMutSel_ctent 10 +#define ob_keybMutSel_tc0 11 //keybMutSelFix.objs #define ob_keybMutSelFix_keybMutSelFix 0 -#define ob_keybMutSelFix_bak 1 -#define ob_keybMutSelFix_b0 2 -#define ob_keybMutSelFix_b1 3 -#define ob_keybMutSelFix_b2 4 -#define ob_keybMutSelFix_b3 5 -#define ob_keybMutSelFix_b4 6 -#define ob_keybMutSelFix_b5 7 -#define ob_keybMutSelFix_b6 8 -#define ob_keybMutSelFix_b7 9 -#define ob_keybMutSelFix_b8 10 -#define ob_keybMutSelFix_b9 11 -#define ob_keybMutSelFix_b10 12 -#define ob_keybMutSelFix_b11 13 -#define ob_keybMutSelFix_b12 14 -#define ob_keybMutSelFix_b13 15 -#define ob_keybMutSelFix_b14 16 -#define ob_keybMutSelFix_loadpageid 17 -#define ob_keybMutSelFix_loadcmpid 18 -#define ob_keybMutSelFix_txt 19 -#define ob_keybMutSelFix_fn0 20 -#define ob_keybMutSelFix_keybtil 21 -#define ob_keybMutSelFix_val 22 -#define ob_keybMutSelFix_t0 23 -#define ob_keybMutSelFix_t1 24 -#define ob_keybMutSelFix_t2 25 -#define ob_keybMutSelFix_t3 26 -#define ob_keybMutSelFix_t4 27 -#define ob_keybMutSelFix_t5 28 -#define ob_keybMutSelFix_t6 29 -#define ob_keybMutSelFix_t7 30 -#define ob_keybMutSelFix_t8 31 -#define ob_keybMutSelFix_t9 32 -#define ob_keybMutSelFix_t10 33 -#define ob_keybMutSelFix_t11 34 -#define ob_keybMutSelFix_t12 35 -#define ob_keybMutSelFix_t13 36 -#define ob_keybMutSelFix_t14 37 +#define ob_keybMutSelFix_p0 1 +#define ob_keybMutSelFix_bak 2 +#define ob_keybMutSelFix_b0 3 +#define ob_keybMutSelFix_b1 4 +#define ob_keybMutSelFix_b2 5 +#define ob_keybMutSelFix_b3 6 +#define ob_keybMutSelFix_b4 7 +#define ob_keybMutSelFix_b5 8 +#define ob_keybMutSelFix_b6 9 +#define ob_keybMutSelFix_b7 10 +#define ob_keybMutSelFix_b8 11 +#define ob_keybMutSelFix_b9 12 +#define ob_keybMutSelFix_b10 13 +#define ob_keybMutSelFix_b11 14 +#define ob_keybMutSelFix_b12 15 +#define ob_keybMutSelFix_b13 16 +#define ob_keybMutSelFix_b14 17 +#define ob_keybMutSelFix_loadpageid 18 +#define ob_keybMutSelFix_loadcmpid 19 +#define ob_keybMutSelFix_txt 20 +#define ob_keybMutSelFix_fn0 21 +#define ob_keybMutSelFix_keybtil 22 +#define ob_keybMutSelFix_val 23 +#define ob_keybMutSelFix_t0 24 +#define ob_keybMutSelFix_t1 25 +#define ob_keybMutSelFix_t2 26 +#define ob_keybMutSelFix_t3 27 +#define ob_keybMutSelFix_t4 28 +#define ob_keybMutSelFix_t5 29 +#define ob_keybMutSelFix_t6 30 +#define ob_keybMutSelFix_t7 31 +#define ob_keybMutSelFix_t8 32 +#define ob_keybMutSelFix_t9 33 +#define ob_keybMutSelFix_t10 34 +#define ob_keybMutSelFix_t11 35 +#define ob_keybMutSelFix_t12 36 +#define ob_keybMutSelFix_t13 37 +#define ob_keybMutSelFix_t14 38 +#define ob_keybMutSelFix_tc0 39