diff --git a/usrc/uicontroler/page/page_processer.hpp b/usrc/uicontroler/base/page_processer.hpp similarity index 97% rename from usrc/uicontroler/page/page_processer.hpp rename to usrc/uicontroler/base/page_processer.hpp index 8303535..f56aace 100644 --- a/usrc/uicontroler/page/page_processer.hpp +++ b/usrc/uicontroler/base/page_processer.hpp @@ -3,8 +3,9 @@ #include "apphardware/apphardware.hpp" #include "uappbase/base.hpp" #include "uicontroler/front_end_controler.hpp" -#include "utils/page_bak_router.hpp" +#include "uicontroler/pagerouter/page_bak_router.hpp" #include "config/config.hpp" + #include "ui/ui.h" namespace iflytop { using namespace std; 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/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/pagerouter/page_bak_router.cpp similarity index 100% rename from usrc/uicontroler/page/utils/page_bak_router.cpp rename to usrc/uicontroler/pagerouter/page_bak_router.cpp diff --git a/usrc/uicontroler/page/utils/page_bak_router.hpp b/usrc/uicontroler/pagerouter/page_bak_router.hpp similarity index 100% rename from usrc/uicontroler/page/utils/page_bak_router.hpp rename to usrc/uicontroler/pagerouter/page_bak_router.hpp