Browse Source

fix some bug

v2
zhaohe 8 months ago
parent
commit
3131ea2a6d
  1. 2
      stm32basic
  2. 8
      usrc/uicontroler/base/page_processer.cpp
  3. 4
      usrc/uicontroler/page/demo/demo_page_cpp
  4. 2
      usrc/uicontroler/page/mupage/muAcidType_page.cpp
  5. 2
      usrc/uicontroler/page/mupage/muDateMgr_page.cpp
  6. 8
      usrc/uicontroler/page/mupage/muInterval_page.cpp

2
stm32basic

@ -1 +1 @@
Subproject commit 7fb0eb24a401679b66c7b4b7c3cf6c379635137c
Subproject commit 60f3510b130731e26643271cad9d8f9a444b7155

8
usrc/uicontroler/base/page_processer.cpp

@ -79,7 +79,8 @@ void UIControlerHock_PageInit() {
break; break;
} }
} }
uint8_t pageId[256] = {0};
uint8_t pageId[256];
memset(pageId, 0, sizeof(pageId));
for (size_t i = 0; i < m_pageNum; i++) { for (size_t i = 0; i < m_pageNum; i++) {
if (m_pages[i]->thisPage > 255) { if (m_pages[i]->thisPage > 255) {
ZLOGE(TAG, "page %s %d is out of range", m_pages[i]->pageName, m_pages[i]->thisPage); ZLOGE(TAG, "page %s %d is out of range", m_pages[i]->pageName, m_pages[i]->thisPage);
@ -99,10 +100,7 @@ void UIControlerHock_PageInit() {
} }
for (size_t i = 0; i < 256; i++) { 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);
}
ZASSERT_INFO(pageId[i] <= 1, "page %d has been registed %d times", i, pageId[i]);
} }
} }
} // namespace iflytop } // namespace iflytop

4
usrc/uicontroler/page/demo/demo_page_cpp

@ -25,9 +25,9 @@ class MuIntervalPage : public IPageProcesser {
} }
private: private:
virtual void OnPageLoad(OnPageLoadContext* cxt) { return; };
virtual void onPageLoad(OnPageLoadContext* cxt) { return; };
virtual void OnBackKey() { return; }; virtual void OnBackKey() { return; };
virtual void OnInputFieldContentChange(uint8_t bid, uint8_t slecId, const char* text) { return; };
virtual void onInputFieldContentChange(uint8_t bid, uint8_t slecId, 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 OnDoubleStateButton(uint8_t bid, uint8_t val) { 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; };

2
usrc/uicontroler/page/mupage/muAcidType_page.cpp

@ -46,7 +46,7 @@ class MuAcidType : public IPageProcesser {
virtual void onBackKey() override { UIControler::ins()->chpage(pg_navi, true); }; virtual void onBackKey() override { UIControler::ins()->chpage(pg_navi, true); };
virtual void onChangePageEvent() override {}; virtual void onChangePageEvent() override {};
virtual void OnInputFieldContentChange(uint8_t bid, uint8_t slecId, const char* text) {
virtual void onInputFieldContentChange(uint8_t bid, uint8_t slecId, const char* text) {
if (bid == ob_muAcidType_t1) { if (bid == ob_muAcidType_t1) {
AcidNameDao::updateAcidName(1 - 1, text); AcidNameDao::updateAcidName(1 - 1, text);
} else if (bid == ob_muAcidType_t2) { } else if (bid == ob_muAcidType_t2) {

2
usrc/uicontroler/page/mupage/muDateMgr_page.cpp

@ -100,7 +100,7 @@ class MuDateMgrPage : public IPageProcesser {
} }
} }
virtual void OnInputFieldContentChange(uint8_t bid, uint8_t slecId, const char* text) {};
virtual void onInputFieldContentChange(uint8_t bid, uint8_t slecId, const char* text) {};
virtual void onClickRelease(uint8_t bid, uint8_t val, const char* text) override { virtual void onClickRelease(uint8_t bid, uint8_t val, const char* text) override {
if (bid == ob_muDateMgr_year) { if (bid == ob_muDateMgr_year) {
ZLOGI(TAG, "set year %s(%d)", text, val); ZLOGI(TAG, "set year %s(%d)", text, val);

8
usrc/uicontroler/page/mupage/muInterval_page.cpp

@ -24,15 +24,13 @@ class MuIntervalPage : public IPageProcesser {
} }
private: private:
virtual void OnPageLoad(OnPageLoadContext* cxt) {
return;
};
virtual void onPageLoad(OnPageLoadContext* cxt) override { return; };
/** /**
* @brief ·µ»ØÉÏÒ»Ò³ * @brief ·µ»ØÉÏÒ»Ò³
*/ */
virtual void OnBackKey() { UIControler::ins()->chpage(pg_navi,true); };
virtual void onBackKey() override { UIControler::ins()->chpage(pg_navi, true); };
virtual void OnInputFieldContentChange(uint8_t bid, uint8_t slecId, const char* text) {
virtual void onInputFieldContentChange(uint8_t bid, uint8_t slecId, const char* text) override {
if (bid == ob_muInterval_stAcidInte) { if (bid == ob_muInterval_stAcidInte) {
float distrIntervalSSecond = atof(text); float distrIntervalSSecond = atof(text);
if (distrIntervalSSecond <= 0) { if (distrIntervalSSecond <= 0) {

Loading…
Cancel
Save