添加高级设置页面

ui/ui.h

@@ -179,11 +179,28 @@
 #define ob_changePasswd_oldPwd          8
 //muSettings.objs
 #define ob_muSettings_muSettings        0
-#define ob_muSettings_t0                1
-#define ob_muSettings_t1                2
-#define ob_muSettings_bak               3
-#define ob_muSettings_stAcidInte        4
-#define ob_muSettings_t2                5
+#define ob_muSettings_irunTil           1
+#define ob_muSettings_bak               2
+#define ob_muSettings_irun0             3
+#define ob_muSettings_pageTitle         4
+#define ob_muSettings_irun1             5
+#define ob_muSettings_irun2             6
+#define ob_muSettings_irun3             7
+#define ob_muSettings_pumpCoefTil       8
+#define ob_muSettings_pumpCoef0         9
+#define ob_muSettings_pumpCoef1         10
+#define ob_muSettings_pumpCoef2         11
+#define ob_muSettings_pumpCoef3         12
+#define ob_muSettings_pipeLenTil        13
+#define ob_muSettings_pipeLen0          14
+#define ob_muSettings_pipeLen1          15
+#define ob_muSettings_pipeLen2          16
+#define ob_muSettings_pipeLen3          17
+#define ob_muSettings_addAcidVelTil     18
+#define ob_muSettings_addAcidVel        19
+#define ob_muSettings_bleCliTil         20
+#define ob_muSettings_bleCliName        21
+#define ob_muSettings_bleScan           22
 //muDeviceInfo.objs
 #define ob_muDeviceInfo_muDeviceInfo    0
 #define ob_muDeviceInfo_bak             1

usrc/service/app_core.cpp

@@ -87,7 +87,7 @@ void AppCore::appsetup() {
   Page_menu::ins()->initialize();
   Page_muInterval::ins()->initialize();
   Page_changePasswd::ins()->initialize();
-
+  Page_muSettings::ins()->initialize();
   // EventProcesser
 
   RemoteControlerEventProcesser::ins()->initialize();

usrc/service/front_end_controler.hpp

@@ -61,14 +61,14 @@ class FrontEndControler {
   bool setVal(uint8_t pid, uint8_t bid, const char* txt, ...);
   bool setVal(uint8_t pid, uint8_t bid, int32_t val);
 
-  bool setVal(uint16_t buuid, const char* txt) { return setVal(buuid >> 8, buuid & 0xff, txt); }
-  bool setVal(uint16_t buuid, int32_t val) { return setVal(buuid >> 8, buuid & 0xff, val); }
+  // bool setVal(uint16_t buuid, const char* txt) { return setVal(buuid >> 8, buuid & 0xff, txt); }
+  // bool setVal(uint16_t buuid, int32_t val) { return setVal(buuid >> 8, buuid & 0xff, val); }
 
-  bool vis(uint16_t buuid, int32_t val);  // 不支持跨页面隐藏
+  bool vis(uint16_t bid, int32_t val);  // 不支持跨页面隐藏
   // vis b0,0
 
-  bool readTxt(uint16_t buuid, char* txt, int32_t txtbuflen) { return readTxt(buuid >> 8, buuid & 0xff, txt, txtbuflen); }
-  bool readInt(uint16_t buuid, int32_t* val) { return readInt(buuid >> 8, buuid & 0xff, val); }
+  // bool readTxt(uint16_t buuid, char* txt, int32_t txtbuflen) { return readTxt(buuid >> 8, buuid & 0xff, txt, txtbuflen); }
+  // bool readInt(uint16_t buuid, int32_t* val) { return readInt(buuid >> 8, buuid & 0xff, val); }
 
   void alert(const char* info) { alert(info, nullptr); }
   void alertNoConfirm(const char* info);

usrc/service/page/Page_login.cpp

@@ -9,13 +9,13 @@ using namespace iflytop;
 #define TAG       "Page_login"
 static CfgItermCache cfgcache;
 
-#define EN_USR(i, enable)                                \
-  if (enable) {                                          \
-    UIS->setVal(UI_UUID(login, txtUser##i), usrName[i]); \
-    UIS->setVal(UI_UUID(login, uen##i), 1);              \
-  } else {                                               \
-    UIS->setVal(UI_UUID(login, txtUser##i), "");         \
-    UIS->setVal(UI_UUID(login, uen##i), (int32_t)0);     \
+#define EN_USR(i, enable)                           \
+  if (enable) {                                     \
+    UIS->setVal(PAGE, OBJ(txtUser##i), usrName[i]); \
+    UIS->setVal(PAGE, OBJ(uen##i), 1);              \
+  } else {                                          \
+    UIS->setVal(PAGE, OBJ(txtUser##i), "");         \
+    UIS->setVal(PAGE, OBJ(uen##i), (int32_t)0);     \
   }
 
 bool Page_login::isBelongThisPage(int page) { return page == PAGE; }

usrc/service/page/page.hpp

@@ -7,3 +7,4 @@
 #include "submenu/Page_changePasswd.hpp"
 #include "submenu/Page_muAcidType.hpp"
 #include "submenu/Page_muInterval.hpp"
+#include "submenu/Page_muSettings.hpp"

usrc/service/page/submenu/Page_muSettings.cpp

@@ -0,0 +1,43 @@
+#include "Page_muSettings.hpp"
+using namespace iflytop;
+
+/**
+ * @brief
+ *    ËáÀàÐÞ¸ÄÒ³Ãæ
+ */
+
+#define PAGE pg_muSettings
+#define TAG  "Page_muSettings"
+static CfgItermCache cfgcache;
+
+bool Page_muSettings::isBelongThisPage(int page) { return page == PAGE; }
+
+void Page_muSettings::OnPageLoad() {  //
+  UIS->setVal(PAGE, ob_muSettings_bleCliName, "testData");
+  UIS->setVal(PAGE, ob_muSettings_irun0, "1");
+  UIS->setVal(PAGE, ob_muSettings_irun1, "1");
+  UIS->setVal(PAGE, ob_muSettings_irun2, "1");
+  UIS->setVal(PAGE, ob_muSettings_irun3, "1");
+  UIS->setVal(PAGE, ob_muSettings_pumpCoef0, "1");
+  UIS->setVal(PAGE, ob_muSettings_pumpCoef1, "1");
+  UIS->setVal(PAGE, ob_muSettings_pumpCoef2, "1");
+  UIS->setVal(PAGE, ob_muSettings_pumpCoef3, "1");
+  UIS->setVal(PAGE, ob_muSettings_pipeLen0, "1");
+  UIS->setVal(PAGE, ob_muSettings_pipeLen1, "1");
+  UIS->setVal(PAGE, ob_muSettings_pipeLen2, "1");
+  UIS->setVal(PAGE, ob_muSettings_pipeLen3, "1");
+  UIS->setVal(PAGE, ob_muSettings_addAcidVel, "1");
+};
+
+void Page_muSettings::OnInputFieldContentChange(uint8_t bid, const char* text) { UIS->setVal(PAGE, bid, text); }
+void Page_muSettings::OnButton(uint8_t bid, uint8_t val) {
+  static CfgItermCache usrpasswdcache;
+  ZLOGI(TAG, "bid:%d", bid);
+  if (bid == ob_muSettings_bleScan) {
+    ZLOGI(TAG, "bleScan");
+  } else if (bid == ob_muSettings_bak) {
+    UIS->chpage(GSM->getMenuPage());
+  }
+};
+
+// muAcidType

usrc/service/page/submenu/Page_muSettings.hpp

@@ -0,0 +1,27 @@
+#pragma once
+//
+#include "../page_processer.hpp"
+namespace iflytop {
+using namespace std;
+// page: keybAcidCh
+class Page_muSettings : public IPageProcesser {
+ private:
+  /* data */
+
+ public:
+  static Page_muSettings* ins() {
+    static Page_muSettings instance;
+    return &instance;
+  }
+
+ private:
+  virtual bool isBelongThisPage(int page) override;
+
+  virtual void OnPageLoad() override;
+  virtual void OnInputFieldContentChange(uint8_t bid, const char* text) override;
+  virtual void OnButton(uint8_t bid, uint8_t val) override;
+
+ private:
+};
+
+}  // namespace iflytop