p_chinagoldgroup_hand_acid
/
hand_acid_mainboard_bak
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update

v2
zhaohe 8 months ago
parent
7144add889
commit
c442978ac2
8 changed files with 153 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      uappbase/service/app_event_bus.cpp
  2. 4
      usrc/db/dao/acid_name_dao.cpp
  3. 2
      usrc/service/app_core.cpp
  4. 30
      usrc/uicontroler/base/page_processer.cpp
  5. 1
      usrc/uicontroler/base/page_processer.hpp
  6. 118
      usrc/uicontroler/page/mupage/muAcidType_page.cpp
  7. 1
      usrc/uicontroler/ui_controler.cpp
  8. 8
      usrc/uicontroler/ui_controler.hpp

4
uappbase/service/app_event_bus.cpp
View File

@ -14,7 +14,7 @@ void AppEventBus::initialize() {
AppEvent_t event; AppEvent_t event;
while (1) { while (1) {
if (xQueueReceive(xQueue, &event, portMAX_DELAY) == pdTRUE) { if (xQueueReceive(xQueue, &event, portMAX_DELAY) == pdTRUE) {
// ZLOGI(TAG, "pop event type %d", event.type);
ZLOGI(TAG, "pop event type %d", event.type);
for (int i = 0; i < cbNum; i++) { for (int i = 0; i < cbNum; i++) {
m_cbs[i](&event); m_cbs[i](&event);
} }
@ -28,7 +28,7 @@ void AppEventBus::regOnEvent(onAppEventCB_t onEvent) {
cbNum++; cbNum++;
} }
void AppEventBus::pushEvent(const AppEvent_t& event) { void AppEventBus::pushEvent(const AppEvent_t& event) {
// ZLOGI(TAG, "pushEvent %d", event.type);
ZLOGI(TAG, "pushEvent %d", event.type);
if (xQueueSend(xQueue, &event, 100) != pdPASS) { if (xQueueSend(xQueue, &event, 100) != pdPASS) {
ZLOGE(TAG, "xQueueSend failed"); ZLOGE(TAG, "xQueueSend failed");
} }

4
usrc/db/dao/acid_name_dao.cpp
View File

@ -84,9 +84,9 @@ void AcidNameDao::updateAcidName(int index, const char* name) {
storgeTableData(); storgeTableData();
} }
const char* AcidNameDao::getAcidName(int index){
const char* AcidNameDao::getAcidName(int index) {
ZASSERT_INFO(module_inited, "acid name dao not inited"); ZASSERT_INFO(module_inited, "acid name dao not inited");
ZASSERT_INFO(index < MAX_ACID_NUM, "index out of range"); ZASSERT_INFO(index < MAX_ACID_NUM, "index out of range");
return tabledata->acidName[0].acidName[index]; return tabledata->acidName[0].acidName[index];
}
}

2
usrc/service/app_core.cpp
View File

@ -97,7 +97,7 @@ void AppCore::initialize() {
ZLOGI(TAG, "load zhdb end"); ZLOGI(TAG, "load zhdb end");
UIControler::ins()->initialize(); UIControler::ins()->initialize();
UIControler::ins()->chpage(pg_muDateMgr,true);
UIControler::ins()->chpage(pg_muAcidType,true);
osDelay(1000); osDelay(1000);
// UIControler::ins()->popWarningWin("¾¯¸æ!!!!!!!"); // UIControler::ins()->popWarningWin("¾¯¸æ!!!!!!!");

30
usrc/uicontroler/base/page_processer.cpp
View File

@ -20,15 +20,20 @@ IPageProcesser::IPageProcesser(const char* name, uint32_t thisPage) {
} }
void IPageProcesser::initialize() { void IPageProcesser::initialize() {
if (isInit) {
ZLOGE(TAG, "page %s %d has been initialized", pageName, thisPage);
ZASSERT(false);
}
isInit = true;
ZLOGI(TAG, "initialize page %s %d", pageName, thisPage); ZLOGI(TAG, "initialize page %s %d", pageName, thisPage);
AppEventBus::ins()->regOnEvent([this](AppEvent_t* event) { AppEventBus::ins()->regOnEvent([this](AppEvent_t* event) {
// ZLOGI(TAG, "event type %s %d", pageName, event->type);
if (event->type == KAE_UIEvent) { if (event->type == KAE_UIEvent) {
if (thisPage != event->d.uiEvent.pid) { if (thisPage != event->d.uiEvent.pid) {
return; return;
} }
// uint8_t bid = event->d.uiEvent.bid; // uint8_t bid = event->d.uiEvent.bid;
UIEvent* uiEvent = &event->d.uiEvent; UIEvent* uiEvent = &event->d.uiEvent;
@ -37,10 +42,10 @@ void IPageProcesser::initialize() {
ZLOGI(TAG, "page %s(%d)-%d load", pageName, thisPage, uiEvent->bid); ZLOGI(TAG, "page %s(%d)-%d load", pageName, thisPage, uiEvent->bid);
onPageLoad(&cxt); onPageLoad(&cxt);
} else if (uiEvent->eventId == kpt_button_event) { } else if (uiEvent->eventId == kpt_button_event) {
ZLOGI(TAG, "page %s(%d)-%d onClickRelease,val %d text %s", pageName, thisPage, uiEvent->bid, uiEvent->val, uiEvent->text);
ZLOGI(TAG, "page %s(%d)-%d onClickRelease(button),val %d text %s", pageName, thisPage, uiEvent->bid, uiEvent->val, uiEvent->text);
onClickRelease(uiEvent->bid, uiEvent->val, uiEvent->text); onClickRelease(uiEvent->bid, uiEvent->val, uiEvent->text);
} else if (uiEvent->eventId == kpt_usr_def_clik_release_event) { } else if (uiEvent->eventId == kpt_usr_def_clik_release_event) {
ZLOGI(TAG, "page %s(%d)-%d onClickRelease,val %d text %s", pageName, thisPage, uiEvent->bid, uiEvent->val, uiEvent->text);
ZLOGI(TAG, "page %s(%d)-%d onClickRelease(usrDef),val %d text %s", pageName, thisPage, uiEvent->bid, uiEvent->val, uiEvent->text);
onClickRelease(uiEvent->bid, uiEvent->val, uiEvent->text); onClickRelease(uiEvent->bid, uiEvent->val, uiEvent->text);
} else if (uiEvent->eventId == kpt_page_back_event) { } else if (uiEvent->eventId == kpt_page_back_event) {
ZLOGI(TAG, "page %s(%d)-%d onBackKey", pageName, thisPage, uiEvent->bid); ZLOGI(TAG, "page %s(%d)-%d onBackKey", pageName, thisPage, uiEvent->bid);
@ -74,17 +79,30 @@ void UIControlerHock_PageInit() {
break; break;
} }
} }
uint8_t pageId[256] = {0};
for (size_t i = 0; i < m_pageNum; i++) { for (size_t i = 0; i < m_pageNum; i++) {
if (m_pages[i]->thisPage > 255) {
ZLOGE(TAG, "page %s %d is out of range", m_pages[i]->pageName, m_pages[i]->thisPage);
ZASSERT(false);
}
pageId[m_pages[i]->thisPage] += 1;
//
// ZLOGI(TAG, "initialize page %s %d", m_pages[i]->pageName, m_pages[i]->thisPage); // ZLOGI(TAG, "initialize page %s %d", m_pages[i]->pageName, m_pages[i]->thisPage);
if (hasOnlyInitThis) { if (hasOnlyInitThis) {
if (m_pages[i]->onlyInitThis || m_pages[i]->forceInitThis) { if (m_pages[i]->onlyInitThis || m_pages[i]->forceInitThis) {
m_pages[i]->initialize(); m_pages[i]->initialize();
} }
} else { } else {
m_pages[i]->initialize(); m_pages[i]->initialize();
} }
} }
for (size_t i = 0; i < 256; i++) {
if (pageId[i] > 1) {
ZLOGE(TAG, "page %d has been registed %d times", i, pageId[i]);
ZASSERT(false);
}
}
} }
} // namespace iflytop } // namespace iflytop

1
usrc/uicontroler/base/page_processer.hpp
View File

@ -26,6 +26,7 @@ class IPageProcesser {
const char* pageName = "Not Set"; const char* pageName = "Not Set";
bool onlyInitThis = false; // for debug bool onlyInitThis = false; // for debug
bool forceInitThis = false; bool forceInitThis = false;
bool isInit = false;
public: public:
IPageProcesser(const char* name, uint32_t thisPage); IPageProcesser(const char* name, uint32_t thisPage);

118
usrc/uicontroler/page/mupage/muAcidType_page.cpp
View File

@ -0,0 +1,118 @@
#include "db/dao/acid_name_dao.hpp"
#include "uappbase/apphal/apphal.hpp"
#include "ui/ui.h"
#include "uicontroler/base/page_processer.hpp"
//
#include "db/dao/acid_ch_cfg_dao.hpp"
#include "db/dao/device_setting_dao.hpp"
//
#include "service/pump_ctrl_service.hpp"
namespace iflytop {
using namespace std;
#define TAG "MuAcidType"
class MuAcidType : public IPageProcesser {
private:
public:
MuAcidType() : IPageProcesser(TAG, pg_muAcidType) {}
virtual void initialize() override {
IPageProcesser::initialize();
setText(ob_muAcidType_t1, AcidNameDao::getAcidName(1 - 1));
setText(ob_muAcidType_t2, AcidNameDao::getAcidName(2 - 1));
setText(ob_muAcidType_t3, AcidNameDao::getAcidName(3 - 1));
setText(ob_muAcidType_t4, AcidNameDao::getAcidName(4 - 1));
setText(ob_muAcidType_t5, AcidNameDao::getAcidName(5 - 1));
setText(ob_muAcidType_t6, AcidNameDao::getAcidName(6 - 1));
setText(ob_muAcidType_t7, AcidNameDao::getAcidName(7 - 1));
setText(ob_muAcidType_t8, AcidNameDao::getAcidName(8 - 1));
setText(ob_muAcidType_t9, AcidNameDao::getAcidName(9 - 1));
setText(ob_muAcidType_t10, AcidNameDao::getAcidName(10 - 1));
setText(ob_muAcidType_t11, AcidNameDao::getAcidName(11 - 1));
setText(ob_muAcidType_t12, AcidNameDao::getAcidName(12 - 1));
setText(ob_muAcidType_t13, AcidNameDao::getAcidName(13 - 1));
setText(ob_muAcidType_t14, AcidNameDao::getAcidName(14 - 1));
setText(ob_muAcidType_t15, AcidNameDao::getAcidName(15 - 1));
}
private:
virtual void onPageLoad(OnPageLoadContext* cxt) override { return; };
/**
* @brief 返回上一页
*/
virtual void onBackKey() override { UIControler::ins()->chpage(pg_navi, true); };
virtual void onChangePageEvent() override {};
virtual void OnInputFieldContentChange(uint8_t bid, uint8_t slecId, const char* text) {
if (bid == ob_muAcidType_t1) {
AcidNameDao::updateAcidName(1 - 1, text);
} else if (bid == ob_muAcidType_t2) {
AcidNameDao::updateAcidName(2 - 1, text);
} else if (bid == ob_muAcidType_t3) {
AcidNameDao::updateAcidName(3 - 1, text);
} else if (bid == ob_muAcidType_t4) {
AcidNameDao::updateAcidName(4 - 1, text);
} else if (bid == ob_muAcidType_t5) {
AcidNameDao::updateAcidName(5 - 1, text);
} else if (bid == ob_muAcidType_t6) {
AcidNameDao::updateAcidName(6 - 1, text);
} else if (bid == ob_muAcidType_t7) {
AcidNameDao::updateAcidName(7 - 1, text);
} else if (bid == ob_muAcidType_t8) {
AcidNameDao::updateAcidName(8 - 1, text);
} else if (bid == ob_muAcidType_t9) {
AcidNameDao::updateAcidName(9 - 1, text);
} else if (bid == ob_muAcidType_t10) {
AcidNameDao::updateAcidName(10 - 1, text);
} else if (bid == ob_muAcidType_t11) {
AcidNameDao::updateAcidName(11 - 1, text);
} else if (bid == ob_muAcidType_t12) {
AcidNameDao::updateAcidName(12 - 1, text);
} else if (bid == ob_muAcidType_t13) {
AcidNameDao::updateAcidName(13 - 1, text);
} else if (bid == ob_muAcidType_t14) {
AcidNameDao::updateAcidName(14 - 1, text);
} else if (bid == ob_muAcidType_t15) {
AcidNameDao::updateAcidName(15 - 1, text);
}
};
virtual void onClickRelease(uint8_t bid, uint8_t val, const char* text) override {
if (bid == ob_muAcidType_t1)
popFullKeyBoard(ob_muAcidType_t1, 20, AcidNameDao::getAcidName(1 - 1));
else if (bid == ob_muAcidType_t2)
popFullKeyBoard(ob_muAcidType_t2, 20, AcidNameDao::getAcidName(2 - 1));
else if (bid == ob_muAcidType_t3)
popFullKeyBoard(ob_muAcidType_t3, 20, AcidNameDao::getAcidName(3 - 1));
else if (bid == ob_muAcidType_t4)
popFullKeyBoard(ob_muAcidType_t4, 20, AcidNameDao::getAcidName(4 - 1));
else if (bid == ob_muAcidType_t5)
popFullKeyBoard(ob_muAcidType_t5, 20, AcidNameDao::getAcidName(5 - 1));
else if (bid == ob_muAcidType_t6)
popFullKeyBoard(ob_muAcidType_t6, 20, AcidNameDao::getAcidName(6 - 1));
else if (bid == ob_muAcidType_t7)
popFullKeyBoard(ob_muAcidType_t7, 20, AcidNameDao::getAcidName(7 - 1));
else if (bid == ob_muAcidType_t8)
popFullKeyBoard(ob_muAcidType_t8, 20, AcidNameDao::getAcidName(8 - 1));
else if (bid == ob_muAcidType_t9)
popFullKeyBoard(ob_muAcidType_t9, 20, AcidNameDao::getAcidName(9 - 1));
else if (bid == ob_muAcidType_t10)
popFullKeyBoard(ob_muAcidType_t10, 20, AcidNameDao::getAcidName(10 - 1));
else if (bid == ob_muAcidType_t11)
popFullKeyBoard(ob_muAcidType_t11, 20, AcidNameDao::getAcidName(11 - 1));
else if (bid == ob_muAcidType_t12)
popFullKeyBoard(ob_muAcidType_t12, 20, AcidNameDao::getAcidName(12 - 1));
else if (bid == ob_muAcidType_t13)
popFullKeyBoard(ob_muAcidType_t13, 20, AcidNameDao::getAcidName(13 - 1));
else if (bid == ob_muAcidType_t14)
popFullKeyBoard(ob_muAcidType_t14, 20, AcidNameDao::getAcidName(14 - 1));
else if (bid == ob_muAcidType_t15)
popFullKeyBoard(ob_muAcidType_t15, 20, AcidNameDao::getAcidName(15 - 1));
}
};
// 实例化Page, 使其自动注册
static MuAcidType instance;
} // namespace iflytop

1
usrc/uicontroler/ui_controler.cpp
View File

@ -111,6 +111,7 @@ void UIControler::startSchedule() {
} else { } else {
event_cache.eventId = packet.data[0]; event_cache.eventId = packet.data[0];
} }
ZLOGI(TAG,"push event %s(%d) ", tjc::pt2str(event_cache.eventId), event_cache.eventId);
callUsrEventCb(&event_cache); callUsrEventCb(&event_cache);
} }
osDelay(1); osDelay(1);

8
usrc/uicontroler/ui_controler.hpp
View File

@ -95,9 +95,9 @@ class UIControler {
sendcmd("p[%d].b[%d].val=%d", pg_keybdAP, ob_keybdAP_loadpageid, fromPid); sendcmd("p[%d].b[%d].val=%d", pg_keybdAP, ob_keybdAP_loadpageid, fromPid);
sendcmd("p[%d].b[%d].val=%d", pg_keybdAP, ob_keybdAP_loadcmpid, fromBid); sendcmd("p[%d].b[%d].val=%d", pg_keybdAP, ob_keybdAP_loadcmpid, fromBid);
sendcmd("p[%d].b[%d].txt=%s", pg_keybdAP, ob_keybdAP_show, initval);
sendcmd("p[%d].b[%d].pw=0", pg_keybdAP, ob_keybdAP_show);
sendcmd("p[%d].b[%d].txt=\"%s\"", pg_keybdAP, ob_keybdAP_show, initval);
sendcmd("p[%d].b[%d].val=%d", pg_keybdAP, ob_keybdAP_inputlenth, limitLength); sendcmd("p[%d].b[%d].val=%d", pg_keybdAP, ob_keybdAP_inputlenth, limitLength);
sendcmd("p[%d].b[%d].pw=0", pg_keybdAP, ob_keybdAP_show);
chpage(pg_keybdAP, false); chpage(pg_keybdAP, false);
} }
@ -106,7 +106,7 @@ class UIControler {
sendcmd("p[%d].b[%d].val=%d", pg_keyPasswd, ob_keyPasswd_loadpageid, fromPid); sendcmd("p[%d].b[%d].val=%d", pg_keyPasswd, ob_keyPasswd_loadpageid, fromPid);
sendcmd("p[%d].b[%d].val=%d", pg_keyPasswd, ob_keyPasswd_loadcmpid, fromBid); sendcmd("p[%d].b[%d].val=%d", pg_keyPasswd, ob_keyPasswd_loadcmpid, fromBid);
sendcmd("p[%d].b[%d].txt=%s", pg_keyPasswd, ob_keyPasswd_show, "");
sendcmd("p[%d].b[%d].txt=\"%s\"", pg_keyPasswd, ob_keyPasswd_show, "");
sendcmd("p[%d].b[%d].pw=1", pg_keyPasswd, ob_keyPasswd_show); sendcmd("p[%d].b[%d].pw=1", pg_keyPasswd, ob_keyPasswd_show);
sendcmd("p[%d].b[%d].val=%d", pg_keyPasswd, ob_keyPasswd_inputlenth, limitLength); sendcmd("p[%d].b[%d].val=%d", pg_keyPasswd, ob_keyPasswd_inputlenth, limitLength);
chpage(pg_keyPasswd, false); chpage(pg_keyPasswd, false);
@ -117,7 +117,7 @@ class UIControler {
sendcmd("p[%d].b[%d].val=%d", pg_keybdB, ob_keybdB_loadpageid, fromPid); sendcmd("p[%d].b[%d].val=%d", pg_keybdB, ob_keybdB_loadpageid, fromPid);
sendcmd("p[%d].b[%d].val=%d", pg_keybdB, ob_keybdB_loadcmpid, fromBid); sendcmd("p[%d].b[%d].val=%d", pg_keybdB, ob_keybdB_loadcmpid, fromBid);
sendcmd("p[%d].b[%d].txt=%s", pg_keybdB, ob_keybdB_show, initval);
sendcmd("p[%d].b[%d].txt=\"%s\"", pg_keybdB, ob_keybdB_show, initval);
sendcmd("p[%d].b[%d].pw=0", pg_keybdB, ob_keybdB_show); sendcmd("p[%d].b[%d].pw=0", pg_keybdB, ob_keybdB_show);
sendcmd("p[%d].b[%d].val=%d", pg_keybdB, ob_keybdB_inputlenth, limitLength); sendcmd("p[%d].b[%d].val=%d", pg_keybdB, ob_keybdB_inputlenth, limitLength);
chpage(pg_keybdB, false); chpage(pg_keybdB, false);

Write Preview
Loading…
Cancel
Save