update

usrc/service/app_core.cpp

@@ -11,7 +11,7 @@
 //
 #include "ucomponents/zcan/zcan.hpp"
 //
-#include "uicontroler/front_end_controler.hpp"
+#include "uicontroler/ui_controler.hpp"
 // #include "uicontroler/page/page.hpp"
 
 //
@@ -101,11 +101,11 @@ void AppCore::initialize() {
   DeviceSettingDao::init();
   ZLOGI(TAG, "load zhdb end");
 
-  UI::ins()->initialize();
-  UI::ins()->startSchedule();
-  UI::ins()->pageInit();
-  // UI::ins()->chpage(pg_login);
-  UI::ins()->chpage(pg_home);
+  UIControler::ins()->initialize();
+  UIControler::ins()->startSchedule();
+  UIControler::ins()->pageInit();
+  // UIControler::ins()->chpage(pg_login);
+  UIControler::ins()->chpage(pg_navi);
 
 
 

usrc/service/remote_controler_event_processer.cpp

@@ -5,7 +5,7 @@
 #include "service/remote_controler.hpp"
 
 //
-#include "uicontroler/front_end_controler.hpp"
+#include "uicontroler/ui_controler.hpp"
 
 using namespace iflytop;
 #define TAG "RemoteControlerEventProcesser"

usrc/uicontroler/base/page_processer.hpp

@@ -4,7 +4,7 @@
 #include "config/config.hpp"
 #include "uappbase/base.hpp"
 #include "ui/ui.h"
-#include "uicontroler/front_end_controler.hpp"
+#include "uicontroler/ui_controler.hpp"
 #include "uicontroler/pagerouter/page_bak_router.hpp"
 namespace iflytop {
 using namespace std;

usrc/uicontroler/base/ui_public_state.hpp

@@ -0,0 +1,14 @@
+#pragma once
+
+#include "uappbase/base.hpp"
+#include "uicontroler/ui_controler.hpp"
+namespace iflytop {
+
+class UIPublicState {
+ private:
+  /* data */
+ public:
+
+};
+
+}  // namespace iflytop

usrc/uicontroler/page/UIPageInit.cpp

@@ -1,13 +0,0 @@
-#include "uappbase/base.hpp"
-#define TAG "UIPageInit"
-
-namespace iflytop {
-
-extern void PageLoginInit();
-
-// void UIPageInit() {
-//   ZLOGI(TAG, "UIPageInit");
-//   PageLoginInit();
-// }
-
-}  // namespace iflytop

usrc/uicontroler/page/home/home_page.cpp → usrc/uicontroler/page/home_page.cpp

@@ -6,6 +6,8 @@
 //
 #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;
@@ -27,7 +29,7 @@ class HomePage : public IPageProcesser {
  private:
   virtual void OnPageLoad(OnPageLoadContext* cxt) override {
     ZLOGI(TAG, "OnPageLoad");
-    UI::ins()->vis(ob_home_AcidState, 0);  // 隐藏酸液桶状态
+    UIControler::ins()->vis(ob_home_AcidState, 0);  // 隐藏酸液桶状态
     UIS->setTouchEnableState(ob_home_acidname0, 0);
     UIS->setTouchEnableState(ob_home_acidname1, 0);
     UIS->setTouchEnableState(ob_home_acidname2, 0);
@@ -51,6 +53,11 @@ class HomePage : public IPageProcesser {
   }
   virtual void OnButton(uint8_t bid, uint8_t val) override {
     ZLOGI(TAG, "OnButton bid:%d val:%d", bid, val);
+    if (PumpCtrlService::ins()->isWorking()) {
+      UIS->alert("工作中，请稍后再操作");
+      return;
+    }
+
     if (bid == ob_home_SelCH0) {
       setPumpSelectState(0, !GStateMgr::ins()->getPumpSelectState(0));
     } else if (bid == ob_home_SelCH1) {
@@ -59,6 +66,8 @@ class HomePage : public IPageProcesser {
       setPumpSelectState(2, !GStateMgr::ins()->getPumpSelectState(2));
     } else if (bid == ob_home_SelCH3) {
       setPumpSelectState(3, !GStateMgr::ins()->getPumpSelectState(3));
+    } else if (bid == ob_home_MenuButton) {
+      UIS->chpage(pg_navi);
     }
   }
   virtual void OnDoubleStateButton(uint8_t bid, uint8_t val) override {}
@@ -96,72 +105,72 @@ class HomePage : public IPageProcesser {
   void syncdate() {
     static zdate_t date;
     AppHal::rtc_get(&date);
-    UI::ins()->setrtc(&date);
+    UIControler::ins()->setrtc(&date);
   }
 
   void setPumpSelectState(uint8_t chIndex, bool state) {
     GStateMgr::ins()->setPumpSelectState(chIndex, state);
     if (chIndex == 0) {
-      UI::ins()->setPicturePicNum(pageId, ob_home_AcidCH0S, state ? ob_home_CHState1 : ob_home_CHState0);
+      UIControler::ins()->setPicturePicNum(pageId, ob_home_AcidCH0S, state ? ob_home_CHState1 : ob_home_CHState0);
     } else if (chIndex == 1) {
-      UI::ins()->setPicturePicNum(pageId, ob_home_AcidCH1S, state ? ob_home_CHState1 : ob_home_CHState0);
+      UIControler::ins()->setPicturePicNum(pageId, ob_home_AcidCH1S, state ? ob_home_CHState1 : ob_home_CHState0);
     } else if (chIndex == 2) {
-      UI::ins()->setPicturePicNum(pageId, ob_home_AcidCH2S, state ? ob_home_CHState1 : ob_home_CHState0);
+      UIControler::ins()->setPicturePicNum(pageId, ob_home_AcidCH2S, state ? ob_home_CHState1 : ob_home_CHState0);
     } else if (chIndex == 3) {
-      UI::ins()->setPicturePicNum(pageId, ob_home_AcidCH3S, state ? ob_home_CHState1 : ob_home_CHState0);
+      UIControler::ins()->setPicturePicNum(pageId, ob_home_AcidCH3S, state ? ob_home_CHState1 : ob_home_CHState0);
     }
   }
 
   void syncPumpSelectState() {
-    UI::ins()->setPicturePicNum(pageId, ob_home_AcidCH0S, GStateMgr::ins()->getPumpSelectState(0) ? ob_home_CHState1 : ob_home_CHState0);
-    UI::ins()->setPicturePicNum(pageId, ob_home_AcidCH1S, GStateMgr::ins()->getPumpSelectState(1) ? ob_home_CHState1 : ob_home_CHState0);
-    UI::ins()->setPicturePicNum(pageId, ob_home_AcidCH2S, GStateMgr::ins()->getPumpSelectState(2) ? ob_home_CHState1 : ob_home_CHState0);
-    UI::ins()->setPicturePicNum(pageId, ob_home_AcidCH3S, GStateMgr::ins()->getPumpSelectState(3) ? ob_home_CHState1 : ob_home_CHState0);
+    UIControler::ins()->setPicturePicNum(pageId, ob_home_AcidCH0S, GStateMgr::ins()->getPumpSelectState(0) ? ob_home_CHState1 : ob_home_CHState0);
+    UIControler::ins()->setPicturePicNum(pageId, ob_home_AcidCH1S, GStateMgr::ins()->getPumpSelectState(1) ? ob_home_CHState1 : ob_home_CHState0);
+    UIControler::ins()->setPicturePicNum(pageId, ob_home_AcidCH2S, GStateMgr::ins()->getPumpSelectState(2) ? ob_home_CHState1 : ob_home_CHState0);
+    UIControler::ins()->setPicturePicNum(pageId, ob_home_AcidCH3S, GStateMgr::ins()->getPumpSelectState(3) ? ob_home_CHState1 : ob_home_CHState0);
   }
 
   void syncAcidName() {
-    UI::ins()->setTxt(pageId, ob_home_acidname0, AcidChCfgDao::getCfg(0)->acidChooseName);
-    UI::ins()->setTxt(pageId, ob_home_acidname1, AcidChCfgDao::getCfg(1)->acidChooseName);
-    UI::ins()->setTxt(pageId, ob_home_acidname2, AcidChCfgDao::getCfg(2)->acidChooseName);
-    UI::ins()->setTxt(pageId, ob_home_acidname3, AcidChCfgDao::getCfg(3)->acidChooseName);
+    UIControler::ins()->setTxt(pageId, ob_home_acidname0, AcidChCfgDao::getCfg(0)->acidChooseName);
+    UIControler::ins()->setTxt(pageId, ob_home_acidname1, AcidChCfgDao::getCfg(1)->acidChooseName);
+    UIControler::ins()->setTxt(pageId, ob_home_acidname2, AcidChCfgDao::getCfg(2)->acidChooseName);
+    UIControler::ins()->setTxt(pageId, ob_home_acidname3, AcidChCfgDao::getCfg(3)->acidChooseName);
   }
 
   void syncAcidEachDistriVal() {
-    UI::ins()->setTxt(pageId, ob_home_acideval0, "%.1f", AcidChCfgDao::getCfg(0)->acidEachDistriVal);
-    UI::ins()->setTxt(pageId, ob_home_acideval1, "%.1f", AcidChCfgDao::getCfg(1)->acidEachDistriVal);
-    UI::ins()->setTxt(pageId, ob_home_acideval2, "%.1f", AcidChCfgDao::getCfg(2)->acidEachDistriVal);
-    UI::ins()->setTxt(pageId, ob_home_acideval3, "%.1f", AcidChCfgDao::getCfg(3)->acidEachDistriVal);
+    UIControler::ins()->setTxt(pageId, ob_home_acideval0, "%.1f", AcidChCfgDao::getCfg(0)->acidEachDistriVal);
+    UIControler::ins()->setTxt(pageId, ob_home_acideval1, "%.1f", AcidChCfgDao::getCfg(1)->acidEachDistriVal);
+    UIControler::ins()->setTxt(pageId, ob_home_acideval2, "%.1f", AcidChCfgDao::getCfg(2)->acidEachDistriVal);
+    UIControler::ins()->setTxt(pageId, ob_home_acideval3, "%.1f", AcidChCfgDao::getCfg(3)->acidEachDistriVal);
   }
 
   void syncStat() {
     // StatUsedC
-    UI::ins()->setTxt(pageId, ob_home_StatRmidCH0, "%.1f", GStateMgr::ins()->getAcidRemain(0));
-    UI::ins()->setTxt(pageId, ob_home_StatRmidCH1, "%.1f", GStateMgr::ins()->getAcidRemain(1));
-    UI::ins()->setTxt(pageId, ob_home_StatRmidCH2, "%.1f", GStateMgr::ins()->getAcidRemain(2));
-    UI::ins()->setTxt(pageId, ob_home_StatRmidCH3, "%.1f", GStateMgr::ins()->getAcidRemain(3));
-    UI::ins()->setTxt(pageId, ob_home_StatUsedCH0, "%.1f", GStateMgr::ins()->getAcidUsed(0));
-    UI::ins()->setTxt(pageId, ob_home_StatUsedCH1, "%.1f", GStateMgr::ins()->getAcidUsed(1));
-    UI::ins()->setTxt(pageId, ob_home_StatUsedCH2, "%.1f", GStateMgr::ins()->getAcidUsed(2));
-    UI::ins()->setTxt(pageId, ob_home_StatUsedCH3, "%.1f", GStateMgr::ins()->getAcidUsed(3));
+    UIControler::ins()->setTxt(pageId, ob_home_StatRmidCH0, "%.1f", GStateMgr::ins()->getAcidRemain(0));
+    UIControler::ins()->setTxt(pageId, ob_home_StatRmidCH1, "%.1f", GStateMgr::ins()->getAcidRemain(1));
+    UIControler::ins()->setTxt(pageId, ob_home_StatRmidCH2, "%.1f", GStateMgr::ins()->getAcidRemain(2));
+    UIControler::ins()->setTxt(pageId, ob_home_StatRmidCH3, "%.1f", GStateMgr::ins()->getAcidRemain(3));
+    UIControler::ins()->setTxt(pageId, ob_home_StatUsedCH0, "%.1f", GStateMgr::ins()->getAcidUsed(0));
+    UIControler::ins()->setTxt(pageId, ob_home_StatUsedCH1, "%.1f", GStateMgr::ins()->getAcidUsed(1));
+    UIControler::ins()->setTxt(pageId, ob_home_StatUsedCH2, "%.1f", GStateMgr::ins()->getAcidUsed(2));
+    UIControler::ins()->setTxt(pageId, ob_home_StatUsedCH3, "%.1f", GStateMgr::ins()->getAcidUsed(3));
   }
 
   void syncMode() {
     auto nowMode = GStateMgr::ins()->getRunMode();
     if (nowMode == khand_acid_m_jog_mode) {
-      UI::ins()->setPicturePicNum(pageId, ob_home_RunMode, ob_home_RunMode1);
-      UI::ins()->setTxt(pageId, ob_home_RunModeVal, "", DeviceSettingDao::get()->distrIntervalS);
+      UIControler::ins()->setPicturePicNum(pageId, ob_home_RunMode, ob_home_RunMode1);
+      UIControler::ins()->setTxt(pageId, ob_home_RunModeVal, "", DeviceSettingDao::get()->distrIntervalS);
     } else if (nowMode == khand_acid_m_continuous_mode) {
-      UI::ins()->setPicturePicNum(pageId, ob_home_RunMode, ob_home_RunMode0);
-      UI::ins()->setTxt(pageId, ob_home_RunModeVal, "%.1f", DeviceSettingDao::get()->distrIntervalS);
+      UIControler::ins()->setPicturePicNum(pageId, ob_home_RunMode, ob_home_RunMode0);
+      UIControler::ins()->setTxt(pageId, ob_home_RunModeVal, "%.1f", DeviceSettingDao::get()->distrIntervalS);
     }
   }
 
   void syncBleState() {
     bool bleIsConnected = GStateMgr::ins()->getRemoterS();
     if (bleIsConnected) {
-      UI::ins()->setPicturePicNum(pageId, ob_home_RemoterS, ob_home_RemoterS1);
+      UIControler::ins()->setPicturePicNum(pageId, ob_home_RemoterS, ob_home_RemoterS1);
     } else {
-      UI::ins()->setPicturePicNum(pageId, ob_home_RemoterS, ob_home_RemoterS0);
+      UIControler::ins()->setPicturePicNum(pageId, ob_home_RemoterS, ob_home_RemoterS0);
     }
   }
 };

usrc/uicontroler/page/login/login_page.cpp → usrc/uicontroler/page/login_page.cpp

@@ -51,7 +51,7 @@ class LoginPage : public IPageProcesser {
       ZLOGI(TAG, "login  %s success", userName);
 
       AppEventBus::ins()->pushSimpleEvent(kAE_LoginEvent);
-      UI::ins()->chpage(pg_home);
+      UIControler::ins()->chpage(pg_home);
       resetPage();
     }
   }

usrc/uicontroler/page/navi_page.cpp

@@ -0,0 +1,38 @@
+
+#include "db/dao/user_dao.hpp"
+#include "ui/ui.h"
+#include "uicontroler/base/page_processer.hpp"
+namespace iflytop {
+using namespace std;
+#define TAG "NaviPage"
+
+class NaviPage : public IPageProcesser {
+ private:
+  char userName[20] = {0};
+  char passwd[20]   = {0};
+
+ public:
+  NaviPage() : IPageProcesser(TAG, pg_login) {}
+
+  virtual void initialize() override {
+    IPageProcesser::initialize();
+    syncState();
+  }
+
+ private:
+  virtual void OnPageLoad(OnPageLoadContext* cxt) override {}
+  virtual void OnBackKey(OnPageLoadContext* cxt) override {}
+  virtual void OnInputFieldContentChange(uint8_t bid, const char* text) override {}
+  virtual void OnButton(uint8_t bid, uint8_t val) override {}
+  virtual void OnDoubleStateButton(uint8_t bid, uint8_t val) override {}
+  virtual void OnAppEvent(AppEvent_t* event) override {}
+
+ private:
+  void syncState() {}
+};
+
+// ʵÀý»¯LoginPage, ʹÆä×Ô¶¯×¢²á
+static NaviPage instance;
+}  // namespace iflytop
+
+// kpt_sys_event_page_id

usrc/uicontroler/pagerouter/page_bak_router.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include "apphardware/apphardware.hpp"
 #include "uappbase/base.hpp"
-#include "uicontroler/front_end_controler.hpp"
+#include "uicontroler/ui_controler.hpp"
 #include "config/config.hpp"
 namespace iflytop {
 int getBakPage(int nowPage);

usrc/uicontroler/front_end_controler.cpp → usrc/uicontroler/ui_controler.cpp

@@ -1,4 +1,4 @@
-#include "front_end_controler.hpp"
+#include "ui_controler.hpp"
 
 #include <stdarg.h>
 #include <stdio.h>
@@ -31,7 +31,7 @@ static const char* zhex2str(uint8_t* data, size_t len) {
   return buf;
 }
 
-void UI::initialize() {  //
+void UIControler::initialize() {  //
   ackQueue.initialize(5, sizeof(tjc_rx_packet_t));
   eventQueue.initialize(5, sizeof(tjc_rx_packet_t));
   usartRxThread.init("usartRxThread", 1024);
@@ -41,7 +41,7 @@ void UI::initialize() {  //
   m_cmdlock.init();
 }
 #define UART_RX_OVERTIME 5
-void UI::startSchedule() {
+void UIControler::startSchedule() {
   usartRxThread.start([this]() {
     static uint8_t rxbuf[128];
     tjcUart->USR_UartITRxing     = 1;
@@ -116,7 +116,7 @@ void UI::startSchedule() {
   });
 }
 
-void UI::processScreenRxPacket(uint8_t* data, size_t len) {
+void UIControler::processScreenRxPacket(uint8_t* data, size_t len) {
   // 判断包是否合法
 #if MODULE_DEBUG
   ZLOGI(TAG, "[rx-thread] : rx :%s(%d)", zhex2str(data, len), len);
@@ -164,7 +164,7 @@ static const char* zcpystr(char* cpyto, const char* strbegin, int32_t maxlen) {
   }
   return NULL;
 }
-void UI::processUsrButtonEvent(uint8_t* data, size_t len) {
+void UIControler::processUsrButtonEvent(uint8_t* data, size_t len) {
   /**
    * @brief
    * 指令格式:
@@ -186,7 +186,7 @@ void UI::processUsrButtonEvent(uint8_t* data, size_t len) {
 
   callUsrEventCb(&event_cache);
 }
-void UI::processUsrDoubleStateButtonEvent(uint8_t* data, size_t len) {
+void UIControler::processUsrDoubleStateButtonEvent(uint8_t* data, size_t len) {
   /**
    * @brief
    * 指令格式:
@@ -210,14 +210,14 @@ void UI::processUsrDoubleStateButtonEvent(uint8_t* data, size_t len) {
 
   callUsrEventCb(&event_cache);
 }
-void UI::callUsrEventCb(tjc::UIEvent* event) {
+void UIControler::callUsrEventCb(tjc::UIEvent* event) {
   static AppEvent_t appEvent;
   appEvent.type = KAE_UIEvent;
   memcpy(&appEvent.d.uiEvent, event, sizeof(tjc::UIEvent));
   AppEventBus::ins()->pushEvent(appEvent);
 }
 
-void UI::processInputfieldContentChangeEvent0(uint8_t* data, size_t len) {
+void UIControler::processInputfieldContentChangeEvent0(uint8_t* data, size_t len) {
   /**
    * @brief
    *
@@ -240,7 +240,7 @@ void UI::processInputfieldContentChangeEvent0(uint8_t* data, size_t len) {
   callUsrEventCb(&event_cache);
 }
 
-void UI::processInputfieldContentChangeEvent1(uint8_t* data, size_t len) {
+void UIControler::processInputfieldContentChangeEvent1(uint8_t* data, size_t len) {
   /**
    * @brief
    *
@@ -266,7 +266,7 @@ void UI::processInputfieldContentChangeEvent1(uint8_t* data, size_t len) {
   callUsrEventCb(&event_cache);
 }
 
-bool UI::readTxt(uint8_t pid, uint8_t cId, char* txt, int32_t txtbuflen) {
+bool UIControler::readTxt(uint8_t pid, uint8_t cId, char* txt, int32_t txtbuflen) {
   zlock_guard lg(m_cmdlock);
 
   startReceiveAck();
@@ -290,7 +290,7 @@ bool UI::readTxt(uint8_t pid, uint8_t cId, char* txt, int32_t txtbuflen) {
   memcpy(txt, &ackcache.data[1], cpysize);
   return true;
 }
-bool UI::readInt(uint8_t pid, uint8_t cId, int32_t* val) {
+bool UIControler::readInt(uint8_t pid, uint8_t cId, int32_t* val) {
   zlock_guard lg(m_cmdlock);
 
   startReceiveAck();
@@ -312,7 +312,7 @@ bool UI::readInt(uint8_t pid, uint8_t cId, int32_t* val) {
   return true;
 }
 
-bool UI::echo(uint8_t tx, uint8_t* rx) {
+bool UIControler::echo(uint8_t tx, uint8_t* rx) {
   zlock_guard lg(m_cmdlock);
 
   startReceiveAck();
@@ -339,7 +339,7 @@ bool UI::echo(uint8_t tx, uint8_t* rx) {
   return true;
 }
 
-bool UI::setTxt(uint8_t pid, uint8_t bid, const char* txt, ...) {
+bool UIControler::setTxt(uint8_t pid, uint8_t bid, const char* txt, ...) {
   zlock_guard lg(m_cmdlock);
 
   va_list args;
@@ -352,28 +352,28 @@ bool UI::setTxt(uint8_t pid, uint8_t bid, const char* txt, ...) {
   return true;
 }
 
-void UI::setPicturePicNum(uint8_t pid, uint8_t bid, uint8_t fromBid) {
+void UIControler::setPicturePicNum(uint8_t pid, uint8_t bid, uint8_t fromBid) {
   zlock_guard lg(m_cmdlock);
   sendcmd("p[%d].b[%d].pic=p[%d].b[%d].pic", pid, bid, pid, fromBid);
 }
-void UI::setButtonPicNum(uint8_t pid, uint8_t bid, uint8_t fromBid) {
+void UIControler::setButtonPicNum(uint8_t pid, uint8_t bid, uint8_t fromBid) {
   zlock_guard lg(m_cmdlock);
   sendcmd("p[%d].b[%d].pic=p[%d].b[%d].pic", pid, bid, pid, fromBid);
   sendcmd("p[%d].b[%d].pic2=p[%d].b[%d].pic2", pid, bid, pid, fromBid);
 }
 
-bool UI::setVal(uint8_t pid, uint8_t cid, int32_t val) {
+bool UIControler::setVal(uint8_t pid, uint8_t cid, int32_t val) {
   zlock_guard lg(m_cmdlock);
   sendcmd("p[%d].b[%d].val=%d", pid, cid, val);
   return true;
 }
-bool UI::vis(uint16_t buuid, int32_t val) {
+bool UIControler::vis(uint16_t buuid, int32_t val) {
   zlock_guard lg(m_cmdlock);
   sendcmd("vis %d,%d", buuid & 0xff, val);
   return true;
 }
 
-void UI::setrtc(zdate_t* date) {
+void UIControler::setrtc(zdate_t* date) {
   zlock_guard lg(m_cmdlock);
   sendcmd("rtc0=%d", date->year);
   sendcmd("rtc1=%d", date->month);
@@ -383,7 +383,7 @@ void UI::setrtc(zdate_t* date) {
   sendcmd("rtc5=%d", date->seconds);
 }
 
-void UI::alert(const char* info, function<void(bool)> onConfirm) {
+void UIControler::alert(const char* info, function<void(bool)> onConfirm) {
   zlock_guard lg(m_cmdlock);
   // if (m_isInPopWin) {
   //   ZLOGE(TAG, "isInPopWin,alert failed");
@@ -398,7 +398,7 @@ void UI::alert(const char* info, function<void(bool)> onConfirm) {
   // sendcmd("p[%d].b[%d].txt=\"%s\"", pg_alert, ob_alert_info, buf);
   // sendcmd("page alert");
 }
-void UI::alertNoConfirm(const char* info) {
+void UIControler::alertNoConfirm(const char* info) {
   zlock_guard lg(m_cmdlock);
   // if (m_isInPopWin) {
   //   ZLOGE(TAG, "isInPopWin,alertNoConfirm failed");
@@ -414,7 +414,7 @@ void UI::alertNoConfirm(const char* info) {
   // vis(ob_alert_confirmkey, 0);
 }
 
-void UI::confirmNoCancle(const char* info, function<void(bool)> onConfirm) {
+void UIControler::confirmNoCancle(const char* info, function<void(bool)> onConfirm) {
   zlock_guard lg(m_cmdlock);
   // if (m_isInPopWin) {
   //   ZLOGE(TAG, "isInPopWin,confirmNoCancle failed");
@@ -432,7 +432,7 @@ void UI::confirmNoCancle(const char* info, function<void(bool)> onConfirm) {
   // vis(ob_confirm_canclekey, 0);
 }
 
-void UI::confirm(const char* info, function<void(bool)> onConfirm) {
+void UIControler::confirm(const char* info, function<void(bool)> onConfirm) {
   zlock_guard lg(m_cmdlock);
   // if (m_isInPopWin) {
   //   ZLOGE(TAG, "isInPopWin,confirm failed");
@@ -449,9 +449,9 @@ void UI::confirm(const char* info, function<void(bool)> onConfirm) {
   // vis(ob_confirm_canclekey, 1);
 }
 
-void UI::chpage(uint8_t page) { sendcmd("page %d", page); }
-// void UI::bakpage() { sendcmd("page %d", m_lastPage); }
-void UI::sendcmd(const char* format, ...) {
+void UIControler::chpage(uint8_t page) { sendcmd("page %d", page); }
+// void UIControler::bakpage() { sendcmd("page %d", m_lastPage); }
+void UIControler::sendcmd(const char* format, ...) {
   static char buf[128];
   va_list     args;
   va_start(args, format);
@@ -477,31 +477,31 @@ void UI::sendcmd(const char* format, ...) {
   }
 }
 
-void UI::startReceiveAck() {
+void UIControler::startReceiveAck() {
   ackQueue.clear();
   m_isWaitingForAck = true;
 }
 
-void UI::virtualClick(uint8_t pid, uint8_t bid, uint8_t event) {
+void UIControler::virtualClick(uint8_t pid, uint8_t bid, uint8_t event) {
   zlock_guard lg(m_cmdlock);
   sendcmd("click b[%d],%d", bid, event);
 }
 
-void UI::setTouchEnableState(uint8_t bid, uint8_t enable) {
+void UIControler::setTouchEnableState(uint8_t bid, uint8_t enable) {
   // tsw obj,state
   zlock_guard lg(m_cmdlock);
   sendcmd("tsw b[%d],%d", bid, enable);
 }
 
-void UI::setEnumComponentState(uint8_t pid, uint8_t bid, int32_t state) {
+void UIControler::setEnumComponentState(uint8_t pid, uint8_t bid, int32_t state) {
   // 枚举类型使用动画组件
   sendcmd("p[%d].b[%d].tim=%d", pid, bid, state * 50);
 }
-void UI::setPic(uint8_t pid, uint8_t bid, int32_t picNum) { sendcmd("p[%d].b[%d].pic=%d", pid, bid, picNum); }
+void UIControler::setPic(uint8_t pid, uint8_t bid, int32_t picNum) { sendcmd("p[%d].b[%d].pic=%d", pid, bid, picNum); }
 
-void UI::setAph(uint8_t pid, uint8_t bid, int32_t state) { sendcmd("p[%d].b[%d].aph=%d", pid, bid, state); }
+void UIControler::setAph(uint8_t pid, uint8_t bid, int32_t state) { sendcmd("p[%d].b[%d].aph=%d", pid, bid, state); }
 
-void UI::pageInit() { UIPageInit(); }
+void UIControler::pageInit() { UIPageInit(); }
 
 namespace iflytop {
 __weak void UIPageInit() {}

usrc/uicontroler/front_end_controler.hpp → usrc/uicontroler/ui_controler.hpp

@@ -12,8 +12,8 @@ typedef struct {
   uint16_t datalen;
 } tjc_rx_packet_t;
 
-#define UIS UI::ins()
-class UI {
+#define UIS UIControler::ins()
+class UIControler {
   ZThread m_thread;
 
   tjc_rx_packet_t ackcache;
@@ -25,11 +25,11 @@ class UI {
   int32_t m_lastPage = 0;
 
  public:
-  UI() {};
-  ~UI() {};
+  UIControler() {};
+  ~UIControler() {};
 
-  static UI* ins() {
-    static UI instance;
+  static UIControler* ins() {
+    static UIControler instance;
     return &instance;
   }