From fca573a52c189b04f0f5b1ee1cd53b7ec5578581 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sat, 31 Aug 2024 14:58:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=AB=98=E7=BA=A7=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/hand_acid_mainboard_ui.HMI | Bin 15800145 -> 15800145 bytes ui/ui.h | 27 +++++++++++++--- usrc/service/app_core.cpp | 2 +- usrc/service/front_end_controler.hpp | 10 +++--- usrc/service/page/Page_login.cpp | 14 ++++----- usrc/service/page/page.hpp | 1 + usrc/service/page/submenu/Page_muSettings.cpp | 43 ++++++++++++++++++++++++++ usrc/service/page/submenu/Page_muSettings.hpp | 27 ++++++++++++++++ 8 files changed, 106 insertions(+), 18 deletions(-) create mode 100644 usrc/service/page/submenu/Page_muSettings.cpp create mode 100644 usrc/service/page/submenu/Page_muSettings.hpp diff --git a/ui/hand_acid_mainboard_ui.HMI b/ui/hand_acid_mainboard_ui.HMI index c4a12e931f6cb22dd471bca1a289223bbdb08b41..fc0730724f1e94612af5b41c4c422f6ff17ef411 100644 GIT binary patch delta 6638 zcmeI03se->8OLW}Sr9O6;_g@oHXg2^JDMK z-1)xme&4-!{zKiKqpo#8tj-p@J86XM9y2HunfEimV*`GC9o2#0%;%}tOhTGHGqS)U>(Q+ zzXHDouYmR7H{ez98ps4$ARD|6Hh?!k4#))r-UPn|Z-I^AZSW4*1U7>$AP@WwybHF1 zZD2ci59|QH2Rp$Zz%H;G>;Zd0J}3Zx1chLqe0rKWIJM)CN@wk|?khtuIXlzJ22;N@ zy(kDZPB_O=kL_R`upSFt1;L`UyL(_~P_{a6FF{zXT;KGBdVRB`wzqUu+j%~MkgfC| z&=WhTV&`XlZS6Fhv(Ts18^Z(D_Q(NhK*t9Og0u4Qi4e7YYM9!t8=Qn`LDN+$@*m6O@nD33Z*S%5J#cQ=#d&|4;p6YX+O)@$QUDT!0#X;P=6 z9D1wK6d)d>Yd*|CwG;MBG`2&fBrc*dO=UiX-IL2GeJATjZ_eJY_bND2@@4V%@@oH} zz`)?3C+Ti*vP8a3^6RwuuS}wOnZ;q$IMX^s-kU!*M2$SLc*96~Xp$_>tlh|0FG9C0nxZDj^=B0YW^KT&F6;yEhtHyXqQGR`sX zmBS7&QKVVhjD}oYjy5JNo-5GFDCr|sz#GEK=Gz%78Y>_ybQYgp?EfN%qM<9pjnX5<^3ip( zL1WE4P5N7HjyQ|%7CIj14)Tk_oktj_=&B~s&o3oMJkpwRN?)AxXkjOQYBspDlqGD` z(zu1qlg64vak;HTq+_XCl6EEOY|}^du~&&&Odzo@6@;)(l64AQ*m>gOg`FiOr_I$( z{!7AtI{8TwConzL+%U)IMi~2v9Vlq9N$=L|)iyDxDzZYNiDk8LcAM$GHZ#uJd{X>b z8B_KEyG6Bwik8v#Qa1gYQ)1j`3#NoJ9`gIDB1gP!D{?EghuNypCflM%i@2?YrUw6# z*5ZDz?Y1fZwsk5$h}&A_a$A*KiTiP?yN@N^rkr$0J|wxtv$*iM2it<&C`+`b3l?vS z`u4Ebx1wczyW8sPS$wHnF5GH4j=Hw2>SGl1v_J>xCI6}PwDF5SIgG(1Rx zZMBxQVpV4^VOyegdcvCuIv5nM!AXahQKTUel^|QWl zeDGFCKfreXyCu8B6H9h}Lfoi?_~t=HH<-1Qc3IY8>kAraG|+3k4{GU#4^wubD5}$& z3}SD2L?7eZc-g#R(rc>UFZi;>Mq?mje3IVPZab1?Y+o-j*CE8DER*{5l36 zuXDG4CjJ-t(Ws>8)ra)sW1R${`FdJswcXfFZO8bk`tkE#f{?7(S?F(T+x6pzs6q3M z$RM>{4$assXvaY_CMge>Kr=SC14pXuys>IqKS9-xn;ded*9w`{+%FuIT%tKOK*+ee|e9U+tt% z9r|h~z3SN4|E7L*JeGFQvko1#gT8g>=Udmi4!wL&^{>OR(hpb nJ-7xw2G_wS;7{NN_%rwv+ytM2zkmjC3)}{Gq_Rdht(lS}KR;x_b>OaoFE&EWdzVxA4>o;r9Is5K=XU{oz z?x8L9_Cuh&yG)5T?LV+Arn2kxnw$OZWsTC<-ekrUcumQ%C`n$oHBw>K^Q^+6xV(w& zI(KUxhXec?s+ezA70Yh<*gDx2ZvG*rhDCTsg+$uy&Kfo>-n%_StzOYCL>bL?9$=}E z-E!VKt#5+4{T#^#hT$wdyNzYRqrc7wTt@nQ$-0;^S6{_gV`pXSp3X{k%U~PtS8SeK zEZKn${<^lf$0T!@{bBFqa>=|m`m42MvfbyHUv^6;o6j}SynlyeW3B$VZDYLex6cpR zlZy{fofGy}=%Vpz*?3g}6PUpQRv{FMW zHPv2m`oEA+t*Hqb@5hsPf1b<-@PRyq58|nOFdxE)@>}?=JdNMR)A=wyoR8om`6xb` zXYfouhL7dr_;@~n-_Gyg6Zs^5C%=nN=2<+O-_3Kln@{0W`81x(^Y}eHpHJsA_)K2F zXYtv5&g+^r%DR41s%0gRVyrM&f84cgaU5&7uI&R$N;KlleT+D!pFgG@@t*#xUeQ#M*--dHDEVf{ z`DMPI8hAj5Lbw;^LJ`~t_rpAR0Q~t2;6W&c5?BZiK`AT(4iCd4PzH?;W2m| zo`7 zu?x*^%^5nt$VpB$a{At4hA>MNnRjkl0bWQr34k0u-;wo}( z(iYN%(^92)5Sz_Y_)VLiitYLX@e-I@4Z%< zbGx2T&FyRBsA7u8LYbxY4r*B=JyhYW=|RmMvm7Pl53i<%Q$la4iVW40rHF)s`Y?qykPM^p zMm@RAolyfqxHDvB3^{j8JDtA_XINWM7#k*zJL}FU;@opZ*D6$8;@L?Vy<`z(rPU@Y zH`12jwO#4h@*)=v$ghi_U!ExHPEB@gq434Xk4%9qS6f!z#W{K>t;j~s-qIn~4y{eH zQ+5~4Mwua+K8z!T#KJE!k z6kWGSvqA->a_NX2AnM>%`s^ zBd!=?6#Xg9D0*U;k+W%3+d5=dk6|n#_+>t&bAg6qWNE6BL7jm8WCt8s;L5ZgG<}@PcN`EOipWe>6Td#DeHn8E3s{3xu_{h z;te~Gu=7-Mo+?zS*;^D(=gNyzp+w6W!Gr$oo-Minitialize(); Page_muInterval::ins()->initialize(); Page_changePasswd::ins()->initialize(); - + Page_muSettings::ins()->initialize(); // EventProcesser RemoteControlerEventProcesser::ins()->initialize(); diff --git a/usrc/service/front_end_controler.hpp b/usrc/service/front_end_controler.hpp index f384ae8..3cce376 100644 --- a/usrc/service/front_end_controler.hpp +++ b/usrc/service/front_end_controler.hpp @@ -61,14 +61,14 @@ class FrontEndControler { bool setVal(uint8_t pid, uint8_t bid, const char* txt, ...); bool setVal(uint8_t pid, uint8_t bid, int32_t val); - bool setVal(uint16_t buuid, const char* txt) { return setVal(buuid >> 8, buuid & 0xff, txt); } - bool setVal(uint16_t buuid, int32_t val) { return setVal(buuid >> 8, buuid & 0xff, val); } + // bool setVal(uint16_t buuid, const char* txt) { return setVal(buuid >> 8, buuid & 0xff, txt); } + // bool setVal(uint16_t buuid, int32_t val) { return setVal(buuid >> 8, buuid & 0xff, val); } - bool vis(uint16_t buuid, int32_t val); // 不支持跨页面隐藏 + bool vis(uint16_t bid, int32_t val); // 不支持跨页面隐藏 // vis b0,0 - bool readTxt(uint16_t buuid, char* txt, int32_t txtbuflen) { return readTxt(buuid >> 8, buuid & 0xff, txt, txtbuflen); } - bool readInt(uint16_t buuid, int32_t* val) { return readInt(buuid >> 8, buuid & 0xff, val); } + // bool readTxt(uint16_t buuid, char* txt, int32_t txtbuflen) { return readTxt(buuid >> 8, buuid & 0xff, txt, txtbuflen); } + // bool readInt(uint16_t buuid, int32_t* val) { return readInt(buuid >> 8, buuid & 0xff, val); } void alert(const char* info) { alert(info, nullptr); } void alertNoConfirm(const char* info); diff --git a/usrc/service/page/Page_login.cpp b/usrc/service/page/Page_login.cpp index 223eab1..8f84f4c 100644 --- a/usrc/service/page/Page_login.cpp +++ b/usrc/service/page/Page_login.cpp @@ -9,13 +9,13 @@ using namespace iflytop; #define TAG "Page_login" static CfgItermCache cfgcache; -#define EN_USR(i, enable) \ - if (enable) { \ - UIS->setVal(UI_UUID(login, txtUser##i), usrName[i]); \ - UIS->setVal(UI_UUID(login, uen##i), 1); \ - } else { \ - UIS->setVal(UI_UUID(login, txtUser##i), ""); \ - UIS->setVal(UI_UUID(login, uen##i), (int32_t)0); \ +#define EN_USR(i, enable) \ + if (enable) { \ + UIS->setVal(PAGE, OBJ(txtUser##i), usrName[i]); \ + UIS->setVal(PAGE, OBJ(uen##i), 1); \ + } else { \ + UIS->setVal(PAGE, OBJ(txtUser##i), ""); \ + UIS->setVal(PAGE, OBJ(uen##i), (int32_t)0); \ } bool Page_login::isBelongThisPage(int page) { return page == PAGE; } diff --git a/usrc/service/page/page.hpp b/usrc/service/page/page.hpp index a079d17..ccdbd75 100644 --- a/usrc/service/page/page.hpp +++ b/usrc/service/page/page.hpp @@ -7,3 +7,4 @@ #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 diff --git a/usrc/service/page/submenu/Page_muSettings.cpp b/usrc/service/page/submenu/Page_muSettings.cpp new file mode 100644 index 0000000..3ac6992 --- /dev/null +++ b/usrc/service/page/submenu/Page_muSettings.cpp @@ -0,0 +1,43 @@ +#include "Page_muSettings.hpp" +using namespace iflytop; + +/** + * @brief + * 酸类修改页面 + */ + +#define PAGE pg_muSettings +#define TAG "Page_muSettings" +static CfgItermCache cfgcache; + +bool Page_muSettings::isBelongThisPage(int page) { return page == PAGE; } + +void Page_muSettings::OnPageLoad() { // + UIS->setVal(PAGE, ob_muSettings_bleCliName, "testData"); + UIS->setVal(PAGE, ob_muSettings_irun0, "1"); + UIS->setVal(PAGE, ob_muSettings_irun1, "1"); + UIS->setVal(PAGE, ob_muSettings_irun2, "1"); + UIS->setVal(PAGE, ob_muSettings_irun3, "1"); + UIS->setVal(PAGE, ob_muSettings_pumpCoef0, "1"); + UIS->setVal(PAGE, ob_muSettings_pumpCoef1, "1"); + UIS->setVal(PAGE, ob_muSettings_pumpCoef2, "1"); + UIS->setVal(PAGE, ob_muSettings_pumpCoef3, "1"); + UIS->setVal(PAGE, ob_muSettings_pipeLen0, "1"); + UIS->setVal(PAGE, ob_muSettings_pipeLen1, "1"); + UIS->setVal(PAGE, ob_muSettings_pipeLen2, "1"); + UIS->setVal(PAGE, ob_muSettings_pipeLen3, "1"); + UIS->setVal(PAGE, ob_muSettings_addAcidVel, "1"); +}; + +void Page_muSettings::OnInputFieldContentChange(uint8_t bid, const char* text) { UIS->setVal(PAGE, bid, text); } +void Page_muSettings::OnButton(uint8_t bid, uint8_t val) { + static CfgItermCache usrpasswdcache; + ZLOGI(TAG, "bid:%d", bid); + if (bid == ob_muSettings_bleScan) { + ZLOGI(TAG, "bleScan"); + } else if (bid == ob_muSettings_bak) { + UIS->chpage(GSM->getMenuPage()); + } +}; + +// muAcidType \ No newline at end of file diff --git a/usrc/service/page/submenu/Page_muSettings.hpp b/usrc/service/page/submenu/Page_muSettings.hpp new file mode 100644 index 0000000..3ac5b70 --- /dev/null +++ b/usrc/service/page/submenu/Page_muSettings.hpp @@ -0,0 +1,27 @@ +#pragma once +// +#include "../page_processer.hpp" +namespace iflytop { +using namespace std; +// page: keybAcidCh +class Page_muSettings : public IPageProcesser { + private: + /* data */ + + public: + static Page_muSettings* ins() { + static Page_muSettings 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: +}; + +} // namespace iflytop