v1.2.4

README.md

@@ -86,6 +86,9 @@ VERSION 1.2.2
 
 VERSION 1.2.3
     1. 所有应用服务添加状态主动上报接口
+
+VERSION 1.2.4
+    1. fix some bug
     
 TODO:
     1.添加用户增加用户查重检查

appsrc/appsetting/project_port/basic/zappversion.hpp

@@ -1,3 +1,3 @@
 #pragma once
-#define VERSION      "1.2.3"
+#define VERSION      "1.2.4"
 #define PROJECT_NAME "TRANSMIT_DM"

appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.hpp

@@ -85,11 +85,18 @@ class DisinfectionCtrlService : public enable_shared_from_this<DisinfectionCtrlS
   void updateCfg();
   void updateTargetLogLevel(float loglevel);
 
-  map<string, string>&               getRealtimeCfg() { return m_realtimeCfg; }
-  DisinfectionState                  getState() { return sm.getState(); }
-  int                                getCurStateRemainTimeS() { return s_remaintime; }
-  float                              getTlog() { return m_tlog; }
-  float                              getNlog() { return s_nlog; }
+  map<string, string>& getRealtimeCfg() { return m_realtimeCfg; }
+  DisinfectionState    getState() { return sm.getState(); }
+  int                  getCurStateRemainTimeS() { return s_remaintime; }
+  float                getTlog() { return m_tlog; }
+  float                getNlog() { return s_nlog; }
+  int                  getInjectedVelocity() {
+    if (sm.getState() == DisinfectionState::disinfection && !s_isDisinfectionTakeBreak) {
+      return getSettingAsInt(SettingId::injection_pump_speed);
+    }
+    return 0;
+  }
+
   shared_ptr<H2O2SensorDataSnapshot> getH2O2Snapshot() { return dics->getH2O2SensorMgr()->takeSnapshot(); }
 
  private:

appsrc/service/app/disinfection_ctrl_service_ext.cpp

@@ -101,6 +101,7 @@ json DisinfectionCtrlServiceExt::getState(DisinfectionState& state) {
   rely["curStateRemainTimeS"] = dcs->getCurStateRemainTimeS();
   rely["tlog"]                = dcs->getTlog();
   rely["nlog"]                = dcs->getNlog();
+  rely["injectedVelocity"]    = dcs->getInjectedVelocity();
 
   auto h2o2 = dcs->getH2O2Snapshot();
 
@@ -134,7 +135,7 @@ void DisinfectionCtrlServiceExt::startStateReport(shared_ptr<MsgProcessContext>
       DisinfectionState state;
       json              report = getState(state);
       SEND_CLASS_REPORT(thisClass.className, "stateUpdate", report);
-      ThisThread().sleepForMs(900);
+      ThisThread().sleepForMs(500);
     }
   }));
 }

appsrc/service/app/drain_liquid_service.cpp

@@ -1,6 +1,6 @@
 #include "drain_liquid_service.hpp"
 using namespace iflytop;
-#define DRAINLIQUID_EXT_TIME_S 30
+#define DRAINLIQUID_EXT_TIME_S 50
 
 void DrainLiquidService::initialize() {
   logger->info("DrainLiquidService initialize");
@@ -102,6 +102,7 @@ void DrainLiquidService::workThread() {
 
   zsteady_tp volumeReachZeroTime;
   bool       volumeReachZeroFlag = false;
+  bool       sprayPumpStopflag   = false;
 
   while (!thisThread.getExitFlag()) {
     int32_t nowvolume = m_dwus->getWeight();
@@ -116,6 +117,11 @@ void DrainLiquidService::workThread() {
       break;
     }
 
+    if (!sprayPumpStopflag && zsteady_clock().elapsedTimeS(startdrainingtime) > 60) {
+      sprayPumpStopflag = true;
+      m_dics->SprayPump_stop();
+    }
+
     if (volumeReachZeroFlag) {
       logger->info("stopDraining after {} s", DRAINLIQUID_EXT_TIME_S - zsteady_clock().elapsedTimeS(volumeReachZeroTime));
       if (zsteady_clock().elapsedTimeS(volumeReachZeroTime) > DRAINLIQUID_EXT_TIME_S) {

appsrc/service/hardware/disinfectant_weight_update_service.cpp

@@ -53,7 +53,7 @@ void DisinfectantWeightUpdateService::updateWeightThread() {
     try {
       float pa = deviceIoControlService->LiquidWeightPS_readPa();
       pa       = filter.filter(pa);
-      pa       = pa - 280;
+      pa       = pa - 50;
       if (pa < 0) {
         pa = 0;
       }

appsrc/service/test_page_mgr_service.cpp

@@ -73,8 +73,12 @@ void TestPageMgrService::initialize() {
                                                               [this](string buttonName, vector<string> param) {  //
                                                                 logger->info("on AddDischargePumpCtrl.{}", buttonName);
                                                                 if (buttonName == "addingLiquid") {
+                                                                  dcs->AddLiquidPump_stop();
+                                                                  usleep(100 * 1000);
                                                                   dcs->AddLiquidPump_addLiquid();
                                                                 } else if (buttonName == "drainLiquid") {
+                                                                  dcs->AddLiquidPump_stop();
+                                                                  usleep(100 * 1000);
                                                                   dcs->AddLiquidPump_drainLiquid();
                                                                 } else {
                                                                   dcs->AddLiquidPump_stop();