From eadd1adb463e1e83ecb816ed6d51ab6f49748652 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Mon, 18 Nov 2024 09:47:15 +0800 Subject: [PATCH] update --- usrc/uicontroler/base/page_processer.hpp | 67 ++++++++++++++++++++++ usrc/uicontroler/page/Page_login.hpp | 2 +- usrc/uicontroler/page/Page_main.hpp | 2 +- usrc/uicontroler/page/Page_menu.hpp | 2 +- usrc/uicontroler/page/keyboard/Page_keybAcidCh.hpp | 2 +- usrc/uicontroler/page/page_processer.hpp | 66 --------------------- .../uicontroler/page/submenu/Page_changePasswd.hpp | 2 +- usrc/uicontroler/page/submenu/Page_muAcidType.hpp | 2 +- usrc/uicontroler/page/submenu/Page_muAudit.hpp | 2 +- .../page/submenu/Page_muBleHandSett.hpp | 2 +- .../uicontroler/page/submenu/Page_muDeviceInfo.hpp | 2 +- usrc/uicontroler/page/submenu/Page_muInterval.hpp | 2 +- usrc/uicontroler/page/submenu/Page_muMotorSett.hpp | 2 +- usrc/uicontroler/page/submenu/Page_muPumpSett.hpp | 2 +- usrc/uicontroler/page/submenu/Page_muPumpTest.hpp | 2 +- usrc/uicontroler/page/submenu/Page_muSettings.hpp | 2 +- usrc/uicontroler/page/submenu/Page_muUsrMgr.hpp | 2 +- usrc/uicontroler/page/utils/page_bak_router.cpp | 29 ---------- usrc/uicontroler/page/utils/page_bak_router.hpp | 8 --- usrc/uicontroler/pagerouter/page_bak_router.cpp | 29 ++++++++++ usrc/uicontroler/pagerouter/page_bak_router.hpp | 8 +++ 21 files changed, 119 insertions(+), 118 deletions(-) create mode 100644 usrc/uicontroler/base/page_processer.hpp delete mode 100644 usrc/uicontroler/page/page_processer.hpp delete mode 100644 usrc/uicontroler/page/utils/page_bak_router.cpp delete mode 100644 usrc/uicontroler/page/utils/page_bak_router.hpp create mode 100644 usrc/uicontroler/pagerouter/page_bak_router.cpp create mode 100644 usrc/uicontroler/pagerouter/page_bak_router.hpp diff --git a/usrc/uicontroler/base/page_processer.hpp b/usrc/uicontroler/base/page_processer.hpp new file mode 100644 index 0000000..f56aace --- /dev/null +++ b/usrc/uicontroler/base/page_processer.hpp @@ -0,0 +1,67 @@ +#pragma once + +#include "apphardware/apphardware.hpp" +#include "uappbase/base.hpp" +#include "uicontroler/front_end_controler.hpp" +#include "uicontroler/pagerouter/page_bak_router.hpp" +#include "config/config.hpp" + +#include "ui/ui.h" +namespace iflytop { +using namespace std; + +class OnPageLoadContext { + public: + bool isFromPopWin = false; +}; + +class IPageProcesser { + private: + /* data */ + + public: + virtual void initialize() { + UIS->regOnUsrEventCb([this](tjc::tjc_usr_event_t* event) { + if (!isBelongThisPage(event->pid)) { + return; + } + if (event->eventId == tjc::kpt_sys_event_page_id) { + OnPageLoadContext cxt = {0}; + cxt.isFromPopWin = event->d.sys_event_page_id.isFromPopWin; + OnPageLoad(&cxt); + } else if (event->eventId == tjc::kpt_double_state_button_event) { + OnButton(event->bid, event->d.double_state_button.val); + } else if (event->eventId == tjc::kpt_button_event) { + OnButton(event->bid, event->d.button_event.val); + } else if (event->eventId == tjc::kpt_inputfield_content_change_event1 || event->eventId == tjc::kpt_inputfield_content_change_event0) { + OnInputFieldContentChange(event->bid, event->d.inputfield_content.text); + } else if (event->eventId == tjc::kpt_login_request) { + OnLoginButtonClick(event->bid, event->d.login_request.usrName, event->d.login_request.passwd); + } else if (event->eventId == tjc::kpt_unlogin_request) { + OnUnLoginButtonClick(event->bid); + } else if(event->eventId == tjc::kpt_on_keyboard_page_load){ + OnKeyboardPageLoad(); + } + }); + + AppEventBus::ins()->regOnEvent([this](AppEvent_t* event) { + if (!isBelongThisPage(UIS->getNowPage())) { + return; + } + OnAppEvent(event); + }); + } + + private: + virtual bool isBelongThisPage(int page) = 0; + + virtual void OnPageLoad(OnPageLoadContext* cxt) { return; }; + virtual void OnKeyboardPageLoad() { return; }; + virtual void OnInputFieldContentChange(uint8_t bid, const char* text) { return; }; + virtual void OnButton(uint8_t bid, uint8_t val) { return; }; + virtual void OnLoginButtonClick(uint8_t bid, const char* userName, const char* passwd) { return; }; + virtual void OnUnLoginButtonClick(uint8_t bid) { return; }; + virtual void OnAppEvent(AppEvent_t* event) { return; }; +}; + +} // namespace iflytop diff --git a/usrc/uicontroler/page/Page_login.hpp b/usrc/uicontroler/page/Page_login.hpp index abd51b5..0d7b9c3 100644 --- a/usrc/uicontroler/page/Page_login.hpp +++ b/usrc/uicontroler/page/Page_login.hpp @@ -1,5 +1,5 @@ #pragma once -#include "page_processer.hpp" +#include "uicontroler/base/page_processer.hpp" namespace iflytop { using namespace std; diff --git a/usrc/uicontroler/page/Page_main.hpp b/usrc/uicontroler/page/Page_main.hpp index a5cfaf4..f154e15 100644 --- a/usrc/uicontroler/page/Page_main.hpp +++ b/usrc/uicontroler/page/Page_main.hpp @@ -1,5 +1,5 @@ #pragma once -#include "page_processer.hpp" +#include "uicontroler/base/page_processer.hpp" namespace iflytop { using namespace std; diff --git a/usrc/uicontroler/page/Page_menu.hpp b/usrc/uicontroler/page/Page_menu.hpp index a3ff911..afe443b 100644 --- a/usrc/uicontroler/page/Page_menu.hpp +++ b/usrc/uicontroler/page/Page_menu.hpp @@ -1,5 +1,5 @@ #pragma once -#include "page_processer.hpp" +#include "uicontroler/base/page_processer.hpp" namespace iflytop { using namespace std; diff --git a/usrc/uicontroler/page/keyboard/Page_keybAcidCh.hpp b/usrc/uicontroler/page/keyboard/Page_keybAcidCh.hpp index fd77018..ec161e8 100644 --- a/usrc/uicontroler/page/keyboard/Page_keybAcidCh.hpp +++ b/usrc/uicontroler/page/keyboard/Page_keybAcidCh.hpp @@ -1,6 +1,6 @@ #pragma once // -#include "../page_processer.hpp" +#include "uicontroler/base/page_processer.hpp" namespace iflytop { using namespace std; diff --git a/usrc/uicontroler/page/page_processer.hpp b/usrc/uicontroler/page/page_processer.hpp deleted file mode 100644 index 8303535..0000000 --- a/usrc/uicontroler/page/page_processer.hpp +++ /dev/null @@ -1,66 +0,0 @@ -#pragma once - -#include "apphardware/apphardware.hpp" -#include "uappbase/base.hpp" -#include "uicontroler/front_end_controler.hpp" -#include "utils/page_bak_router.hpp" -#include "config/config.hpp" -#include "ui/ui.h" -namespace iflytop { -using namespace std; - -class OnPageLoadContext { - public: - bool isFromPopWin = false; -}; - -class IPageProcesser { - private: - /* data */ - - public: - virtual void initialize() { - UIS->regOnUsrEventCb([this](tjc::tjc_usr_event_t* event) { - if (!isBelongThisPage(event->pid)) { - return; - } - if (event->eventId == tjc::kpt_sys_event_page_id) { - OnPageLoadContext cxt = {0}; - cxt.isFromPopWin = event->d.sys_event_page_id.isFromPopWin; - OnPageLoad(&cxt); - } else if (event->eventId == tjc::kpt_double_state_button_event) { - OnButton(event->bid, event->d.double_state_button.val); - } else if (event->eventId == tjc::kpt_button_event) { - OnButton(event->bid, event->d.button_event.val); - } else if (event->eventId == tjc::kpt_inputfield_content_change_event1 || event->eventId == tjc::kpt_inputfield_content_change_event0) { - OnInputFieldContentChange(event->bid, event->d.inputfield_content.text); - } else if (event->eventId == tjc::kpt_login_request) { - OnLoginButtonClick(event->bid, event->d.login_request.usrName, event->d.login_request.passwd); - } else if (event->eventId == tjc::kpt_unlogin_request) { - OnUnLoginButtonClick(event->bid); - } else if(event->eventId == tjc::kpt_on_keyboard_page_load){ - OnKeyboardPageLoad(); - } - }); - - AppEventBus::ins()->regOnEvent([this](AppEvent_t* event) { - if (!isBelongThisPage(UIS->getNowPage())) { - return; - } - OnAppEvent(event); - }); - } - - private: - virtual bool isBelongThisPage(int page) = 0; - - virtual void OnPageLoad(OnPageLoadContext* cxt) { return; }; - virtual void OnKeyboardPageLoad() { return; }; - virtual void OnInputFieldContentChange(uint8_t bid, const char* text) { return; }; - virtual void OnButton(uint8_t bid, uint8_t val) { return; }; - virtual void OnLoginButtonClick(uint8_t bid, const char* userName, const char* passwd) { return; }; - virtual void OnUnLoginButtonClick(uint8_t bid) { return; }; - virtual void OnAppEvent(AppEvent_t* event) { return; }; -}; - -} // namespace iflytop diff --git a/usrc/uicontroler/page/submenu/Page_changePasswd.hpp b/usrc/uicontroler/page/submenu/Page_changePasswd.hpp index 119c109..ce096e3 100644 --- a/usrc/uicontroler/page/submenu/Page_changePasswd.hpp +++ b/usrc/uicontroler/page/submenu/Page_changePasswd.hpp @@ -1,6 +1,6 @@ #pragma once // -#include "../page_processer.hpp" +#include "uicontroler/base/page_processer.hpp" namespace iflytop { using namespace std; // page: keybAcidCh diff --git a/usrc/uicontroler/page/submenu/Page_muAcidType.hpp b/usrc/uicontroler/page/submenu/Page_muAcidType.hpp index f478043..1ff33b1 100644 --- a/usrc/uicontroler/page/submenu/Page_muAcidType.hpp +++ b/usrc/uicontroler/page/submenu/Page_muAcidType.hpp @@ -1,6 +1,6 @@ #pragma once // -#include "../page_processer.hpp" +#include "uicontroler/base/page_processer.hpp" namespace iflytop { using namespace std; // page: keybAcidCh diff --git a/usrc/uicontroler/page/submenu/Page_muAudit.hpp b/usrc/uicontroler/page/submenu/Page_muAudit.hpp index 9202122..6df6153 100644 --- a/usrc/uicontroler/page/submenu/Page_muAudit.hpp +++ b/usrc/uicontroler/page/submenu/Page_muAudit.hpp @@ -1,6 +1,6 @@ #pragma once // -#include "../page_processer.hpp" +#include "uicontroler/base/page_processer.hpp" namespace iflytop { using namespace std; diff --git a/usrc/uicontroler/page/submenu/Page_muBleHandSett.hpp b/usrc/uicontroler/page/submenu/Page_muBleHandSett.hpp index b8833bc..9dd86ef 100644 --- a/usrc/uicontroler/page/submenu/Page_muBleHandSett.hpp +++ b/usrc/uicontroler/page/submenu/Page_muBleHandSett.hpp @@ -1,6 +1,6 @@ #pragma once // -#include "../page_processer.hpp" +#include "uicontroler/base/page_processer.hpp" namespace iflytop { using namespace std; // page: keybAcidCh diff --git a/usrc/uicontroler/page/submenu/Page_muDeviceInfo.hpp b/usrc/uicontroler/page/submenu/Page_muDeviceInfo.hpp index 891c796..94695dc 100644 --- a/usrc/uicontroler/page/submenu/Page_muDeviceInfo.hpp +++ b/usrc/uicontroler/page/submenu/Page_muDeviceInfo.hpp @@ -1,6 +1,6 @@ #pragma once // -#include "../page_processer.hpp" +#include "uicontroler/base/page_processer.hpp" namespace iflytop { using namespace std; // page: keybAcidCh diff --git a/usrc/uicontroler/page/submenu/Page_muInterval.hpp b/usrc/uicontroler/page/submenu/Page_muInterval.hpp index 7b1e8e2..7e18b02 100644 --- a/usrc/uicontroler/page/submenu/Page_muInterval.hpp +++ b/usrc/uicontroler/page/submenu/Page_muInterval.hpp @@ -1,6 +1,6 @@ #pragma once // -#include "../page_processer.hpp" +#include "uicontroler/base/page_processer.hpp" namespace iflytop { using namespace std; // page: keybAcidCh diff --git a/usrc/uicontroler/page/submenu/Page_muMotorSett.hpp b/usrc/uicontroler/page/submenu/Page_muMotorSett.hpp index 0e7d7e7..a8dae0d 100644 --- a/usrc/uicontroler/page/submenu/Page_muMotorSett.hpp +++ b/usrc/uicontroler/page/submenu/Page_muMotorSett.hpp @@ -1,6 +1,6 @@ #pragma once // -#include "../page_processer.hpp" +#include "uicontroler/base/page_processer.hpp" namespace iflytop { using namespace std; // page: keybAcidCh diff --git a/usrc/uicontroler/page/submenu/Page_muPumpSett.hpp b/usrc/uicontroler/page/submenu/Page_muPumpSett.hpp index 365a41c..0d5e47a 100644 --- a/usrc/uicontroler/page/submenu/Page_muPumpSett.hpp +++ b/usrc/uicontroler/page/submenu/Page_muPumpSett.hpp @@ -1,6 +1,6 @@ #pragma once // -#include "../page_processer.hpp" +#include "uicontroler/base/page_processer.hpp" namespace iflytop { using namespace std; // page: keybAcidCh diff --git a/usrc/uicontroler/page/submenu/Page_muPumpTest.hpp b/usrc/uicontroler/page/submenu/Page_muPumpTest.hpp index 37707e2..14e6df5 100644 --- a/usrc/uicontroler/page/submenu/Page_muPumpTest.hpp +++ b/usrc/uicontroler/page/submenu/Page_muPumpTest.hpp @@ -1,6 +1,6 @@ #pragma once // -#include "../page_processer.hpp" +#include "uicontroler/base/page_processer.hpp" namespace iflytop { using namespace std; // page: keybAcidCh diff --git a/usrc/uicontroler/page/submenu/Page_muSettings.hpp b/usrc/uicontroler/page/submenu/Page_muSettings.hpp index 6e398e4..af004c4 100644 --- a/usrc/uicontroler/page/submenu/Page_muSettings.hpp +++ b/usrc/uicontroler/page/submenu/Page_muSettings.hpp @@ -1,6 +1,6 @@ #pragma once // -#include "../page_processer.hpp" +#include "uicontroler/base/page_processer.hpp" namespace iflytop { using namespace std; // page: keybAcidCh diff --git a/usrc/uicontroler/page/submenu/Page_muUsrMgr.hpp b/usrc/uicontroler/page/submenu/Page_muUsrMgr.hpp index ac0b62f..2cf5802 100644 --- a/usrc/uicontroler/page/submenu/Page_muUsrMgr.hpp +++ b/usrc/uicontroler/page/submenu/Page_muUsrMgr.hpp @@ -1,6 +1,6 @@ #pragma once // -#include "../page_processer.hpp" +#include "uicontroler/base/page_processer.hpp" namespace iflytop { using namespace std; // page: keybAcidCh diff --git a/usrc/uicontroler/page/utils/page_bak_router.cpp b/usrc/uicontroler/page/utils/page_bak_router.cpp deleted file mode 100644 index 9e64e87..0000000 --- a/usrc/uicontroler/page/utils/page_bak_router.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include "page_bak_router.hpp" -using namespace iflytop; - -namespace iflytop { -int getBakPage(int nowPage) { - if ( - - nowPage == pg_muInterval || // - nowPage == pg_muUsrMgr || // - nowPage == pg_muTmrMgr || // - nowPage == pg_muAcidType || // - nowPage == pg_muDeviceInfo || // - nowPage == pg_muSettings || // - nowPage == pg_muAudit // - ) { - return GSM->getMenuPage(); - } - - if (nowPage == pg_muPumpTest || // - nowPage == pg_muBleHandSett || // - nowPage == pg_muMotorSett || // - nowPage == pg_muPumpSett // - ) { - return pg_muSettings; - } - return pg_main; -} - -} // namespace iflytop diff --git a/usrc/uicontroler/page/utils/page_bak_router.hpp b/usrc/uicontroler/page/utils/page_bak_router.hpp deleted file mode 100644 index 620be9c..0000000 --- a/usrc/uicontroler/page/utils/page_bak_router.hpp +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once -#include "apphardware/apphardware.hpp" -#include "uappbase/base.hpp" -#include "uicontroler/front_end_controler.hpp" -#include "config/config.hpp" -namespace iflytop { -int getBakPage(int nowPage); -} \ No newline at end of file diff --git a/usrc/uicontroler/pagerouter/page_bak_router.cpp b/usrc/uicontroler/pagerouter/page_bak_router.cpp new file mode 100644 index 0000000..9e64e87 --- /dev/null +++ b/usrc/uicontroler/pagerouter/page_bak_router.cpp @@ -0,0 +1,29 @@ +#include "page_bak_router.hpp" +using namespace iflytop; + +namespace iflytop { +int getBakPage(int nowPage) { + if ( + + nowPage == pg_muInterval || // + nowPage == pg_muUsrMgr || // + nowPage == pg_muTmrMgr || // + nowPage == pg_muAcidType || // + nowPage == pg_muDeviceInfo || // + nowPage == pg_muSettings || // + nowPage == pg_muAudit // + ) { + return GSM->getMenuPage(); + } + + if (nowPage == pg_muPumpTest || // + nowPage == pg_muBleHandSett || // + nowPage == pg_muMotorSett || // + nowPage == pg_muPumpSett // + ) { + return pg_muSettings; + } + return pg_main; +} + +} // namespace iflytop diff --git a/usrc/uicontroler/pagerouter/page_bak_router.hpp b/usrc/uicontroler/pagerouter/page_bak_router.hpp new file mode 100644 index 0000000..620be9c --- /dev/null +++ b/usrc/uicontroler/pagerouter/page_bak_router.hpp @@ -0,0 +1,8 @@ +#pragma once +#include "apphardware/apphardware.hpp" +#include "uappbase/base.hpp" +#include "uicontroler/front_end_controler.hpp" +#include "config/config.hpp" +namespace iflytop { +int getBakPage(int nowPage); +} \ No newline at end of file