From b3fd041625430410b7961ae243f633fd4790d945 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Fri, 30 Aug 2024 20:10:27 +0800 Subject: [PATCH] update --- uappbase/service/config_service_utils.cpp | 22 + uappbase/service/config_service_utils.hpp | 1 + ui/ui.h | 16 +- usrc/service/app_core.cpp | 1 + usrc/service/page/page.hpp | 5 +- usrc/service/page/submenu/Page_changePasswd.cpp | 53 ++ usrc/service/page/submenu/Page_changePasswd.hpp | 32 + usrc/service/tjc/tjc_constant.cpp | 837 ++++++++++++------------ 8 files changed, 538 insertions(+), 429 deletions(-) create mode 100644 usrc/service/page/submenu/Page_changePasswd.cpp create mode 100644 usrc/service/page/submenu/Page_changePasswd.hpp diff --git a/uappbase/service/config_service_utils.cpp b/uappbase/service/config_service_utils.cpp index 9dba3a0..54f15f9 100644 --- a/uappbase/service/config_service_utils.cpp +++ b/uappbase/service/config_service_utils.cpp @@ -71,4 +71,26 @@ const char* getPasswd(const char* usrname, CfgItermCache* cache) { return NULL; } +const void setPasswd(const char* usrname, const char* passwd) { + static CfgItermCache cfgcache; + if (strcmp(usrname, getCfgStr(kusr_name0)) == 0) { + CS->setcfgAndFlush(kusr_passwd0, passwd); + } + if (strcmp(usrname, getCfgStr(kusr_name1)) == 0) { + CS->setcfgAndFlush(kusr_passwd1, passwd); + } + if (strcmp(usrname, getCfgStr(kusr_name2)) == 0) { + CS->setcfgAndFlush(kusr_passwd2, passwd); + } + if (strcmp(usrname, getCfgStr(kusr_name3)) == 0) { + CS->setcfgAndFlush(kusr_passwd3, passwd); + } + if (strcmp(usrname, getCfgStr(kusr_name4)) == 0) { + CS->setcfgAndFlush(kusr_passwd4, passwd); + } + if (strcmp(usrname, getCfgStr(kusr_name5)) == 0) { + CS->setcfgAndFlush(kusr_passwd5, passwd); + } +} + } // namespace iflytop \ No newline at end of file diff --git a/uappbase/service/config_service_utils.hpp b/uappbase/service/config_service_utils.hpp index 484c4f6..8dd4538 100644 --- a/uappbase/service/config_service_utils.hpp +++ b/uappbase/service/config_service_utils.hpp @@ -5,5 +5,6 @@ int32_t getMotorULToTruns(int32_t motorid); void setMotorULToTruns(int32_t motorid, int32_t val); const char* getPasswd(const char* usrname, CfgItermCache* cache); +const void setPasswd(const char* usrname, const char* passwd); } // namespace iflytop diff --git a/ui/ui.h b/ui/ui.h index cf5e6fd..3726ea5 100644 --- a/ui/ui.h +++ b/ui/ui.h @@ -228,14 +228,14 @@ #define ob_confirm_frompage 5 //changePasswd.objs #define ob_changePasswd_changePasswd 0 -#define ob_changePasswd_t2 1 -#define ob_changePasswd_t3 2 -#define ob_changePasswd_t4 3 -#define ob_changePasswd_t5 4 -#define ob_changePasswd_b0 5 -#define ob_changePasswd_b1 6 -#define ob_changePasswd_t0 7 -#define ob_changePasswd_t1 8 +#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_frompage 9 //keybdB.objs #define ob_keybdB_keybdB 0 diff --git a/usrc/service/app_core.cpp b/usrc/service/app_core.cpp index b359d32..eb7c4f0 100644 --- a/usrc/service/app_core.cpp +++ b/usrc/service/app_core.cpp @@ -76,6 +76,7 @@ void AppCore::appsetup() { Page_muAcidType::ins()->initialize(); Page_menu::ins()->initialize(); Page_muInterval::ins()->initialize(); + Page_changePasswd::ins()->initialize(); // EventProcesser diff --git a/usrc/service/page/page.hpp b/usrc/service/page/page.hpp index 3340dda..a079d17 100644 --- a/usrc/service/page/page.hpp +++ b/usrc/service/page/page.hpp @@ -2,7 +2,8 @@ #include "Page_login.hpp" #include "Page_main.hpp" +#include "Page_menu.hpp" +#include "keyboard/Page_keybAcidCh.hpp" +#include "submenu/Page_changePasswd.hpp" #include "submenu/Page_muAcidType.hpp" #include "submenu/Page_muInterval.hpp" -#include "keyboard/Page_keybAcidCh.hpp" -#include "Page_menu.hpp" \ No newline at end of file diff --git a/usrc/service/page/submenu/Page_changePasswd.cpp b/usrc/service/page/submenu/Page_changePasswd.cpp new file mode 100644 index 0000000..379cb1e --- /dev/null +++ b/usrc/service/page/submenu/Page_changePasswd.cpp @@ -0,0 +1,53 @@ +#include "Page_changePasswd.hpp" +using namespace iflytop; + +/** + * @brief + * 酸类修改页面 + */ + +#define PAGE pg_changePasswd +#define TAG "Page_changePasswd" +static CfgItermCache cfgcache; + +bool Page_changePasswd::isBelongThisPage(int page) { return page == PAGE; } + +void Page_changePasswd::OnPageLoad() { + // 设置加酸间隔时间 +}; + +void Page_changePasswd::OnInputFieldContentChange(uint8_t bid, const char* text) { + static CfgItermCache usrpasswdcache; + const char* usrpasswd = getPasswd(GSM->getLoginUsr(), &usrpasswdcache); + if (bid == ob_changePasswd_oldPwd) { // 旧密码 + strcpy(oldpasswdBuf, text); + if (strcmp(usrpasswd, text) != 0) { + UIS->alert("旧密码错误"); + return; + } + } else if (bid == ob_changePasswd_newPwd) { // 新密码 + strcpy(newpasswdBuf, text); + } else if (bid == ob_changePasswd_newPwdCfm) { // 新密码确认 + strcpy(confirmPasswdBuf, text); + } +} +void Page_changePasswd::OnButton(uint8_t bid, uint8_t val) { + static CfgItermCache usrpasswdcache; + + // + if (bid == ob_changePasswd_confirm) { + const char* usrpasswd = getPasswd(GSM->getLoginUsr(), &usrpasswdcache); + if (strcmp(usrpasswd, oldpasswdBuf) != 0) { + UIS->alert("旧密码错误"); + return; + } + if (strcmp(newpasswdBuf, confirmPasswdBuf) != 0) { + UIS->alert("两次密码不一致"); + return; + } + setPasswd(GSM->getLoginUsr(), newpasswdBuf); + UIS->alert("密码修改成功"); + } +}; + +// muAcidType \ No newline at end of file diff --git a/usrc/service/page/submenu/Page_changePasswd.hpp b/usrc/service/page/submenu/Page_changePasswd.hpp new file mode 100644 index 0000000..f143888 --- /dev/null +++ b/usrc/service/page/submenu/Page_changePasswd.hpp @@ -0,0 +1,32 @@ +#pragma once +// +#include "../page_processer.hpp" +namespace iflytop { +using namespace std; +// page: keybAcidCh +class Page_changePasswd : public IPageProcesser { + private: + /* data */ + + char oldpasswdBuf[30]; + char newpasswdBuf[30]; + char confirmPasswdBuf[30]; + + public: + static Page_changePasswd* ins() { + static Page_changePasswd instance; + return &instance; + } + + private: + virtual bool isBelongThisPage(int page) override; + + virtual void OnPageLoad() override; + virtual void OnInputFieldContentChange(uint8_t bid, const char* text) override; + virtual void OnButton(uint8_t bid, uint8_t val) override; + + private: + void updateAcidName(uint8_t bid, config_index_t cindex, const char* txt); +}; + +} // namespace iflytop diff --git a/usrc/service/tjc/tjc_constant.cpp b/usrc/service/tjc/tjc_constant.cpp index f614eab..b7e45a2 100644 --- a/usrc/service/tjc/tjc_constant.cpp +++ b/usrc/service/tjc/tjc_constant.cpp @@ -11,428 +11,427 @@ typedef struct { const char* bidstr; } marco_info_t; -#define _BINFO(_pid, _bid) \ - { pg_##_pid, ob_##_pid##_##_bid, #_pid "_" #_bid, #_pid, #_bid } +#define _BINFO(_pid, _bid) {pg_##_pid, ob_##_pid##_##_bid, #_pid "_" #_bid, #_pid, #_bid} // 命名规范为驼峰命名 -static marco_info_t infos[] = { - _BINFO(gvar, gvar), // - _BINFO(gvar, menupageid), // +// static marco_info_t infos[] = { +// _BINFO(gvar, gvar), // +// _BINFO(gvar, menupageid), // - _BINFO(pStart, pStart), // - _BINFO(pStart, j0), // - _BINFO(pStart, tm0), // - // - _BINFO(login, login), // - _BINFO(login, blogin), // - _BINFO(login, txtPasswd), // - _BINFO(login, uen0), // - _BINFO(login, uen1), // - _BINFO(login, uen2), // - _BINFO(login, uen3), // - _BINFO(login, uen4), // - _BINFO(login, uen5), // - _BINFO(login, txtUser0), // - _BINFO(login, txtUser1), // - _BINFO(login, txtUser2), // - _BINFO(login, txtUser3), // - _BINFO(login, txtUser4), // - _BINFO(login, txtUser5), // - _BINFO(login, m0), // - _BINFO(login, chooseUsr), // - _BINFO(login, cUsrName), // - // - _BINFO(main, main), // - _BINFO(main, acidch0), // - _BINFO(main, MenuButton), // - _BINFO(main, acidname0), // - _BINFO(main, acideval0), // - _BINFO(main, sysInfo), // - _BINFO(main, clock), // - _BINFO(main, acidname0id), // - _BINFO(main, acidname1id), // - _BINFO(main, acidname2id), // - _BINFO(main, acidname3id), // - _BINFO(main, RemoterS), // - _BINFO(main, AcidState), // - _BINFO(main, RunMode), // - _BINFO(main, RunModeVal), // - _BINFO(main, acidch1), // - _BINFO(main, acidname1), // - _BINFO(main, acideval1), // - _BINFO(main, acidch2), // - _BINFO(main, acidname2), // - _BINFO(main, acideval2), // - _BINFO(main, acidch3), // - _BINFO(main, acidname3), // - _BINFO(main, acideval3), // - // - _BINFO(keybAcidCh, keybAcidCh), // - _BINFO(keybAcidCh, bak), // - _BINFO(keybAcidCh, b0), // - _BINFO(keybAcidCh, b1), // - _BINFO(keybAcidCh, b2), // - _BINFO(keybAcidCh, b3), // - _BINFO(keybAcidCh, b4), // - _BINFO(keybAcidCh, b5), // - _BINFO(keybAcidCh, b6), // - _BINFO(keybAcidCh, b7), // - _BINFO(keybAcidCh, b8), // - _BINFO(keybAcidCh, b9), // - _BINFO(keybAcidCh, b10), // - _BINFO(keybAcidCh, b11), // - _BINFO(keybAcidCh, b12), // - _BINFO(keybAcidCh, b13), // - _BINFO(keybAcidCh, b14), // - _BINFO(keybAcidCh, loadpageid), // - _BINFO(keybAcidCh, loadcmpid), // - _BINFO(keybAcidCh, loadcmname), // - _BINFO(keybAcidCh, txt), // - _BINFO(keybAcidCh, fn0), // - // - _BINFO(menuAdmin, menuAdmin), // - _BINFO(menuAdmin, home), // - _BINFO(menuAdmin, muInterval), // - _BINFO(menuAdmin, changePasswd), // - _BINFO(menuAdmin, muTmrMgr), // - _BINFO(menuAdmin, muAcidType), // - _BINFO(menuAdmin, muUsrMgr), // - _BINFO(menuAdmin, muSettings), // - _BINFO(menuAdmin, muAudit), // - _BINFO(menuAdmin, muDeviceInfo), // - _BINFO(menuAdmin, unlogin), // - // - _BINFO(menuAdmin2, menuAdmin2), // - _BINFO(menuAdmin2, home), // - _BINFO(menuAdmin2, muInterval), // - _BINFO(menuAdmin2, changePasswd), // - _BINFO(menuAdmin2, muAcidType), // - _BINFO(menuAdmin2, muUsrMgr), // - _BINFO(menuAdmin2, muSettings), // - _BINFO(menuAdmin2, muDeviceInfo), // - _BINFO(menuAdmin2, unlogin), // - // - _BINFO(menuUsr, menuUsr), // - _BINFO(menuUsr, home), // - _BINFO(menuUsr, muInterval), // - _BINFO(menuUsr, changePasswd), // - _BINFO(menuUsr, muDeviceInfo), // - _BINFO(menuUsr, unlogin), // - // - _BINFO(muInterval, muInterval), // - _BINFO(muInterval, t0), // - _BINFO(muInterval, t1), // - _BINFO(muInterval, bak), // - _BINFO(muInterval, frompage), // - _BINFO(muInterval, stAcidInte), // - _BINFO(muInterval, t2), // - // - _BINFO(muUsrMgr, muUsrMgr), // - _BINFO(muUsrMgr, bak), // - _BINFO(muUsrMgr, t0), // - _BINFO(muUsrMgr, t2), // - _BINFO(muUsrMgr, t3), // - _BINFO(muUsrMgr, t4), // - _BINFO(muUsrMgr, sw1), // - _BINFO(muUsrMgr, t6), // - _BINFO(muUsrMgr, sw2), // - _BINFO(muUsrMgr, t8), // - _BINFO(muUsrMgr, sw3), // - _BINFO(muUsrMgr, t10), // - _BINFO(muUsrMgr, sw4), // - _BINFO(muUsrMgr, t12), // - _BINFO(muUsrMgr, b1), // - _BINFO(muUsrMgr, b0), // - _BINFO(muUsrMgr, b2), // - _BINFO(muUsrMgr, b3), // - _BINFO(muUsrMgr, frompage), // - // - _BINFO(muTmrMgr, muTmrMgr), // - _BINFO(muTmrMgr, select0), // - _BINFO(muTmrMgr, select1), // - _BINFO(muTmrMgr, select2), // - _BINFO(muTmrMgr, bak), // - _BINFO(muTmrMgr, select3), // - _BINFO(muTmrMgr, select4), // - _BINFO(muTmrMgr, select5), // - _BINFO(muTmrMgr, b0), // - _BINFO(muTmrMgr, frompage), // - // - _BINFO(muAcidType, muAcidType), // - _BINFO(muAcidType, bak), // - _BINFO(muAcidType, t1), // - _BINFO(muAcidType, t2), // - _BINFO(muAcidType, t3), // - _BINFO(muAcidType, t4), // - _BINFO(muAcidType, t5), // - _BINFO(muAcidType, t6), // - _BINFO(muAcidType, t7), // - _BINFO(muAcidType, t8), // - _BINFO(muAcidType, t9), // - _BINFO(muAcidType, t10), // - _BINFO(muAcidType, t11), // - _BINFO(muAcidType, t12), // - _BINFO(muAcidType, t13), // - _BINFO(muAcidType, t14), // - _BINFO(muAcidType, t15), // - _BINFO(muAcidType, frompage), // - // - _BINFO(muSettings, muSettings), // - _BINFO(muSettings, t0), // - _BINFO(muSettings, t1), // - _BINFO(muSettings, bak), // - _BINFO(muSettings, frompage), // - _BINFO(muSettings, stAcidInte), // - _BINFO(muSettings, t2), // - // - _BINFO(muDeviceInfo, muDeviceInfo), // - _BINFO(muDeviceInfo, bak), // - _BINFO(muDeviceInfo, t2), // - _BINFO(muDeviceInfo, t3), // - _BINFO(muDeviceInfo, t6), // - _BINFO(muDeviceInfo, t7), // - _BINFO(muDeviceInfo, t10), // - _BINFO(muDeviceInfo, t11), // - _BINFO(muDeviceInfo, frompage), // - // - _BINFO(muAudit, muAudit), // - _BINFO(muAudit, bak), // - _BINFO(muAudit, t0), // - _BINFO(muAudit, t1), // - _BINFO(muAudit, t2), // - _BINFO(muAudit, b0), // - _BINFO(muAudit, b1), // - _BINFO(muAudit, frompage), // - // - _BINFO(alert, alert), // - _BINFO(alert, t0), // - _BINFO(alert, confirmkey), // - _BINFO(alert, info), // - _BINFO(alert, frompage), // - // - _BINFO(confirm, confirm), // - _BINFO(confirm, t0), // - _BINFO(confirm, confirmkey), // - _BINFO(confirm, info), // - _BINFO(confirm, canclekey), // - _BINFO(confirm, frompage), // - // - _BINFO(changePasswd, changePasswd), // - _BINFO(changePasswd, t2), // - _BINFO(changePasswd, t3), // - _BINFO(changePasswd, t4), // - _BINFO(changePasswd, t5), // - _BINFO(changePasswd, b0), // - _BINFO(changePasswd, b1), // - _BINFO(changePasswd, t0), // - _BINFO(changePasswd, t1), // - _BINFO(changePasswd, frompage), // - // - _BINFO(keybdB, keybdB), // - _BINFO(keybdB, b0), // - _BINFO(keybdB, show), // - _BINFO(keybdB, b210), // - _BINFO(keybdB, b1), // - _BINFO(keybdB, b2), // - _BINFO(keybdB, b3), // - _BINFO(keybdB, b4), // - _BINFO(keybdB, b5), // - _BINFO(keybdB, b6), // - _BINFO(keybdB, b7), // - _BINFO(keybdB, b8), // - _BINFO(keybdB, b200), // - _BINFO(keybdB, b9), // - _BINFO(keybdB, loadpageid), // - _BINFO(keybdB, tm0), // - _BINFO(keybdB, loadcmpid), // - _BINFO(keybdB, input), // - _BINFO(keybdB, temp), // - _BINFO(keybdB, inputlenth), // - _BINFO(keybdB, t2), // - _BINFO(keybdB, b251), // - _BINFO(keybdB, temp2), // - _BINFO(keybdB, tempstr), // - _BINFO(keybdB, b10), // - _BINFO(keybdB, b11), // - _BINFO(keybdB, loadcmname), // - // - _BINFO(keybdAP, keybdAP), // - _BINFO(keybdAP, loadpageid), // - _BINFO(keybdAP, loadcmpid), // - _BINFO(keybdAP, b0), // - _BINFO(keybdAP, b251), // - _BINFO(keybdAP, b210), // - _BINFO(keybdAP, b1), // - _BINFO(keybdAP, b2), // - _BINFO(keybdAP, b3), // - _BINFO(keybdAP, b4), // - _BINFO(keybdAP, b5), // - _BINFO(keybdAP, b6), // - _BINFO(keybdAP, b7), // - _BINFO(keybdAP, b8), // - _BINFO(keybdAP, b200), // - _BINFO(keybdAP, b20), // - _BINFO(keybdAP, b21), // - _BINFO(keybdAP, b22), // - _BINFO(keybdAP, b23), // - _BINFO(keybdAP, b24), // - _BINFO(keybdAP, b25), // - _BINFO(keybdAP, b26), // - _BINFO(keybdAP, b27), // - _BINFO(keybdAP, b28), // - _BINFO(keybdAP, b220), // - _BINFO(keybdAP, b40), // - _BINFO(keybdAP, b41), // - _BINFO(keybdAP, b42), // - _BINFO(keybdAP, b43), // - _BINFO(keybdAP, b44), // - _BINFO(keybdAP, b45), // - _BINFO(keybdAP, b46), // - _BINFO(keybdAP, b230), // - _BINFO(keybdAP, b240), // - _BINFO(keybdAP, b242), // - _BINFO(keybdAP, b241), // - _BINFO(keybdAP, b244), // - _BINFO(keybdAP, b231), // - _BINFO(keybdAP, b245), // - _BINFO(keybdAP, refshowbu), // - _BINFO(keybdAP, tm0), // - _BINFO(keybdAP, input), // - _BINFO(keybdAP, show), // - _BINFO(keybdAP, temp), // - _BINFO(keybdAP, inputlenth), // - _BINFO(keybdAP, b249), // - _BINFO(keybdAP, b201), // - _BINFO(keybdAP, b9), // - _BINFO(keybdAP, b232), // - _BINFO(keybdAP, b243), // - _BINFO(keybdAP, pa_z), // - _BINFO(keybdAP, pa_d), // - _BINFO(keybdAP, pastr1), // - _BINFO(keybdAP, ii), // - _BINFO(keybdAP, loadpa), // - _BINFO(keybdAP, pastr0), // - _BINFO(keybdAP, bp1), // - _BINFO(keybdAP, bp2), // - _BINFO(keybdAP, bp3), // - _BINFO(keybdAP, bp4), // - _BINFO(keybdAP, bp5), // - _BINFO(keybdAP, bp6), // - _BINFO(keybdAP, bp7), // - _BINFO(keybdAP, bp8), // - _BINFO(keybdAP, bp9), // - _BINFO(keybdAP, bp10), // - _BINFO(keybdAP, bp11), // - _BINFO(keybdAP, bp12), // - _BINFO(keybdAP, bp13), // - _BINFO(keybdAP, bp14), // - _BINFO(keybdAP, bp15), // - _BINFO(keybdAP, bp16), // - _BINFO(keybdAP, bp17), // - _BINFO(keybdAP, bp18), // - _BINFO(keybdAP, b10), // - _BINFO(keybdAP, b11), // - _BINFO(keybdAP, temp2), // - _BINFO(keybdAP, tempstr), // - _BINFO(keybdAP, loadcmname), // - // - _BINFO(keybdA, keybdA), // - _BINFO(keybdA, loadpageid), // - _BINFO(keybdA, loadcmpid), // - _BINFO(keybdA, b0), // - _BINFO(keybdA, b251), // - _BINFO(keybdA, b210), // - _BINFO(keybdA, b1), // - _BINFO(keybdA, b2), // - _BINFO(keybdA, b3), // - _BINFO(keybdA, b4), // - _BINFO(keybdA, b5), // - _BINFO(keybdA, b6), // - _BINFO(keybdA, b7), // - _BINFO(keybdA, b8), // - _BINFO(keybdA, b200), // - _BINFO(keybdA, b20), // - _BINFO(keybdA, b21), // - _BINFO(keybdA, b22), // - _BINFO(keybdA, b23), // - _BINFO(keybdA, b24), // - _BINFO(keybdA, b25), // - _BINFO(keybdA, b26), // - _BINFO(keybdA, b27), // - _BINFO(keybdA, b28), // - _BINFO(keybdA, b220), // - _BINFO(keybdA, b40), // - _BINFO(keybdA, b41), // - _BINFO(keybdA, b42), // - _BINFO(keybdA, b43), // - _BINFO(keybdA, b44), // - _BINFO(keybdA, b45), // - _BINFO(keybdA, b46), // - _BINFO(keybdA, b230), // - _BINFO(keybdA, b240), // - _BINFO(keybdA, b242), // - _BINFO(keybdA, b241), // - _BINFO(keybdA, b243), // - _BINFO(keybdA, b231), // - _BINFO(keybdA, b244), // - _BINFO(keybdA, refshow), // - _BINFO(keybdA, tm0), // - _BINFO(keybdA, input), // - _BINFO(keybdA, show), // - _BINFO(keybdA, temp), // - _BINFO(keybdA, inputlenth), // - _BINFO(keybdA, b249), // - _BINFO(keybdA, b201), // - _BINFO(keybdA, b9), // - _BINFO(keybdA, b232), // - _BINFO(keybdA, tempstr), // - _BINFO(keybdA, temp2), // - _BINFO(keybdA, loadcmname), // - // - _BINFO(keyPasswd, keyPasswd), // - _BINFO(keyPasswd, b0), // - _BINFO(keyPasswd, show), // - _BINFO(keyPasswd, b210), // - _BINFO(keyPasswd, b1), // - _BINFO(keyPasswd, b2), // - _BINFO(keyPasswd, b3), // - _BINFO(keyPasswd, b4), // - _BINFO(keyPasswd, b5), // - _BINFO(keyPasswd, b6), // - _BINFO(keyPasswd, b7), // - _BINFO(keyPasswd, b8), // - _BINFO(keyPasswd, b200), // - _BINFO(keyPasswd, b9), // - _BINFO(keyPasswd, loadpageid), // - _BINFO(keyPasswd, tm0), // - _BINFO(keyPasswd, loadcmpid), // - _BINFO(keyPasswd, input), // - _BINFO(keyPasswd, temp), // - _BINFO(keyPasswd, inputlenth), // - _BINFO(keyPasswd, t2), // - _BINFO(keyPasswd, b251), // - _BINFO(keyPasswd, temp2), // - _BINFO(keyPasswd, tempstr), // - _BINFO(keyPasswd, b249), // - _BINFO(keyPasswd, loadcmname), // -}; -// +// _BINFO(pStart, pStart), // +// _BINFO(pStart, j0), // +// _BINFO(pStart, tm0), // +// // +// _BINFO(login, login), // +// _BINFO(login, blogin), // +// _BINFO(login, txtPasswd), // +// _BINFO(login, uen0), // +// _BINFO(login, uen1), // +// _BINFO(login, uen2), // +// _BINFO(login, uen3), // +// _BINFO(login, uen4), // +// _BINFO(login, uen5), // +// _BINFO(login, txtUser0), // +// _BINFO(login, txtUser1), // +// _BINFO(login, txtUser2), // +// _BINFO(login, txtUser3), // +// _BINFO(login, txtUser4), // +// _BINFO(login, txtUser5), // +// _BINFO(login, m0), // +// _BINFO(login, chooseUsr), // +// _BINFO(login, cUsrName), // +// // +// _BINFO(main, main), // +// _BINFO(main, acidch0), // +// _BINFO(main, MenuButton), // +// _BINFO(main, acidname0), // +// _BINFO(main, acideval0), // +// _BINFO(main, sysInfo), // +// _BINFO(main, clock), // +// _BINFO(main, acidname0id), // +// _BINFO(main, acidname1id), // +// _BINFO(main, acidname2id), // +// _BINFO(main, acidname3id), // +// _BINFO(main, RemoterS), // +// _BINFO(main, AcidState), // +// _BINFO(main, RunMode), // +// _BINFO(main, RunModeVal), // +// _BINFO(main, acidch1), // +// _BINFO(main, acidname1), // +// _BINFO(main, acideval1), // +// _BINFO(main, acidch2), // +// _BINFO(main, acidname2), // +// _BINFO(main, acideval2), // +// _BINFO(main, acidch3), // +// _BINFO(main, acidname3), // +// _BINFO(main, acideval3), // +// // +// _BINFO(keybAcidCh, keybAcidCh), // +// _BINFO(keybAcidCh, bak), // +// _BINFO(keybAcidCh, b0), // +// _BINFO(keybAcidCh, b1), // +// _BINFO(keybAcidCh, b2), // +// _BINFO(keybAcidCh, b3), // +// _BINFO(keybAcidCh, b4), // +// _BINFO(keybAcidCh, b5), // +// _BINFO(keybAcidCh, b6), // +// _BINFO(keybAcidCh, b7), // +// _BINFO(keybAcidCh, b8), // +// _BINFO(keybAcidCh, b9), // +// _BINFO(keybAcidCh, b10), // +// _BINFO(keybAcidCh, b11), // +// _BINFO(keybAcidCh, b12), // +// _BINFO(keybAcidCh, b13), // +// _BINFO(keybAcidCh, b14), // +// _BINFO(keybAcidCh, loadpageid), // +// _BINFO(keybAcidCh, loadcmpid), // +// _BINFO(keybAcidCh, loadcmname), // +// _BINFO(keybAcidCh, txt), // +// _BINFO(keybAcidCh, fn0), // +// // +// _BINFO(menuAdmin, menuAdmin), // +// _BINFO(menuAdmin, home), // +// _BINFO(menuAdmin, muInterval), // +// _BINFO(menuAdmin, changePasswd), // +// _BINFO(menuAdmin, muTmrMgr), // +// _BINFO(menuAdmin, muAcidType), // +// _BINFO(menuAdmin, muUsrMgr), // +// _BINFO(menuAdmin, muSettings), // +// _BINFO(menuAdmin, muAudit), // +// _BINFO(menuAdmin, muDeviceInfo), // +// _BINFO(menuAdmin, unlogin), // +// // +// _BINFO(menuAdmin2, menuAdmin2), // +// _BINFO(menuAdmin2, home), // +// _BINFO(menuAdmin2, muInterval), // +// _BINFO(menuAdmin2, changePasswd), // +// _BINFO(menuAdmin2, muAcidType), // +// _BINFO(menuAdmin2, muUsrMgr), // +// _BINFO(menuAdmin2, muSettings), // +// _BINFO(menuAdmin2, muDeviceInfo), // +// _BINFO(menuAdmin2, unlogin), // +// // +// _BINFO(menuUsr, menuUsr), // +// _BINFO(menuUsr, home), // +// _BINFO(menuUsr, muInterval), // +// _BINFO(menuUsr, changePasswd), // +// _BINFO(menuUsr, muDeviceInfo), // +// _BINFO(menuUsr, unlogin), // +// // +// _BINFO(muInterval, muInterval), // +// _BINFO(muInterval, t0), // +// _BINFO(muInterval, t1), // +// _BINFO(muInterval, bak), // +// _BINFO(muInterval, frompage), // +// _BINFO(muInterval, stAcidInte), // +// _BINFO(muInterval, t2), // +// // +// _BINFO(muUsrMgr, muUsrMgr), // +// _BINFO(muUsrMgr, bak), // +// _BINFO(muUsrMgr, t0), // +// _BINFO(muUsrMgr, t2), // +// _BINFO(muUsrMgr, t3), // +// _BINFO(muUsrMgr, t4), // +// _BINFO(muUsrMgr, sw1), // +// _BINFO(muUsrMgr, t6), // +// _BINFO(muUsrMgr, sw2), // +// _BINFO(muUsrMgr, t8), // +// _BINFO(muUsrMgr, sw3), // +// _BINFO(muUsrMgr, t10), // +// _BINFO(muUsrMgr, sw4), // +// _BINFO(muUsrMgr, t12), // +// _BINFO(muUsrMgr, b1), // +// _BINFO(muUsrMgr, b0), // +// _BINFO(muUsrMgr, b2), // +// _BINFO(muUsrMgr, b3), // +// _BINFO(muUsrMgr, frompage), // +// // +// _BINFO(muTmrMgr, muTmrMgr), // +// _BINFO(muTmrMgr, select0), // +// _BINFO(muTmrMgr, select1), // +// _BINFO(muTmrMgr, select2), // +// _BINFO(muTmrMgr, bak), // +// _BINFO(muTmrMgr, select3), // +// _BINFO(muTmrMgr, select4), // +// _BINFO(muTmrMgr, select5), // +// _BINFO(muTmrMgr, b0), // +// _BINFO(muTmrMgr, frompage), // +// // +// _BINFO(muAcidType, muAcidType), // +// _BINFO(muAcidType, bak), // +// _BINFO(muAcidType, t1), // +// _BINFO(muAcidType, t2), // +// _BINFO(muAcidType, t3), // +// _BINFO(muAcidType, t4), // +// _BINFO(muAcidType, t5), // +// _BINFO(muAcidType, t6), // +// _BINFO(muAcidType, t7), // +// _BINFO(muAcidType, t8), // +// _BINFO(muAcidType, t9), // +// _BINFO(muAcidType, t10), // +// _BINFO(muAcidType, t11), // +// _BINFO(muAcidType, t12), // +// _BINFO(muAcidType, t13), // +// _BINFO(muAcidType, t14), // +// _BINFO(muAcidType, t15), // +// _BINFO(muAcidType, frompage), // +// // +// _BINFO(muSettings, muSettings), // +// _BINFO(muSettings, t0), // +// _BINFO(muSettings, t1), // +// _BINFO(muSettings, bak), // +// _BINFO(muSettings, frompage), // +// _BINFO(muSettings, stAcidInte), // +// _BINFO(muSettings, t2), // +// // +// _BINFO(muDeviceInfo, muDeviceInfo), // +// _BINFO(muDeviceInfo, bak), // +// _BINFO(muDeviceInfo, t2), // +// _BINFO(muDeviceInfo, t3), // +// _BINFO(muDeviceInfo, t6), // +// _BINFO(muDeviceInfo, t7), // +// _BINFO(muDeviceInfo, t10), // +// _BINFO(muDeviceInfo, t11), // +// _BINFO(muDeviceInfo, frompage), // +// // +// _BINFO(muAudit, muAudit), // +// _BINFO(muAudit, bak), // +// _BINFO(muAudit, t0), // +// _BINFO(muAudit, t1), // +// _BINFO(muAudit, t2), // +// _BINFO(muAudit, b0), // +// _BINFO(muAudit, b1), // +// _BINFO(muAudit, frompage), // +// // +// _BINFO(alert, alert), // +// _BINFO(alert, t0), // +// _BINFO(alert, confirmkey), // +// _BINFO(alert, info), // +// _BINFO(alert, frompage), // +// // +// _BINFO(confirm, confirm), // +// _BINFO(confirm, t0), // +// _BINFO(confirm, confirmkey), // +// _BINFO(confirm, info), // +// _BINFO(confirm, canclekey), // +// _BINFO(confirm, frompage), // +// // +// _BINFO(changePasswd, changePasswd), // +// _BINFO(changePasswd, t2), // +// _BINFO(changePasswd, t3), // +// _BINFO(changePasswd, t4), // +// _BINFO(changePasswd, t5), // +// _BINFO(changePasswd, b0), // +// _BINFO(changePasswd, b1), // +// _BINFO(changePasswd, t0), // +// _BINFO(changePasswd, t1), // +// _BINFO(changePasswd, frompage), // +// // +// _BINFO(keybdB, keybdB), // +// _BINFO(keybdB, b0), // +// _BINFO(keybdB, show), // +// _BINFO(keybdB, b210), // +// _BINFO(keybdB, b1), // +// _BINFO(keybdB, b2), // +// _BINFO(keybdB, b3), // +// _BINFO(keybdB, b4), // +// _BINFO(keybdB, b5), // +// _BINFO(keybdB, b6), // +// _BINFO(keybdB, b7), // +// _BINFO(keybdB, b8), // +// _BINFO(keybdB, b200), // +// _BINFO(keybdB, b9), // +// _BINFO(keybdB, loadpageid), // +// _BINFO(keybdB, tm0), // +// _BINFO(keybdB, loadcmpid), // +// _BINFO(keybdB, input), // +// _BINFO(keybdB, temp), // +// _BINFO(keybdB, inputlenth), // +// _BINFO(keybdB, t2), // +// _BINFO(keybdB, b251), // +// _BINFO(keybdB, temp2), // +// _BINFO(keybdB, tempstr), // +// _BINFO(keybdB, b10), // +// _BINFO(keybdB, b11), // +// _BINFO(keybdB, loadcmname), // +// // +// _BINFO(keybdAP, keybdAP), // +// _BINFO(keybdAP, loadpageid), // +// _BINFO(keybdAP, loadcmpid), // +// _BINFO(keybdAP, b0), // +// _BINFO(keybdAP, b251), // +// _BINFO(keybdAP, b210), // +// _BINFO(keybdAP, b1), // +// _BINFO(keybdAP, b2), // +// _BINFO(keybdAP, b3), // +// _BINFO(keybdAP, b4), // +// _BINFO(keybdAP, b5), // +// _BINFO(keybdAP, b6), // +// _BINFO(keybdAP, b7), // +// _BINFO(keybdAP, b8), // +// _BINFO(keybdAP, b200), // +// _BINFO(keybdAP, b20), // +// _BINFO(keybdAP, b21), // +// _BINFO(keybdAP, b22), // +// _BINFO(keybdAP, b23), // +// _BINFO(keybdAP, b24), // +// _BINFO(keybdAP, b25), // +// _BINFO(keybdAP, b26), // +// _BINFO(keybdAP, b27), // +// _BINFO(keybdAP, b28), // +// _BINFO(keybdAP, b220), // +// _BINFO(keybdAP, b40), // +// _BINFO(keybdAP, b41), // +// _BINFO(keybdAP, b42), // +// _BINFO(keybdAP, b43), // +// _BINFO(keybdAP, b44), // +// _BINFO(keybdAP, b45), // +// _BINFO(keybdAP, b46), // +// _BINFO(keybdAP, b230), // +// _BINFO(keybdAP, b240), // +// _BINFO(keybdAP, b242), // +// _BINFO(keybdAP, b241), // +// _BINFO(keybdAP, b244), // +// _BINFO(keybdAP, b231), // +// _BINFO(keybdAP, b245), // +// _BINFO(keybdAP, refshowbu), // +// _BINFO(keybdAP, tm0), // +// _BINFO(keybdAP, input), // +// _BINFO(keybdAP, show), // +// _BINFO(keybdAP, temp), // +// _BINFO(keybdAP, inputlenth), // +// _BINFO(keybdAP, b249), // +// _BINFO(keybdAP, b201), // +// _BINFO(keybdAP, b9), // +// _BINFO(keybdAP, b232), // +// _BINFO(keybdAP, b243), // +// _BINFO(keybdAP, pa_z), // +// _BINFO(keybdAP, pa_d), // +// _BINFO(keybdAP, pastr1), // +// _BINFO(keybdAP, ii), // +// _BINFO(keybdAP, loadpa), // +// _BINFO(keybdAP, pastr0), // +// _BINFO(keybdAP, bp1), // +// _BINFO(keybdAP, bp2), // +// _BINFO(keybdAP, bp3), // +// _BINFO(keybdAP, bp4), // +// _BINFO(keybdAP, bp5), // +// _BINFO(keybdAP, bp6), // +// _BINFO(keybdAP, bp7), // +// _BINFO(keybdAP, bp8), // +// _BINFO(keybdAP, bp9), // +// _BINFO(keybdAP, bp10), // +// _BINFO(keybdAP, bp11), // +// _BINFO(keybdAP, bp12), // +// _BINFO(keybdAP, bp13), // +// _BINFO(keybdAP, bp14), // +// _BINFO(keybdAP, bp15), // +// _BINFO(keybdAP, bp16), // +// _BINFO(keybdAP, bp17), // +// _BINFO(keybdAP, bp18), // +// _BINFO(keybdAP, b10), // +// _BINFO(keybdAP, b11), // +// _BINFO(keybdAP, temp2), // +// _BINFO(keybdAP, tempstr), // +// _BINFO(keybdAP, loadcmname), // +// // +// _BINFO(keybdA, keybdA), // +// _BINFO(keybdA, loadpageid), // +// _BINFO(keybdA, loadcmpid), // +// _BINFO(keybdA, b0), // +// _BINFO(keybdA, b251), // +// _BINFO(keybdA, b210), // +// _BINFO(keybdA, b1), // +// _BINFO(keybdA, b2), // +// _BINFO(keybdA, b3), // +// _BINFO(keybdA, b4), // +// _BINFO(keybdA, b5), // +// _BINFO(keybdA, b6), // +// _BINFO(keybdA, b7), // +// _BINFO(keybdA, b8), // +// _BINFO(keybdA, b200), // +// _BINFO(keybdA, b20), // +// _BINFO(keybdA, b21), // +// _BINFO(keybdA, b22), // +// _BINFO(keybdA, b23), // +// _BINFO(keybdA, b24), // +// _BINFO(keybdA, b25), // +// _BINFO(keybdA, b26), // +// _BINFO(keybdA, b27), // +// _BINFO(keybdA, b28), // +// _BINFO(keybdA, b220), // +// _BINFO(keybdA, b40), // +// _BINFO(keybdA, b41), // +// _BINFO(keybdA, b42), // +// _BINFO(keybdA, b43), // +// _BINFO(keybdA, b44), // +// _BINFO(keybdA, b45), // +// _BINFO(keybdA, b46), // +// _BINFO(keybdA, b230), // +// _BINFO(keybdA, b240), // +// _BINFO(keybdA, b242), // +// _BINFO(keybdA, b241), // +// _BINFO(keybdA, b243), // +// _BINFO(keybdA, b231), // +// _BINFO(keybdA, b244), // +// _BINFO(keybdA, refshow), // +// _BINFO(keybdA, tm0), // +// _BINFO(keybdA, input), // +// _BINFO(keybdA, show), // +// _BINFO(keybdA, temp), // +// _BINFO(keybdA, inputlenth), // +// _BINFO(keybdA, b249), // +// _BINFO(keybdA, b201), // +// _BINFO(keybdA, b9), // +// _BINFO(keybdA, b232), // +// _BINFO(keybdA, tempstr), // +// _BINFO(keybdA, temp2), // +// _BINFO(keybdA, loadcmname), // +// // +// _BINFO(keyPasswd, keyPasswd), // +// _BINFO(keyPasswd, b0), // +// _BINFO(keyPasswd, show), // +// _BINFO(keyPasswd, b210), // +// _BINFO(keyPasswd, b1), // +// _BINFO(keyPasswd, b2), // +// _BINFO(keyPasswd, b3), // +// _BINFO(keyPasswd, b4), // +// _BINFO(keyPasswd, b5), // +// _BINFO(keyPasswd, b6), // +// _BINFO(keyPasswd, b7), // +// _BINFO(keyPasswd, b8), // +// _BINFO(keyPasswd, b200), // +// _BINFO(keyPasswd, b9), // +// _BINFO(keyPasswd, loadpageid), // +// _BINFO(keyPasswd, tm0), // +// _BINFO(keyPasswd, loadcmpid), // +// _BINFO(keyPasswd, input), // +// _BINFO(keyPasswd, temp), // +// _BINFO(keyPasswd, inputlenth), // +// _BINFO(keyPasswd, t2), // +// _BINFO(keyPasswd, b251), // +// _BINFO(keyPasswd, temp2), // +// _BINFO(keyPasswd, tempstr), // +// _BINFO(keyPasswd, b249), // +// _BINFO(keyPasswd, loadcmname), // +// }; +// // -const char* uimarco2str(uint8_t pid, uint8_t bid) { - for (int i = 0; i < sizeof(infos) / sizeof(infos[0]); i++) { - if (infos[i].pid == pid && infos[i].bid == bid) { - return infos[i].info; - } - } - return "unknownUiMarco"; -} -const char* pageName(uint8_t pid) { - for (int i = 0; i < sizeof(infos) / sizeof(infos[0]); i++) { - if (infos[i].pid == pid) { - return infos[i].pids; - } - } - return "unknownPage"; -} +// const char* uimarco2str(uint8_t pid, uint8_t bid) { +// for (int i = 0; i < sizeof(infos) / sizeof(infos[0]); i++) { +// if (infos[i].pid == pid && infos[i].bid == bid) { +// return infos[i].info; +// } +// } +// return "unknownUiMarco"; +// } +// const char* pageName(uint8_t pid) { +// for (int i = 0; i < sizeof(infos) / sizeof(infos[0]); i++) { +// if (infos[i].pid == pid) { +// return infos[i].pids; +// } +// } +// return "unknownPage"; +// } #define PT_ENUM(key) \ case key: \