Browse Source

recode some code

v2
zhaohe 9 months ago
parent
commit
db242a6d56
  1. 44
      .cproject
  2. 9
      README.md
  3. 33
      usrc/uicontroler/base/page_processer.hpp
  4. 158
      usrc/uicontroler/front_end_controler.cpp
  5. 7
      usrc/uicontroler/front_end_controler.hpp
  6. 32
      usrc/uicontroler/page/page.hpp
  7. 433
      usrc/uicontroler/tjc/tjc_constant.cpp
  8. 26
      usrc/uicontroler/tjc/tjc_constant.hpp

44
.cproject

@ -134,20 +134,50 @@
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.319958895" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/> <tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.319958895" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
</toolChain> </toolChain>
</folderInfo> </folderInfo>
<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1853947771.298615820" name="/" resourcePath="usrc/uicontroler/page">
<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.748738869" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug" unusedChildren="">
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.801178797.1878168479" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.801178797"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.777915677.100911749" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.777915677"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1126839807.1634604961" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1126839807"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.fpu.2045742466.2108688761" name="Floating-point unit" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.fpu.2045742466"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi.2108401733.1671161194" name="Floating-point ABI" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi.2108401733"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1574925555.1359895340" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1574925555"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.244221814.958584156" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.244221814"/>
<option id="com.st.stm32cube.ide.mcu.debug.option.cpuclock.764397174.238921067" name="Cpu clock frequence" superClass="com.st.stm32cube.ide.mcu.debug.option.cpuclock.764397174"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.convertbinary.992660821.1064677769" name="Convert to binary file (-O binary)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.convertbinary.992660821"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex.494792904.392724870" name="Convert to Intel Hex file (-O ihex)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex.494792904"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.nanoscanffloat.176411214.174996963" name="Use float with scanf from newlib-nano (-u _scanf_float)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.nanoscanffloat.176411214"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.nanoprintffloat.164943344.1857484763" name="Use float with printf from newlib-nano (-u _printf_float)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.nanoprintffloat.164943344"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.386899990.1133412282" name="Toolchain" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.386899990"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.146570589" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1243726437"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.2091816621" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.782799112"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.2020508924" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.344817877"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1566001743" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.163881313"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.509718150" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.13625971"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.378224371" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.251758949"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1539439377" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1663377731"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1192216680" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1054983767"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1174134540" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.959331179"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1395910956" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.673967072"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1931795683" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.468761296"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1167022236" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1968696221"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.594266312" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.319958895"/>
</toolChain>
</folderInfo>
<fileInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1853947771.1288276238" name="zcanreceiver.hpp" rcbsApplicability="disable" resourcePath="stm32components/zcanreceiver/zcanreceiver.hpp" toolsToInvoke=""/> <fileInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1853947771.1288276238" name="zcanreceiver.hpp" rcbsApplicability="disable" resourcePath="stm32components/zcanreceiver/zcanreceiver.hpp" toolsToInvoke=""/>
<sourceEntries> <sourceEntries>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="ucomponents"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="stm32halport"/>
<entry excluding="zcanreceiver/zcanreceiver.hpp|zcanreceiver/zcanreceiver.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="stm32components"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="stm32basic"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="USB_HOST"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Core"/> <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Core"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Drivers"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="FATFS"/> <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="FATFS"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Middlewares"/> <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Middlewares"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="USB_HOST"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="app_protocols"/> <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="app_protocols"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="stm32basic"/>
<entry excluding="zcanreceiver/zcanreceiver.hpp|zcanreceiver/zcanreceiver.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="stm32components"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="stm32halport"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="uappbase"/> <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="uappbase"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="usrc"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Drivers"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="ucomponents"/>
<entry excluding="uicontroler/page" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="usrc"/>
</sourceEntries> </sourceEntries>
</configuration> </configuration>
</storageModule> </storageModule>

9
README.md

@ -44,6 +44,15 @@ UI
``` ```
``` ```
1. 将confirm功能提取出来,单独有一个confirm页面进行处理
2. 添加返回按键事件
3. 添加page_init事件,去掉page_load事件
```
```
量产时注意事项: 量产时注意事项:
1. 量产时,需要注意注意掉显示密码的相关日志 1. 量产时,需要注意注意掉显示密码的相关日志
``` ```

33
usrc/uicontroler/base/page_processer.hpp

@ -1,66 +1,53 @@
#pragma once #pragma once
#include "apphardware/apphardware.hpp" #include "apphardware/apphardware.hpp"
#include "config/config.hpp"
#include "uappbase/base.hpp" #include "uappbase/base.hpp"
#include "ui/ui.h"
#include "uicontroler/front_end_controler.hpp" #include "uicontroler/front_end_controler.hpp"
#include "uicontroler/pagerouter/page_bak_router.hpp" #include "uicontroler/pagerouter/page_bak_router.hpp"
#include "config/config.hpp"
#include "ui/ui.h"
namespace iflytop { namespace iflytop {
using namespace std; using namespace std;
class OnPageLoadContext { class OnPageLoadContext {
public: public:
bool isFromPopWin = false;
bool placeHolder = false;
}; };
class IPageProcesser { class IPageProcesser {
private: private:
/* data */ /* data */
uint32_t pageId = 0;
public: public:
IPageProcesser(uint32_t pageId) { this->pageId = pageId; }
virtual void initialize() { virtual void initialize() {
UIS->regOnUsrEventCb([this](tjc::tjc_usr_event_t* event) { UIS->regOnUsrEventCb([this](tjc::tjc_usr_event_t* event) {
if (!isBelongThisPage(event->pid)) {
if (pageId == event->pid) {
return; return;
} }
if (event->eventId == tjc::kpt_sys_event_page_id) { if (event->eventId == tjc::kpt_sys_event_page_id) {
OnPageLoadContext cxt = {0}; OnPageLoadContext cxt = {0};
cxt.isFromPopWin = event->d.sys_event_page_id.isFromPopWin;
OnPageLoad(&cxt); OnPageLoad(&cxt);
} else if (event->eventId == tjc::kpt_double_state_button_event) { } else if (event->eventId == tjc::kpt_double_state_button_event) {
OnButton(event->bid, event->d.double_state_button.val);
OnDoubleStateButton(event->bid, event->d.double_state_button.val);
} else if (event->eventId == tjc::kpt_button_event) { } else if (event->eventId == tjc::kpt_button_event) {
OnButton(event->bid, event->d.button_event.val); 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) { } 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); 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);
});
AppEventBus::ins()->regOnEvent([this](AppEvent_t* event) { OnAppEvent(event); });
} }
private: private:
virtual bool isBelongThisPage(int page) = 0;
virtual void OnPageLoad(OnPageLoadContext* cxt) { return; }; virtual void OnPageLoad(OnPageLoadContext* cxt) { return; };
virtual void OnKeyboardPageLoad() { return; };
virtual void OnInputFieldContentChange(uint8_t bid, const char* text) { return; }; virtual void OnInputFieldContentChange(uint8_t bid, const char* text) { return; };
virtual void OnButton(uint8_t bid, uint8_t val) { 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 OnDoubleStateButton(uint8_t bid, uint8_t val) { return; };
virtual void OnAppEvent(AppEvent_t* event) { return; }; virtual void OnAppEvent(AppEvent_t* event) { return; };
}; };

158
usrc/uicontroler/front_end_controler.cpp

@ -75,21 +75,13 @@ void FrontEndControler::startSchedule() {
static tjc_rx_packet_t packet; static tjc_rx_packet_t packet;
bool suc = eventQueue.receive(&packet, 10); bool suc = eventQueue.receive(&packet, 10);
if (suc) { if (suc) {
memset(&event_cache, 0, sizeof(event_cache));
uint8_t packetType = packet.data[0]; uint8_t packetType = packet.data[0];
memset(&event_cache, 0, sizeof(event_cache));
if (packetType == tjc::kpt_inputfield_content_change_event1) { if (packetType == tjc::kpt_inputfield_content_change_event1) {
processInputfieldContentChangeEvent1(packet.data, packet.datalen); 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) { } else if (packetType == tjc::kpt_double_state_button_event) {
processUsrDoubleStateButtonEvent(packet.data, packet.datalen); processUsrDoubleStateButtonEvent(packet.data, packet.datalen);
} else if (packetType == tjc::kpt_unlogin_request) {
event_cache.eventId = packet.data[0];
event_cache.pid = packet.data[1];
event_cache.bid = packet.data[2];
callUsrEventCb(&event_cache);
} else if (packetType == tjc::kpt_login_request) {
processLoginRequestEvent(packet.data, packet.datalen);
} else if (tjc::kpt_button_event == packetType) { } else if (tjc::kpt_button_event == packetType) {
event_cache.eventId = packet.data[0]; event_cache.eventId = packet.data[0];
event_cache.pid = packet.data[1]; event_cache.pid = packet.data[1];
@ -107,31 +99,12 @@ void FrontEndControler::startSchedule() {
m_lastPage = m_nowPage; m_lastPage = m_nowPage;
m_nowPage = packet.data[1]; m_nowPage = packet.data[1];
} }
event_cache.d.sys_event_page_id.isFromPopWin = m_isInPopWin;
#if MODULE_DEBUG #if MODULE_DEBUG
ZLOGD(TAG, "page change from %d to %d frompoppage %d", m_lastPage, m_nowPage, m_isInPopWin);
ZLOGD(TAG, "page change from %d to %d ", m_lastPage, m_nowPage);
#endif #endif
m_isInPopWin = false;
callUsrEventCb(&event_cache); callUsrEventCb(&event_cache);
if (input_file_event_cache_state) {
callUsrEventCb(&input_file_event_cache);
input_file_event_cache_state = false;
}
} else if (tjc::kpt_on_promopt_page_load == packetType) {
event_cache.eventId = packetType;
event_cache.pid = packet.data[1];
event_cache.bid = 0;
callUsrEventCb(&event_cache);
m_isInPopWin = true; //
} else if (tjc::kpt_on_keyboard_page_load == packetType) {
event_cache.eventId = packetType;
event_cache.pid = packet.data[1];
event_cache.bid = 0;
callUsrEventCb(&event_cache);
m_isInPopWin = true;
} else { } else {
event_cache.eventId = packet.data[0]; event_cache.eventId = packet.data[0];
callUsrEventCb(&event_cache); callUsrEventCb(&event_cache);
@ -143,7 +116,6 @@ void FrontEndControler::startSchedule() {
}); });
} }
void FrontEndControler::processScreenRxPacket(uint8_t* data, size_t len) { void FrontEndControler::processScreenRxPacket(uint8_t* data, size_t len) {
// ÅжϰüÊÇ·ñºÏ·¨ // ÅжϰüÊÇ·ñºÏ·¨
#if MODULE_DEBUG #if MODULE_DEBUG
@ -279,8 +251,6 @@ void FrontEndControler::processInputfieldContentChangeEvent0(uint8_t* data, size
const char* strbegin = (const char*)&data[3]; const char* strbegin = (const char*)&data[3];
strbegin = zcpystr(event_cache.d.inputfield_content.text, strbegin, sizeof(event_cache.d.inputfield_content.text)); strbegin = zcpystr(event_cache.d.inputfield_content.text, strbegin, sizeof(event_cache.d.inputfield_content.text));
callUsrEventCb(&event_cache); callUsrEventCb(&event_cache);
// input_file_event_cache = event_cache;
// input_file_event_cache_state = true;
} }
void FrontEndControler::processInputfieldContentChangeEvent1(uint8_t* data, size_t len) { void FrontEndControler::processInputfieldContentChangeEvent1(uint8_t* data, size_t len) {
@ -303,32 +273,6 @@ void FrontEndControler::processInputfieldContentChangeEvent1(uint8_t* data, size
event_cache.bid = data[2]; event_cache.bid = data[2];
const char* strbegin = (const char*)&data[3]; const char* strbegin = (const char*)&data[3];
strbegin = zcpystr(event_cache.d.inputfield_content.text, strbegin, sizeof(event_cache.d.inputfield_content.text)); 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::processLoginRequestEvent(uint8_t* data, size_t len) {
/*
* printh AE
* prints dp,1
* prints '&id&',1
* prints cUsrName.txt,0
* printh 00
* prints txt_passwd.txt,0
* printh 00
* printh FF FF FF
*/
// ZLOGI(TAG, "processLoginRequestEvent");
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.login_request.usrName, strbegin, MAX_USR_NAME_SIZE);
strbegin = zcpystr(event_cache.d.login_request.passwd, strbegin, MAX_USR_PASSWD_LENGTH);
callUsrEventCb(&event_cache); callUsrEventCb(&event_cache);
} }
@ -430,68 +374,68 @@ bool FrontEndControler::vis(uint16_t buuid, int32_t val) {
void FrontEndControler::alert(const char* info, function<void(bool)> onConfirm) { void FrontEndControler::alert(const char* info, function<void(bool)> onConfirm) {
zlock_guard lg(m_cmdlock); zlock_guard lg(m_cmdlock);
if (m_isInPopWin) {
ZLOGE(TAG, "isInPopWin,alert failed");
return;
}
m_onAlertPageConfirmKey = onConfirm;
static char buf[128];
sprintf(buf, "%s", info);
sendcmd("p[%d].b[%d].val=%d", pg_alert, ob_alert_frompage, m_nowPage);
sendcmd("p[%d].b[%d].txt=\"%s\"", pg_alert, ob_alert_info, buf);
sendcmd("page alert");
// if (m_isInPopWin) {
// ZLOGE(TAG, "isInPopWin,alert failed");
// return;
// }
// m_onAlertPageConfirmKey = onConfirm;
// static char buf[128];
// sprintf(buf, "%s", info);
// sendcmd("p[%d].b[%d].val=%d", pg_alert, ob_alert_frompage, m_nowPage);
// sendcmd("p[%d].b[%d].txt=\"%s\"", pg_alert, ob_alert_info, buf);
// sendcmd("page alert");
} }
void FrontEndControler::alertNoConfirm(const char* info) { void FrontEndControler::alertNoConfirm(const char* info) {
zlock_guard lg(m_cmdlock); zlock_guard lg(m_cmdlock);
if (m_isInPopWin) {
ZLOGE(TAG, "isInPopWin,alertNoConfirm failed");
return;
}
static char buf[128];
sprintf(buf, "%s", info);
sendcmd("p[%d].b[%d].val=dp", pg_alert, ob_alert_frompage);
sendcmd("p[%d].b[%d].txt=\"%s\"", pg_alert, ob_alert_info, buf);
sendcmd("page alert");
vis(ob_alert_confirmkey, 0);
// if (m_isInPopWin) {
// ZLOGE(TAG, "isInPopWin,alertNoConfirm failed");
// return;
// }
// static char buf[128];
// sprintf(buf, "%s", info);
// sendcmd("p[%d].b[%d].val=dp", pg_alert, ob_alert_frompage);
// sendcmd("p[%d].b[%d].txt=\"%s\"", pg_alert, ob_alert_info, buf);
// sendcmd("page alert");
// vis(ob_alert_confirmkey, 0);
} }
void FrontEndControler::confirmNoCancle(const char* info, function<void(bool)> onConfirm) { void FrontEndControler::confirmNoCancle(const char* info, function<void(bool)> onConfirm) {
zlock_guard lg(m_cmdlock); zlock_guard lg(m_cmdlock);
if (m_isInPopWin) {
ZLOGE(TAG, "isInPopWin,confirmNoCancle failed");
return;
}
// if (m_isInPopWin) {
// ZLOGE(TAG, "isInPopWin,confirmNoCancle failed");
// return;
// }
m_onConfirmPageConfirmKey = onConfirm;
// m_onConfirmPageConfirmKey = onConfirm;
static char buf[128];
sprintf(buf, "%s", info);
// static char buf[128];
// sprintf(buf, "%s", info);
sendcmd("p[%d].b[%d].val=dp", pg_confirm, ob_confirm_frompage);
sendcmd("p[%d].b[%d].txt=\"%s\"", pg_confirm, ob_confirm_info, buf);
sendcmd("page confirm");
vis(ob_confirm_canclekey, 0);
// sendcmd("p[%d].b[%d].val=dp", pg_confirm, ob_confirm_frompage);
// sendcmd("p[%d].b[%d].txt=\"%s\"", pg_confirm, ob_confirm_info, buf);
// sendcmd("page confirm");
// vis(ob_confirm_canclekey, 0);
} }
void FrontEndControler::confirm(const char* info, function<void(bool)> onConfirm) { void FrontEndControler::confirm(const char* info, function<void(bool)> onConfirm) {
zlock_guard lg(m_cmdlock); zlock_guard lg(m_cmdlock);
if (m_isInPopWin) {
ZLOGE(TAG, "isInPopWin,confirm failed");
return;
}
m_onConfirmPageConfirmKey = onConfirm;
static char buf[128];
sprintf(buf, "%s", info);
sendcmd("p[%d].b[%d].val=dp", pg_confirm, ob_confirm_frompage);
sendcmd("p[%d].b[%d].txt=\"%s\"", pg_confirm, ob_confirm_info, buf);
sendcmd("page confirm");
vis(ob_confirm_canclekey, 1);
// if (m_isInPopWin) {
// ZLOGE(TAG, "isInPopWin,confirm failed");
// return;
// }
// m_onConfirmPageConfirmKey = onConfirm;
// static char buf[128];
// sprintf(buf, "%s", info);
// sendcmd("p[%d].b[%d].val=dp", pg_confirm, ob_confirm_frompage);
// sendcmd("p[%d].b[%d].txt=\"%s\"", pg_confirm, ob_confirm_info, buf);
// sendcmd("page confirm");
// vis(ob_confirm_canclekey, 1);
} }
void FrontEndControler::chpage(uint8_t page) { sendcmd("page %d", page); } void FrontEndControler::chpage(uint8_t page) { sendcmd("page %d", page); }

7
usrc/uicontroler/front_end_controler.hpp

@ -21,10 +21,9 @@ class FrontEndControler {
tjc_rx_packet_t ackcache; tjc_rx_packet_t ackcache;
zmutex m_cmdlock = {"FrontEndControler_LOCK"}; zmutex m_cmdlock = {"FrontEndControler_LOCK"};
tjc::tjc_usr_event_t event_cache;
tjc::tjc_usr_event_t input_file_event_cache;
bool input_file_event_cache_state = false;
tjc::tjc_usr_event_t event_cache;
// on_usr_event_cb_t cb; // on_usr_event_cb_t cb;
@ -37,7 +36,6 @@ class FrontEndControler {
function<void(bool)> m_onConfirmPageConfirmKey; function<void(bool)> m_onConfirmPageConfirmKey;
function<void(bool)> m_onAlertPageConfirmKey; function<void(bool)> m_onAlertPageConfirmKey;
bool m_isInPopWin = false;
public: public:
FrontEndControler() {}; FrontEndControler() {};
@ -95,7 +93,6 @@ class FrontEndControler {
void processInputfieldContentChangeEvent1(uint8_t* data, size_t len); void processInputfieldContentChangeEvent1(uint8_t* data, size_t len);
void processInputfieldContentChangeEvent0(uint8_t* data, size_t len); void processInputfieldContentChangeEvent0(uint8_t* data, size_t len);
void processUsrDoubleStateButtonEvent(uint8_t* data, size_t len); void processUsrDoubleStateButtonEvent(uint8_t* data, size_t len);
void processLoginRequestEvent(uint8_t* data, size_t len);
void startReceiveAck(); void startReceiveAck();

32
usrc/uicontroler/page/page.hpp

@ -1,19 +1,19 @@
#pragma once #pragma once
#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_muAudit.hpp"
#include "submenu/Page_muDeviceInfo.hpp"
#include "submenu/Page_muInterval.hpp"
#include "submenu/Page_muPumpTest.hpp"
#include "submenu/Page_muSettings.hpp"
#include "submenu/Page_muUsrMgr.hpp"
// #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_muAudit.hpp"
// #include "submenu/Page_muDeviceInfo.hpp"
// #include "submenu/Page_muInterval.hpp"
// #include "submenu/Page_muPumpTest.hpp"
// #include "submenu/Page_muSettings.hpp"
// #include "submenu/Page_muUsrMgr.hpp"
//
#include "submenu/Page_muBleHandSett.hpp"
#include "submenu/Page_muMotorSett.hpp"
#include "submenu/Page_muPumpSett.hpp"
// //
// #include "submenu/Page_muBleHandSett.hpp"
// #include "submenu/Page_muMotorSett.hpp"
// #include "submenu/Page_muPumpSett.hpp"

433
usrc/uicontroler/tjc/tjc_constant.cpp

@ -3,436 +3,6 @@
#include <stdint.h> #include <stdint.h>
namespace tjc { namespace tjc {
typedef struct {
uint8_t pid;
uint8_t bid;
const char* info;
const char* pids;
const char* bidstr;
} marco_info_t;
#define _BINFO(_pid, _bid) {pg_##_pid, ob_##_pid##_##_bid, #_pid "_" #_bid, #_pid, #_bid}
// ÃüÃû¹æ·¶ÎªÍÕ·åÃüÃû
// 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), //
// };
// //
// 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) \ #define PT_ENUM(key) \
case key: \ case key: \
return #key; return #key;
@ -473,9 +43,6 @@ const char* pt2str(uint8_t type) {
PT_ENUM(kpt_ack) PT_ENUM(kpt_ack)
PT_ENUM(kpt_inputfield_content_change_event1) PT_ENUM(kpt_inputfield_content_change_event1)
PT_ENUM(kpt_double_state_button_event) PT_ENUM(kpt_double_state_button_event)
PT_ENUM(kpt_login_request)
PT_ENUM(kpt_unlogin_request)
default: default:
return "unkown_event"; return "unkown_event";
break; break;

26
usrc/uicontroler/tjc/tjc_constant.hpp

@ -48,7 +48,7 @@ typedef enum {
* @brief * @brief
*/ */
kpt_button_event = 0x65, // kpt_button_event = 0x65, //
kpt_sys_event_page_id = 0x66,
kpt_sys_event_page_id = 0x66, // 页面变化事件
kpt_sys_event_touch_data = 0x67, kpt_sys_event_touch_data = 0x67,
kpt_sys_event_sleep_touch = 0x68, kpt_sys_event_sleep_touch = 0x68,
kpt_sys_event_string_var = 0x70, kpt_sys_event_string_var = 0x70,
@ -63,14 +63,10 @@ typedef enum {
/** /**
* @brief * @brief
*/ */
kpt_ack = 0xAA,
kpt_inputfield_content_change_event0 = 0xAB, // 同页面输入框内容变更事件
kpt_ack = 0xAA,
//
kpt_inputfield_content_change_event1 = 0xAC, // 跨页面键盘输入事件 kpt_inputfield_content_change_event1 = 0xAC, // 跨页面键盘输入事件
kpt_double_state_button_event = 0xAD, 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; } packet_type_t;
typedef enum { typedef enum {
@ -88,12 +84,6 @@ typedef struct {
char text[TJC_MAX_PACKET_SIZE]; char text[TJC_MAX_PACKET_SIZE];
} inputfield_content; } inputfield_content;
// kpt_usr_login_request
struct {
char usrName[MAX_USR_NAME_SIZE + 1];
char passwd[MAX_USR_PASSWD_LENGTH + 1];
} login_request;
// kpt_double_state_button_event // kpt_double_state_button_event
struct { struct {
uint8_t val; uint8_t val;
@ -103,15 +93,6 @@ typedef struct {
uint8_t val; // 0 抬起,1按下 uint8_t val; // 0 抬起,1按下
} button_event; } button_event;
struct {
uint8_t fromPage;
uint8_t fromPopPage;
} on_page_load;
struct {
bool isFromPopWin;
} sys_event_page_id;
} d; } d;
} tjc_usr_event_t; } tjc_usr_event_t;
@ -120,7 +101,6 @@ typedef enum {
k_input_confirm_event = 2, k_input_confirm_event = 2,
} usr_event_type_t; } usr_event_type_t;
const char* pt2str(uint8_t type); const char* pt2str(uint8_t type);
const char* uimarco2str(uint8_t pid, uint8_t bid); const char* uimarco2str(uint8_t pid, uint8_t bid);
const char* pageName(uint8_t page); const char* pageName(uint8_t page);

Loading…
Cancel
Save