From bbc2519e87d0798cfefc58b49491c2595a961f4c Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sat, 31 Aug 2024 15:25:31 +0800 Subject: [PATCH] update --- ui/ui.h | 74 ++++++++++----------------- usrc/service/app_core.cpp | 1 + usrc/service/page/page.hpp | 3 +- usrc/service/page/submenu/Page_muUsrMgr.cpp | 77 +++++++++++++++++++++++++++++ 4 files changed, 106 insertions(+), 49 deletions(-) diff --git a/ui/ui.h b/ui/ui.h index d9a9c54..227c1e3 100644 --- a/ui/ui.h +++ b/ui/ui.h @@ -14,7 +14,7 @@ #define pg_muSettings 12 #define pg_muDeviceInfo 13 #define pg_muAudit 14 -#define pg_testPage 15 +#define pg_muTestPage 15 #define pg_alert 16 #define pg_confirm 17 #define pg_keybAcidCh 18 @@ -116,29 +116,27 @@ #define ob_muUsrMgr_bak 1 #define ob_muUsrMgr_usr0name 2 #define ob_muUsrMgr_unameCol 3 -#define ob_muUsrMgr_RestPwdCol 4 -#define ob_muUsrMgr_usr1name 5 -#define ob_muUsrMgr_usr1en 6 -#define ob_muUsrMgr_usr2name 7 -#define ob_muUsrMgr_usr2en 8 -#define ob_muUsrMgr_usr3name 9 -#define ob_muUsrMgr_usr3en 10 -#define ob_muUsrMgr_usr4name 11 -#define ob_muUsrMgr_usr4en 12 -#define ob_muUsrMgr_usrEnCol 13 -#define ob_muUsrMgr_usr1RestPwd 14 -#define ob_muUsrMgr_usr2RestPwd 15 -#define ob_muUsrMgr_usr3RestPwd 16 -#define ob_muUsrMgr_usr4RestPwd 17 -#define ob_muUsrMgr_usr5name 18 -#define ob_muUsrMgr_usr5en 19 -#define ob_muUsrMgr_usr5RestPwd 20 -#define ob_muUsrMgr_ReNameCol 21 -#define ob_muUsrMgr_usr1ReName 22 -#define ob_muUsrMgr_usr2ReName 23 -#define ob_muUsrMgr_usr3ReName 24 -#define ob_muUsrMgr_usr4ReName 25 -#define ob_muUsrMgr_usr5ReName 26 +#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 //muTmrMgr.objs #define ob_muTmrMgr_muTmrMgr 0 #define ob_muTmrMgr_select0 1 @@ -219,30 +217,10 @@ #define ob_muAudit_t2 4 #define ob_muAudit_b0 5 #define ob_muAudit_b1 6 -//testPage.objs -#define ob_testPage_testPage 0 -#define ob_testPage_t0 1 -#define ob_testPage_t1 2 -#define ob_testPage_t2 3 -#define ob_testPage_t3 4 -#define ob_testPage_b0 5 -#define ob_testPage_b1 6 -#define ob_testPage_b2 7 -#define ob_testPage_b3 8 -#define ob_testPage_b4 9 -#define ob_testPage_b5 10 -#define ob_testPage_b6 11 -#define ob_testPage_b7 12 -#define ob_testPage_b8 13 -#define ob_testPage_PrePage 14 -#define ob_testPage_NextPage 15 -#define ob_testPage_page 16 -#define ob_testPage_t4 17 -#define ob_testPage_t5 18 -#define ob_testPage_t6 19 -#define ob_testPage_t7 20 -#define ob_testPage_frompage 21 -#define ob_testPage_fromPopUpWin 22 +//muTestPage.objs +#define ob_muTestPage_muTestPage 0 +#define ob_muTestPage_frompage 1 +#define ob_muTestPage_fromPopUpWin 2 //alert.objs #define ob_alert_alert 0 #define ob_alert_t0 1 diff --git a/usrc/service/app_core.cpp b/usrc/service/app_core.cpp index 3af2dcb..73ee141 100644 --- a/usrc/service/app_core.cpp +++ b/usrc/service/app_core.cpp @@ -88,6 +88,7 @@ void AppCore::appsetup() { Page_muInterval::ins()->initialize(); Page_changePasswd::ins()->initialize(); Page_muSettings::ins()->initialize(); + Page_muUsrMgr::ins()->initialize(); // EventProcesser RemoteControlerEventProcesser::ins()->initialize(); diff --git a/usrc/service/page/page.hpp b/usrc/service/page/page.hpp index ccdbd75..12955ba 100644 --- a/usrc/service/page/page.hpp +++ b/usrc/service/page/page.hpp @@ -7,4 +7,5 @@ #include "submenu/Page_changePasswd.hpp" #include "submenu/Page_muAcidType.hpp" #include "submenu/Page_muInterval.hpp" -#include "submenu/Page_muSettings.hpp" \ No newline at end of file +#include "submenu/Page_muSettings.hpp" +#include "submenu/Page_muUsrMgr.hpp" \ No newline at end of file diff --git a/usrc/service/page/submenu/Page_muUsrMgr.cpp b/usrc/service/page/submenu/Page_muUsrMgr.cpp index e69de29..3f4ee51 100644 --- a/usrc/service/page/submenu/Page_muUsrMgr.cpp +++ b/usrc/service/page/submenu/Page_muUsrMgr.cpp @@ -0,0 +1,77 @@ +#include "Page_muUsrMgr.hpp" +using namespace iflytop; + +/** + * @brief + * ËáÀàÐÞ¸ÄÒ³Ãæ + */ + +#define PAGE pg_muUsrMgr +#define TAG "Page_muUsrMgr" +static CfgItermCache cfgcache; + +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); +}; + +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) { + ZLOGI(TAG, "rename usr2:%s", text); + UIS->setVal(PAGE, ob_muUsrMgr_usr2name, text); + } 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) { + ZLOGI(TAG, "rename usr4:%s", text); + UIS->setVal(PAGE, ob_muUsrMgr_usr4name, text); + } else if (bid == ob_muUsrMgr_usr5ReName) { + ZLOGI(TAG, "rename usr5:%s", text); + UIS->setVal(PAGE, ob_muUsrMgr_usr5name, text); + } +} +void Page_muUsrMgr::OnButton(uint8_t bid, uint8_t val) { + static CfgItermCache usrpasswdcache; + ZLOGI(TAG, "bid:%d", bid); + + if (bid == ob_muUsrMgr_bak) { + UIS->chpage(GSM->getMenuPage()); + } else if (bid == ob_muUsrMgr_usr1Rest) { + ZLOGI(TAG, "reset usr1 "); + } else if (bid == ob_muUsrMgr_usr2Rest) { + ZLOGI(TAG, "reset usr2 "); + } else if (bid == ob_muUsrMgr_usr3Rest) { + ZLOGI(TAG, "reset usr3 "); + } else if (bid == ob_muUsrMgr_usr4Rest) { + ZLOGI(TAG, "reset usr4 "); + } else if (bid == ob_muUsrMgr_usr5Rest) { + ZLOGI(TAG, "reset usr5 "); + } else if (bid == ob_muUsrMgr_usr1en) { + ZLOGI(TAG, "enable usr1 %d", val); + } else if (bid == ob_muUsrMgr_usr2en) { + ZLOGI(TAG, "enable usr2 %d", val); + } else if (bid == ob_muUsrMgr_usr3en) { + ZLOGI(TAG, "enable usr3 %d", val); + } else if (bid == ob_muUsrMgr_usr4en) { + ZLOGI(TAG, "enable usr4 %d", val); + } else if (bid == ob_muUsrMgr_usr5en) { + ZLOGI(TAG, "enable usr5 %d", val); + } +}; + +// muAcidType \ No newline at end of file