update

README.md

@@ -22,6 +22,8 @@ TODO:
     2. 添加恢复出厂设置按键，且恢复出厂设置按键按下后，需要根用户二次确认。
     3. 转换比设置错误可能到只泵机不转
     4. 修改muSetting名为 muAdvanced
+    5. 添加审计功能
+    6. 添加自动unlogin功能
 ```
 
 

ui/usrui.h

@@ -0,0 +1,4 @@
+#pragma once
+
+#define pic_jog_mode        34
+#define pic_continuous_mode 35

usrc/service/front_end_controler.cpp

@@ -112,14 +112,13 @@ void FrontEndControler::startSchedule() {
           ZLOGD(TAG, "page change from %d to %d frompoppage %d", m_lastPage, m_nowPage, m_isInPopWin);
 #endif
           m_isInPopWin = false;
-          
+
           callUsrEventCb(&event_cache);
           if (input_file_event_cache_state) {
             callUsrEventCb(&input_file_event_cache);
             input_file_event_cache_state = false;
           }
 
-
         } else if (tjc::kpt_on_promopt_page_load == packetType) {
           event_cache.eventId = packetType;
           event_cache.pid     = packet.data[1];
@@ -519,4 +518,6 @@ void FrontEndControler::setEnumComponentState(uint8_t pid, uint8_t bid, int32_t
   // ö¾ÙÀàÐÍʹÓö¯»­×é¼þ
   sendcmd("p[%d].b[%d].tim=%d", pid, bid, state * 50);
 }
+void FrontEndControler::setPic(uint8_t pid, uint8_t bid, int32_t picNum) { sendcmd("p[%d].b[%d].pic=%d", pid, bid, picNum); }
+
 void FrontEndControler::setAph(uint8_t pid, uint8_t bid, int32_t state) { sendcmd("p[%d].b[%d].aph=%d", pid, bid, state); }

usrc/service/front_end_controler.hpp

@@ -83,6 +83,8 @@ class FrontEndControler {
   void setTouchEnableState(uint8_t bid, uint8_t enable);
 
   void setEnumComponentState(uint8_t pid, uint8_t bid, int32_t state);
+  void setPic(uint8_t pid, uint8_t bid, int32_t picNum);
+
   void setAph(uint8_t pid, uint8_t bid, int32_t state);  // 组件透明度，最大127,设置为0则隐藏组件
   void sendcmd(const char* format, ...);
 

usrc/service/page/Page_login.cpp

@@ -70,6 +70,12 @@ void Page_login::OnLoginButtonClick(uint8_t bid, const char* userName, const cha
     UIS->alert("用户不存在");
     return;
   }
+  if(strlen(curUsrPasswd) == 0){
+    UIS->setTxt(PAGE, OBJ(txtPasswd), "");
+    UIS->alert("密码为空");
+    return;
+  }
+
   if (strcmp(curUsrPasswd, passwd) != 0) {
     UIS->setTxt(PAGE, OBJ(txtPasswd), "");
     UIS->alert("密码错误");

usrc/service/page/Page_main.cpp

@@ -1,6 +1,7 @@
 #include "Page_main.hpp"
 
 #include "service\pump_ctrl_service.hpp"
+#include "ui/usrui.h"
 using namespace iflytop;
 
 #define PAGE pg_main
@@ -28,6 +29,12 @@ static CfgItermCache cfgcache;
  */
 void Page_main::updateRunModeState() {
   // 更新底部状态栏
+  if ((int32_t)GSM->getRunMode() == khand_acid_m_jog_mode) {
+    UIS->setPic(PAGE, ob_main_RunMode, pic_jog_mode);
+  } else {
+    UIS->setPic(PAGE, ob_main_RunMode, pic_continuous_mode);
+  }
+
   UIS->setEnumComponentState(PAGE, ob_main_RunMode, (int32_t)GSM->getRunMode());  // 运行模式
   if (GSM->getRunMode() == khand_acid_m_jog_mode) {
     UIS->vis(ob_main_RunModeVal, 0);