From a316a5ffcd3ee0d20347dee02e24adab5f1ad983 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sat, 31 Aug 2024 16:32:22 +0800 Subject: [PATCH] update --- ui/hand_acid_mainboard_ui.HMI | Bin 15800145 -> 15800145 bytes ui/ui.h | 24 +++++++++++---- usrc/service/app_core.cpp | 1 + usrc/service/front_end_controler.cpp | 37 ++++++++++++++++++++---- usrc/service/front_end_controler.hpp | 3 +- usrc/service/page/page.hpp | 3 +- usrc/service/page/page_processer.hpp | 2 +- usrc/service/page/submenu/Page_muDeviceInfo.cpp | 6 +++- usrc/service/page/submenu/Page_muPumpTest.cpp | 18 ++++++++++++ usrc/service/page/submenu/Page_muPumpTest.hpp | 27 +++++++++++++++++ usrc/service/tjc/tjc_constant.cpp | 2 +- usrc/service/tjc/tjc_constant.hpp | 15 +++++----- 12 files changed, 116 insertions(+), 22 deletions(-) create mode 100644 usrc/service/page/submenu/Page_muPumpTest.cpp create mode 100644 usrc/service/page/submenu/Page_muPumpTest.hpp diff --git a/ui/hand_acid_mainboard_ui.HMI b/ui/hand_acid_mainboard_ui.HMI index f65f5ec5446ef17cddb7e3ae0e876e5d6e916aa2..cbca94fa83f6cd03483c9b3921bfd9c4e2222ee6 100644 GIT binary patch delta 7776 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 Gm45>9>oqn2 delta 4063 zcmeI#dsGzH9S88c3%eUdg+tjD4Z;dyQr-{cp@K*ew1R99gM{$d3gUyu>;n?hC`509 ziAo@(+^SU8G>y@qk|4}rfGmWE@d2SFk3NE!CXFVkQcaI-dOYoS*;yv~XaDHwAMQCH z_}%Bs+_`h_%;@QU)hNg=)XTi&&ZOSwL}o-p2&X5~Pcfe(i3+4`^xMip)}*a}744vhU;%ljwVU-XCcs4GU3YA!(~}PLo%W zd&`M@z(lOeQ31&NBP0Rx?tZT*j0$t=BWB``Y?=RpjQh*RP!^@Mm)&-V|K>{9`I^Tv*W?uEWe;iJH zz!L%YLE=@C6)aOROj?Sikue6Ml_qJm^E?YCQvkx^)7a;gyS=~@7x3^wXQ?HSM z9Gt)z6rkkmHLCLK4Hix8gBkH)Mo2SauSHX1!IZIJ%2+UEESNGDOc@KNj76g=xc>i8 zq0OSnHqaOvOPA5*bOnv0@pL6kpsQ#i{RvH?t7$S#p=;<``ct}&rqVRJo~BbBeT-(% z4K$N(q>s}qx`}4fCuk0RlIGGpnokR;p8kw(riHYKZlT3=E8Rx7(;c*gmeMj>ewI_r z_w8R3|EO(=jKS09ua|?D4d1JtU znpO318m4`dt7ap;1|=I#=iFGWhf%}+oh~G@GtZk^*`&Xrnw6&sU$8KlIhnO;`aGC+ zVTGevilAWyFPfCBwt3La)+~svED7?xYOQ(A4w7R$eA{x zB8OGCipS(}OmCTV6;nsjEjFt8xOBnOX)2k1n^*HIHz3I-!h4eW;4C57USe6=qvn%x zgn9O)=8Q?rr{s%Ce(7c*#9nYCp-;oFFLrd;dJgq;J5Y~VXLIf~BO5t>WTT<$GsTv# zU9L5-;dVoD_}|5wz7`9xRg7n72I7*4I^`SzF*iOuc^&4^0iqebE)#}Q;QDa*u{au`l^43 z=alS1h*6A%IZ_;e>v7~asik-huE&vI?Ip#xuunSj3;m?{qo$Huoj<^D^jPLT85EmEK7=z4E!5f1r=gj8uo^&UJ^^CM@ z7#D>#rnOJFSW|Ye5}tymVJAETKZj>w7wm>AsD|fY59|dB&%+B)1N-1bcnS8y0XPV? z@G{gvJ-h-9@GATQ8iBzt;Sd~#BhUoDf}_w37B~j4!LQ+U_zk=P$Kg#l0Vm-tXn|93 z8qPo~ybbR_8=U3K4z|A7CV|^@L;XJ zMin38X3X`g(WQ3qx>P=Um-3z77M-AHsxO7zRo{w_jyD$B-Qr0$Vfs7r_hFHBtF0kS+lx1xP%Y=q#ygCMZChjf zY{s4AJovWngytD6EY%pxTB18V_{ql%+no43dFNR<)Abu-c#EPlLTL{RW=)6MA9W6T zHcpsgcymza?T2ghfdX{GId~Vkpc{JNJ+MMA^uhbk4+Ag=LvS8GfD3RDF2Q9Oh7tG> zM&Y;cI~aqH;A8j%K84@IAK;JhC-@A;;R;N^RrnnK3}3*P@E7initialize(); Page_muUsrMgr::ins()->initialize(); Page_muDeviceInfo::ins()->initialize(); + Page_muPumpTest::ins()->initialize(); // EventProcesser RemoteControlerEventProcesser::ins()->initialize(); diff --git a/usrc/service/front_end_controler.cpp b/usrc/service/front_end_controler.cpp index bb61e47..2976835 100644 --- a/usrc/service/front_end_controler.cpp +++ b/usrc/service/front_end_controler.cpp @@ -8,7 +8,7 @@ #include "tjc/tjc_constant.hpp" using namespace iflytop; #define TAG "UIScheduler" -#define MODULE_DEBUG 0 +#define MODULE_DEBUG 1 #define CMD_OVERTIME 50 @@ -77,8 +77,10 @@ void FrontEndControler::startSchedule() { if (suc) { memset(&event_cache, 0, sizeof(event_cache)); uint8_t packetType = packet.data[0]; - if (packetType == tjc::kpt_inputfield_content_change_event) { - processUsrKeyboardConfirmEvent(packet.data, packet.datalen); + if (packetType == tjc::kpt_inputfield_content_change_event1) { + processInputfieldContentChangeEvent1(packet.data, packet.datalen); + } else if (packetType == tjc::kpt_inputfield_content_change_event0) { + processInputfieldContentChangeEvent0(packet.data, packet.datalen); } else if (packetType == tjc::kpt_double_state_button_event) { processUsrDoubleStateButtonEvent(packet.data, packet.datalen); } else if (packetType == tjc::kpt_unlogin_request) { @@ -256,7 +258,32 @@ void FrontEndControler::callUsrEventCb(tjc::tjc_usr_event_t* event) { } } -void FrontEndControler::processUsrKeyboardConfirmEvent(uint8_t* data, size_t len) { +void FrontEndControler::processInputfieldContentChangeEvent0(uint8_t* data, size_t len) { + /** + * @brief + * + * printh AB + * prints loadpageid.val,1 + * prints loadcmpid.val,1 + * prints p[loadpageid.val].b[loadcmpid.val].txt,0 + * printh 00 + * printh FF FF FF + * page loadpageid.val + * + */ + ZLOGI(TAG, "processInputfieldContentChangeEvent0"); + memset(&event_cache, 0, sizeof(event_cache)); + event_cache.eventId = data[0]; + event_cache.pid = data[1]; + event_cache.bid = data[2]; + const char* strbegin = (const char*)&data[3]; + strbegin = zcpystr(event_cache.d.inputfield_content.text, strbegin, sizeof(event_cache.d.inputfield_content.text)); + callUsrEventCb(&event_cache); + // input_file_event_cache = event_cache; + // input_file_event_cache_state = true; +} + +void FrontEndControler::processInputfieldContentChangeEvent1(uint8_t* data, size_t len) { /** * @brief * @@ -269,7 +296,7 @@ void FrontEndControler::processUsrKeyboardConfirmEvent(uint8_t* data, size_t len * page loadpageid.val * */ - // ZLOGI(TAG, "processUsrKeyboardConfirmEvent"); + // ZLOGI(TAG, "processInputfieldContentChangeEvent1"); memset(&event_cache, 0, sizeof(event_cache)); event_cache.eventId = data[0]; event_cache.pid = data[1]; diff --git a/usrc/service/front_end_controler.hpp b/usrc/service/front_end_controler.hpp index 3cce376..c7d1fe2 100644 --- a/usrc/service/front_end_controler.hpp +++ b/usrc/service/front_end_controler.hpp @@ -91,7 +91,8 @@ class FrontEndControler { private: void processScreenRxPacket(uint8_t* data, size_t len); void processUsrButtonEvent(uint8_t* data, size_t len); - void processUsrKeyboardConfirmEvent(uint8_t* data, size_t len); + void processInputfieldContentChangeEvent1(uint8_t* data, size_t len); + void processInputfieldContentChangeEvent0(uint8_t* data, size_t len); void processUsrDoubleStateButtonEvent(uint8_t* data, size_t len); void processLoginRequestEvent(uint8_t* data, size_t len); diff --git a/usrc/service/page/page.hpp b/usrc/service/page/page.hpp index d5cdd65..8cc4678 100644 --- a/usrc/service/page/page.hpp +++ b/usrc/service/page/page.hpp @@ -9,4 +9,5 @@ #include "submenu/Page_muInterval.hpp" #include "submenu/Page_muSettings.hpp" #include "submenu/Page_muUsrMgr.hpp" -#include "submenu/Page_muDeviceInfo.hpp" \ No newline at end of file +#include "submenu/Page_muDeviceInfo.hpp" +#include "submenu/Page_muPumpTest.hpp" \ No newline at end of file diff --git a/usrc/service/page/page_processer.hpp b/usrc/service/page/page_processer.hpp index 4dc69c5..d2f461b 100644 --- a/usrc/service/page/page_processer.hpp +++ b/usrc/service/page/page_processer.hpp @@ -23,7 +23,7 @@ class IPageProcesser { 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_event) { + } 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); diff --git a/usrc/service/page/submenu/Page_muDeviceInfo.cpp b/usrc/service/page/submenu/Page_muDeviceInfo.cpp index 6fda356..8cf2398 100644 --- a/usrc/service/page/submenu/Page_muDeviceInfo.cpp +++ b/usrc/service/page/submenu/Page_muDeviceInfo.cpp @@ -12,4 +12,8 @@ void Page_muDeviceInfo::OnPageLoad() { UIS->setVal(PAGE, ob_muDeviceInfo_softVers, APP_VERSION); } void Page_muDeviceInfo::OnInputFieldContentChange(uint8_t bid, const char* text) {} -void Page_muDeviceInfo::OnButton(uint8_t bid, uint8_t val) {} \ No newline at end of file +void Page_muDeviceInfo::OnButton(uint8_t bid, uint8_t val) { + if (bid == ob_muDeviceInfo_bak) { + UIS->chpage(GSM->getMenuPage()); + } +} \ No newline at end of file diff --git a/usrc/service/page/submenu/Page_muPumpTest.cpp b/usrc/service/page/submenu/Page_muPumpTest.cpp new file mode 100644 index 0000000..c13f787 --- /dev/null +++ b/usrc/service/page/submenu/Page_muPumpTest.cpp @@ -0,0 +1,18 @@ +#include "Page_muPumpTest.hpp" + +using namespace iflytop; + +#define PAGE pg_muPumpTest +#define TAG "Page_muPumpTest" +bool Page_muPumpTest::isBelongThisPage(int page) { return page == PAGE; } + +void Page_muPumpTest::OnPageLoad() {} +void Page_muPumpTest::OnInputFieldContentChange(uint8_t bid, const char* text) { // + ZLOGI(TAG, "bid:%d %s", bid, text); +} +void Page_muPumpTest::OnButton(uint8_t bid, uint8_t val) { + ZLOGI(TAG, "bid:%d", bid); + if (bid == ob_muPumpTest_bak) { + UIS->chpage(pg_muSettings); + } +} \ No newline at end of file diff --git a/usrc/service/page/submenu/Page_muPumpTest.hpp b/usrc/service/page/submenu/Page_muPumpTest.hpp new file mode 100644 index 0000000..377a616 --- /dev/null +++ b/usrc/service/page/submenu/Page_muPumpTest.hpp @@ -0,0 +1,27 @@ +#pragma once +// +#include "../page_processer.hpp" +namespace iflytop { +using namespace std; +// page: keybAcidCh +class Page_muPumpTest : public IPageProcesser { + private: + /* data */ + + public: + static Page_muPumpTest* ins() { + static Page_muPumpTest 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 diff --git a/usrc/service/tjc/tjc_constant.cpp b/usrc/service/tjc/tjc_constant.cpp index b7e45a2..8be4f63 100644 --- a/usrc/service/tjc/tjc_constant.cpp +++ b/usrc/service/tjc/tjc_constant.cpp @@ -471,7 +471,7 @@ const char* pt2str(uint8_t type) { PT_ENUM(kpt_sys_event_passthrough_finish) PT_ENUM(kpt_sys_event_passthrough_ready) PT_ENUM(kpt_ack) - PT_ENUM(kpt_inputfield_content_change_event) + PT_ENUM(kpt_inputfield_content_change_event1) PT_ENUM(kpt_double_state_button_event) PT_ENUM(kpt_login_request) PT_ENUM(kpt_unlogin_request) diff --git a/usrc/service/tjc/tjc_constant.hpp b/usrc/service/tjc/tjc_constant.hpp index d0b7c31..5a7d366 100644 --- a/usrc/service/tjc/tjc_constant.hpp +++ b/usrc/service/tjc/tjc_constant.hpp @@ -63,13 +63,14 @@ typedef enum { /** * @brief 用户消息回执 */ - kpt_ack = 0xAA, - kpt_inputfield_content_change_event = 0xAC, - kpt_double_state_button_event = 0xAD, - kpt_login_request = 0xAE, - kpt_unlogin_request = 0xAF, - kpt_on_keyboard_page_load = 0xB0, // 键盘页面加载 - kpt_on_promopt_page_load = 0xB1, // 弹窗页面加载 + kpt_ack = 0xAA, + kpt_inputfield_content_change_event0 = 0xAB, // 同页面输入框内容变更事件 + kpt_inputfield_content_change_event1 = 0xAC, // 跨页面键盘输入事件 + kpt_double_state_button_event = 0xAD, + kpt_login_request = 0xAE, + kpt_unlogin_request = 0xAF, + kpt_on_keyboard_page_load = 0xB0, // 键盘页面加载 + kpt_on_promopt_page_load = 0xB1, // 弹窗页面加载 } packet_type_t; typedef enum {