From 3131ea2a6da716e12ccdcbf17fada28035018044 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Tue, 26 Nov 2024 21:00:30 +0800
Subject: [PATCH] fix some bug

---
 stm32basic                                       | 2 +-
 usrc/uicontroler/base/page_processer.cpp         | 8 +++-----
 usrc/uicontroler/page/demo/demo_page_cpp         | 4 ++--
 usrc/uicontroler/page/mupage/muAcidType_page.cpp | 2 +-
 usrc/uicontroler/page/mupage/muDateMgr_page.cpp  | 2 +-
 usrc/uicontroler/page/mupage/muInterval_page.cpp | 8 +++-----
 6 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/stm32basic b/stm32basic
index 7fb0eb2..60f3510 160000
--- a/stm32basic
+++ b/stm32basic
@@ -1 +1 @@
-Subproject commit 7fb0eb24a401679b66c7b4b7c3cf6c379635137c
+Subproject commit 60f3510b130731e26643271cad9d8f9a444b7155
diff --git a/usrc/uicontroler/base/page_processer.cpp b/usrc/uicontroler/base/page_processer.cpp
index da9df01..63ea13f 100644
--- a/usrc/uicontroler/base/page_processer.cpp
+++ b/usrc/uicontroler/base/page_processer.cpp
@@ -79,7 +79,8 @@ void UIControlerHock_PageInit() {
       break;
     }
   }
-  uint8_t pageId[256] = {0};
+  uint8_t pageId[256];
+  memset(pageId, 0, sizeof(pageId));
   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);
@@ -99,10 +100,7 @@ void UIControlerHock_PageInit() {
   }
 
   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
diff --git a/usrc/uicontroler/page/demo/demo_page_cpp b/usrc/uicontroler/page/demo/demo_page_cpp
index 4b4d138..b1b203d 100644
--- a/usrc/uicontroler/page/demo/demo_page_cpp
+++ b/usrc/uicontroler/page/demo/demo_page_cpp
@@ -25,9 +25,9 @@ class MuIntervalPage : public IPageProcesser {
   }
 
  private:
-  virtual void OnPageLoad(OnPageLoadContext* cxt) { return; };
+  virtual void onPageLoad(OnPageLoadContext* cxt) { 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 OnDoubleStateButton(uint8_t bid, uint8_t val) { return; };
   virtual void OnAppEvent(AppEvent_t* event) { return; };
diff --git a/usrc/uicontroler/page/mupage/muAcidType_page.cpp b/usrc/uicontroler/page/mupage/muAcidType_page.cpp
index a0628dd..856a58a 100644
--- a/usrc/uicontroler/page/mupage/muAcidType_page.cpp
+++ b/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 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) {
       AcidNameDao::updateAcidName(1 - 1, text);
     } else if (bid == ob_muAcidType_t2) {
diff --git a/usrc/uicontroler/page/mupage/muDateMgr_page.cpp b/usrc/uicontroler/page/mupage/muDateMgr_page.cpp
index 16488ae..8237171 100644
--- a/usrc/uicontroler/page/mupage/muDateMgr_page.cpp
+++ b/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 {
     if (bid == ob_muDateMgr_year) {
       ZLOGI(TAG, "set year %s(%d)", text, val);
diff --git a/usrc/uicontroler/page/mupage/muInterval_page.cpp b/usrc/uicontroler/page/mupage/muInterval_page.cpp
index 7f4d631..7daf33e 100644
--- a/usrc/uicontroler/page/mupage/muInterval_page.cpp
+++ b/usrc/uicontroler/page/mupage/muInterval_page.cpp
@@ -24,15 +24,13 @@ class MuIntervalPage : public IPageProcesser {
   }
 
  private:
-  virtual void OnPageLoad(OnPageLoadContext* cxt) {
-    return;
-  };
+  virtual void onPageLoad(OnPageLoadContext* cxt) override { return; };
   /**
    * @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) {
       float distrIntervalSSecond = atof(text);
       if (distrIntervalSSecond <= 0) {