diff --git a/uappbase/service/config_index.cpp b/uappbase/service/config_index.cpp index e2e6668..1973da7 100644 --- a/uappbase/service/config_index.cpp +++ b/uappbase/service/config_index.cpp @@ -8,29 +8,29 @@ static cfg_iterm_info_t cfg_iterm_infos[] = { /*********************************************************************************************************************** * 用户管理 * ***********************************************************************************************************************/ - CFG_ITERM(kusr_name0, kcfgt_str, "管理员"), // - CFG_ITERM(kusr_enable0, kcfgt_bool, "true"), // 1:使能,0失能 - CFG_ITERM(kusr_passwd0, kcfgt_str, "888888"), // + CFG_ITERM(kusr_name0, kcfgt_str, USER0_DEFAULT_NAME), // + CFG_ITERM(kusr_enable0, kcfgt_bool, "true"), // 1:使能,0失能 + CFG_ITERM(kusr_passwd0, kcfgt_str, USER_DEFAULT_PWD), // - CFG_ITERM(kusr_name1, kcfgt_str, "用户1"), // - CFG_ITERM(kusr_enable1, kcfgt_bool, "true"), // - CFG_ITERM(kusr_passwd1, kcfgt_str, "888888"), // + CFG_ITERM(kusr_name1, kcfgt_str, USER1_DEFAULT_NAME), // + CFG_ITERM(kusr_enable1, kcfgt_bool, "true"), // + CFG_ITERM(kusr_passwd1, kcfgt_str, USER_DEFAULT_PWD), // - CFG_ITERM(kusr_name2, kcfgt_str, "用户2"), // - CFG_ITERM(kusr_enable2, kcfgt_bool, "true"), // - CFG_ITERM(kusr_passwd2, kcfgt_str, "888888"), // + CFG_ITERM(kusr_name2, kcfgt_str, USER2_DEFAULT_NAME), // + CFG_ITERM(kusr_enable2, kcfgt_bool, "false"), // + CFG_ITERM(kusr_passwd2, kcfgt_str, USER_DEFAULT_PWD), // - CFG_ITERM(kusr_name3, kcfgt_str, "用户3"), // - CFG_ITERM(kusr_enable3, kcfgt_bool, "true"), // - CFG_ITERM(kusr_passwd3, kcfgt_str, "888888"), // + CFG_ITERM(kusr_name3, kcfgt_str, USER3_DEFAULT_NAME), // + CFG_ITERM(kusr_enable3, kcfgt_bool, "false"), // + CFG_ITERM(kusr_passwd3, kcfgt_str, USER_DEFAULT_PWD), // - CFG_ITERM(kusr_name4, kcfgt_str, "用户4"), // - CFG_ITERM(kusr_enable4, kcfgt_bool, "true"), // - CFG_ITERM(kusr_passwd4, kcfgt_str, "888888"), // + CFG_ITERM(kusr_name4, kcfgt_str, USER4_DEFAULT_NAME), // + CFG_ITERM(kusr_enable4, kcfgt_bool, "false"), // + CFG_ITERM(kusr_passwd4, kcfgt_str, USER_DEFAULT_PWD), // - CFG_ITERM(kusr_name5, kcfgt_str, "用户5"), // - CFG_ITERM(kusr_enable5, kcfgt_bool, "true"), // - CFG_ITERM(kusr_passwd5, kcfgt_str, "888888"), // + CFG_ITERM(kusr_name5, kcfgt_str, USER5_DEFAULT_NAME), // + CFG_ITERM(kusr_enable5, kcfgt_bool, "false"), // + CFG_ITERM(kusr_passwd5, kcfgt_str, USER_DEFAULT_PWD), // /*********************************************************************************************************************** * 酸液预设名称 * @@ -80,7 +80,7 @@ static cfg_iterm_info_t cfg_iterm_infos[] = { ***********************************************************************************************************************/ CFG_ITERM(kcfg_lockAcidName, kcfgt_bool, "false"), // CFG_ITERM(kcfg_echDitrUpLi, kcfgt_int32, "40"), // 每次分配上限设定值 each distri up-limit - CFG_ITERM(kcfg_distrInterval, kcfgt_float, "1.5"), // 每次分配间隔时间 + CFG_ITERM(kcfg_distrInterval, kcfgt_float, "1.5"), // 每次分配间隔时间 CFG_ITERM(kcfg_pumpDefVel, kcfgt_int32, "800"), // CFG_ITERM(kcfg_m0irun, kcfgt_int32, "20"), // diff --git a/uappbase/service/config_index.hpp b/uappbase/service/config_index.hpp index 116a223..b9c039d 100644 --- a/uappbase/service/config_index.hpp +++ b/uappbase/service/config_index.hpp @@ -4,6 +4,15 @@ #include "uappbase/bean/bean.hpp" #include "uappbase/bean/config_index_enum.hpp" +#define USER0_DEFAULT_NAME "管理员" +#define USER1_DEFAULT_NAME "用户1" +#define USER2_DEFAULT_NAME "用户2" +#define USER3_DEFAULT_NAME "用户3" +#define USER4_DEFAULT_NAME "用户4" +#define USER5_DEFAULT_NAME "用户5" + +#define USER_DEFAULT_PWD "888888" + namespace iflytop { typedef enum { kcfgt_float, diff --git a/usrc/service/page/submenu/Page_muUsrMgr.cpp b/usrc/service/page/submenu/Page_muUsrMgr.cpp index 3f4ee51..d82c529 100644 --- a/usrc/service/page/submenu/Page_muUsrMgr.cpp +++ b/usrc/service/page/submenu/Page_muUsrMgr.cpp @@ -14,37 +14,51 @@ bool Page_muUsrMgr::isBelongThisPage(int page) { return page == PAGE; } void Page_muUsrMgr::OnPageLoad() { // ZLOGI(TAG, "OnPageLoad"); - UIS->setVal(PAGE, ob_muUsrMgr_usr1name, "usr1"); - UIS->setVal(PAGE, ob_muUsrMgr_usr2name, "usr2"); - UIS->setVal(PAGE, ob_muUsrMgr_usr3name, "usr3"); - UIS->setVal(PAGE, ob_muUsrMgr_usr4name, "usr4"); - UIS->setVal(PAGE, ob_muUsrMgr_usr5name, "usr5"); - - UIS->setVal(PAGE, ob_muUsrMgr_usr1en, 1); - UIS->setVal(PAGE, ob_muUsrMgr_usr2en, 1); - UIS->setVal(PAGE, ob_muUsrMgr_usr3en, 1); - UIS->setVal(PAGE, ob_muUsrMgr_usr4en, 1); - UIS->setVal(PAGE, ob_muUsrMgr_usr5en, 1); + updatePage(); }; +void Page_muUsrMgr::updatePage() { + UIS->setVal(PAGE, ob_muUsrMgr_usr0name, getCfgStr(kusr_name0)); + UIS->setVal(PAGE, ob_muUsrMgr_usr1name, getCfgStr(kusr_name1)); + UIS->setVal(PAGE, ob_muUsrMgr_usr2name, getCfgStr(kusr_name2)); + UIS->setVal(PAGE, ob_muUsrMgr_usr3name, getCfgStr(kusr_name3)); + UIS->setVal(PAGE, ob_muUsrMgr_usr4name, getCfgStr(kusr_name4)); + UIS->setVal(PAGE, ob_muUsrMgr_usr5name, getCfgStr(kusr_name5)); + + UIS->setVal(PAGE, ob_muUsrMgr_usr1en, (int)getCfgBool(kusr_enable1)); + UIS->setVal(PAGE, ob_muUsrMgr_usr2en, (int)getCfgBool(kusr_enable2)); + UIS->setVal(PAGE, ob_muUsrMgr_usr3en, (int)getCfgBool(kusr_enable3)); + UIS->setVal(PAGE, ob_muUsrMgr_usr4en, (int)getCfgBool(kusr_enable4)); + UIS->setVal(PAGE, ob_muUsrMgr_usr5en, (int)getCfgBool(kusr_enable5)); +} void Page_muUsrMgr::OnInputFieldContentChange(uint8_t bid, const char* text) { if (bid == ob_muUsrMgr_usr1ReName) { ZLOGI(TAG, "rename usr1:%s", text); - UIS->setVal(PAGE, ob_muUsrMgr_usr1name, text); - } else if (bid == ob_muUsrMgr_usr2ReName) { + CS->setcfgAndFlush(kusr_name1, text); + updatePage(); + } // + else if (bid == ob_muUsrMgr_usr2ReName) { ZLOGI(TAG, "rename usr2:%s", text); - UIS->setVal(PAGE, ob_muUsrMgr_usr2name, text); - } else if (bid == ob_muUsrMgr_usr3ReName) { + CS->setcfgAndFlush(kusr_name2, text); + updatePage(); + } // + else if (bid == ob_muUsrMgr_usr3ReName) { ZLOGI(TAG, "rename usr3:%s", text); - UIS->setVal(PAGE, ob_muUsrMgr_usr3name, text); - } else if (bid == ob_muUsrMgr_usr4ReName) { + CS->setcfgAndFlush(kusr_name3, text); + updatePage(); + } // + else if (bid == ob_muUsrMgr_usr4ReName) { ZLOGI(TAG, "rename usr4:%s", text); - UIS->setVal(PAGE, ob_muUsrMgr_usr4name, text); - } else if (bid == ob_muUsrMgr_usr5ReName) { + CS->setcfgAndFlush(kusr_name4, text); + updatePage(); + } // + else if (bid == ob_muUsrMgr_usr5ReName) { ZLOGI(TAG, "rename usr5:%s", text); - UIS->setVal(PAGE, ob_muUsrMgr_usr5name, text); + CS->setcfgAndFlush(kusr_name5, text); + updatePage(); } } + void Page_muUsrMgr::OnButton(uint8_t bid, uint8_t val) { static CfgItermCache usrpasswdcache; ZLOGI(TAG, "bid:%d", bid); @@ -53,24 +67,49 @@ void Page_muUsrMgr::OnButton(uint8_t bid, uint8_t val) { UIS->chpage(GSM->getMenuPage()); } else if (bid == ob_muUsrMgr_usr1Rest) { ZLOGI(TAG, "reset usr1 "); + CS->setcfgAndFlush(kusr_name1, USER1_DEFAULT_NAME); + CS->setcfgAndFlush(kusr_passwd1, USER_DEFAULT_PWD); + updatePage(); } else if (bid == ob_muUsrMgr_usr2Rest) { ZLOGI(TAG, "reset usr2 "); + CS->setcfgAndFlush(kusr_name2, USER2_DEFAULT_NAME); + CS->setcfgAndFlush(kusr_passwd2, USER_DEFAULT_PWD); + updatePage(); } else if (bid == ob_muUsrMgr_usr3Rest) { ZLOGI(TAG, "reset usr3 "); + CS->setcfgAndFlush(kusr_name3, USER3_DEFAULT_NAME); + CS->setcfgAndFlush(kusr_passwd3, USER_DEFAULT_PWD); + updatePage(); } else if (bid == ob_muUsrMgr_usr4Rest) { ZLOGI(TAG, "reset usr4 "); + CS->setcfgAndFlush(kusr_name4, USER4_DEFAULT_NAME); + CS->setcfgAndFlush(kusr_passwd4, USER_DEFAULT_PWD); + updatePage(); } else if (bid == ob_muUsrMgr_usr5Rest) { ZLOGI(TAG, "reset usr5 "); + CS->setcfgAndFlush(kusr_name5, USER5_DEFAULT_NAME); + CS->setcfgAndFlush(kusr_passwd5, USER_DEFAULT_PWD); + updatePage(); } else if (bid == ob_muUsrMgr_usr1en) { ZLOGI(TAG, "enable usr1 %d", val); + CS->setcfgAndFlush(kusr_enable1, (bool)val); + updatePage(); } else if (bid == ob_muUsrMgr_usr2en) { ZLOGI(TAG, "enable usr2 %d", val); + CS->setcfgAndFlush(kusr_enable2, (bool)val); + updatePage(); } else if (bid == ob_muUsrMgr_usr3en) { ZLOGI(TAG, "enable usr3 %d", val); + CS->setcfgAndFlush(kusr_enable3, (bool)val); + updatePage(); } else if (bid == ob_muUsrMgr_usr4en) { ZLOGI(TAG, "enable usr4 %d", val); + CS->setcfgAndFlush(kusr_enable4, (bool)val); + updatePage(); } else if (bid == ob_muUsrMgr_usr5en) { ZLOGI(TAG, "enable usr5 %d", val); + CS->setcfgAndFlush(kusr_enable5, (bool)val); + updatePage(); } }; diff --git a/usrc/service/page/submenu/Page_muUsrMgr.hpp b/usrc/service/page/submenu/Page_muUsrMgr.hpp index 2382063..98fde6e 100644 --- a/usrc/service/page/submenu/Page_muUsrMgr.hpp +++ b/usrc/service/page/submenu/Page_muUsrMgr.hpp @@ -21,7 +21,8 @@ class Page_muUsrMgr : public IPageProcesser { virtual void OnInputFieldContentChange(uint8_t bid, const char* text) override; virtual void OnButton(uint8_t bid, uint8_t val) override; - + private: + void updatePage(); }; } // namespace iflytop diff --git a/usrc/service/valve_state_ctrl_service.cpp b/usrc/service/valve_state_ctrl_service.cpp index 171c036..3503b54 100644 --- a/usrc/service/valve_state_ctrl_service.cpp +++ b/usrc/service/valve_state_ctrl_service.cpp @@ -22,7 +22,7 @@ void ValveStateSyncService::startSync() { msg.output0 = output0state; msg.output1 = output1state; msg.rgbw = rgbwstate; - ZCAN1::ins()->txMsgNoError(kvalve_ctrl_msg, (uint8_t*)&msg, sizeof(msg), 10); + ZCAN1::ins()->txMsg(kvalve_ctrl_msg, (uint8_t*)&msg, sizeof(msg), 10); forceupdate = false; } }