From 1bffc800fd98e9160f5c132c24a2bd9bfda92690 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Thu, 23 May 2024 10:20:15 +0800
Subject: [PATCH] update

---
 iflytoplinuxsdk                              |  2 +-
 src/api/cmds/README.md                       | 51 ++++++++++++++++++++++++++++
 src/api/cmds/device_state_cmd_impl.cpp       |  6 ++--
 src/service/device_io_control_service.cpp    |  4 +--
 src/service/disinfection_printer_service.cpp |  1 +
 src/version.hpp                              |  2 +-
 6 files changed, 59 insertions(+), 7 deletions(-)
 create mode 100644 src/api/cmds/README.md

diff --git a/iflytoplinuxsdk b/iflytoplinuxsdk
index 3cd88d8..43c486c 160000
--- a/iflytoplinuxsdk
+++ b/iflytoplinuxsdk
@@ -1 +1 @@
-Subproject commit 3cd88d85f20ebc1f0cb337ab10d9023ad7531df3
+Subproject commit 43c486c1ba741a2a05ec8ceea934137f4c1dc70b
diff --git a/src/api/cmds/README.md b/src/api/cmds/README.md
new file mode 100644
index 0000000..8913881
--- /dev/null
+++ b/src/api/cmds/README.md
@@ -0,0 +1,51 @@
+```
+关键字段
+
+    command
+    messageId
+    ackcode             不为0,则为错误
+    ackcodeInfo
+    ackDisplayInfo      存在该字段则直接显示错误信息即可
+
+
+```
+
+
+弹窗相关指令
+```
+<!-- alert、confirm、prompt -->
+
+
+Report:(19002)
+{
+
+    "command":"AlertEvent",
+    "data":{
+        "alertContext":"UUID",
+        "dsiplayInfo":"显示信息"，
+        "alertEventId": 12 //暂时忽略不计
+    }
+}
+
+Command:(19001)
+{
+
+    "command":"AlertWindowsConfirm",
+    "params":{
+        "alertContext":"UUID"
+    }
+}
+
+{
+
+    "command":"selfTest_generateAlertEvent",
+    "params":{
+        "alertContext":"UUID",
+        "dsiplayInfo":"显示信息"，
+        "alertEventId": 12 //暂时忽略不计
+    }
+}
+
+
+
+```
\ No newline at end of file
diff --git a/src/api/cmds/device_state_cmd_impl.cpp b/src/api/cmds/device_state_cmd_impl.cpp
index 7b5b5b7..77a5289 100644
--- a/src/api/cmds/device_state_cmd_impl.cpp
+++ b/src/api/cmds/device_state_cmd_impl.cpp
@@ -38,15 +38,15 @@ json DeviceStateCmdImpl::createSensorDataJson() {
   report["h2o2_1"]       = m_deviceIoControlService->H2O2Sensor_readH2O2PPM(0);
   report["temp_1"]       = m_deviceIoControlService->H2O2Sensor_readTemperature(0);
   report["humid_1"]      = m_deviceIoControlService->H2O2Sensor_readHumid(0);
-  report["saturation_1"] = m_deviceIoControlService->H2O2Sensor_readSaturation(0) + 1;  //+1是为让曲线不重合
+  report["saturation_1"] = m_deviceIoControlService->H2O2Sensor_readSaturation(0);  //+1是为让曲线不重合
   report["h2o2_2"]       = m_deviceIoControlService->H2O2Sensor_readH2O2PPM(1);
   report["temp_2"]       = m_deviceIoControlService->H2O2Sensor_readTemperature(1);
   report["humid_2"]      = m_deviceIoControlService->H2O2Sensor_readHumid(1);
-  report["saturation_2"] = m_deviceIoControlService->H2O2Sensor_readSaturation(1) + 1;  //+1是为让曲线不重合
+  report["saturation_2"] = m_deviceIoControlService->H2O2Sensor_readSaturation(1);  //+1是为让曲线不重合
   report["h2o2_3"]       = m_deviceIoControlService->H2O2Sensor_readH2O2PPM(2);
   report["temp_3"]       = m_deviceIoControlService->H2O2Sensor_readTemperature(2);
   report["humid_3"]      = m_deviceIoControlService->H2O2Sensor_readHumid(2);
-  report["saturation_3"] = m_deviceIoControlService->H2O2Sensor_readSaturation(2) + 1;  //+1是为让曲线不重合
+  report["saturation_3"] = m_deviceIoControlService->H2O2Sensor_readSaturation(2);  //+1是为让曲线不重合
 
 #if (defined PROJECT_TYPE_PIPE_DISINFECTION)
 
diff --git a/src/service/device_io_control_service.cpp b/src/service/device_io_control_service.cpp
index 100c88e..594bec8 100644
--- a/src/service/device_io_control_service.cpp
+++ b/src/service/device_io_control_service.cpp
@@ -159,8 +159,8 @@ void DeviceIoControlService::startScan() {
       }
 
       if (i % 100 == 0) {
-        // m_zcanHost->readio(1, m_waterImmersionSensor1);
-        // m_zcanHost->readio(2, m_waterImmersionSensor2);
+        m_zcanHost->readio(1, m_waterImmersionSensor1);
+        m_zcanHost->readio(2, m_waterImmersionSensor2);
       }
     }
   }));
diff --git a/src/service/disinfection_printer_service.cpp b/src/service/disinfection_printer_service.cpp
index 274cca7..b2d0983 100644
--- a/src/service/disinfection_printer_service.cpp
+++ b/src/service/disinfection_printer_service.cpp
@@ -24,6 +24,7 @@ void DisinfectionPrinterService::initialize() {
         if (!tasks.empty()) {
           task = tasks.front();
           tasks.pop();
+          logger->info("pop task");
         }
       }
       if (!task) {
diff --git a/src/version.hpp b/src/version.hpp
index c681d56..d8b82e2 100644
--- a/src/version.hpp
+++ b/src/version.hpp
@@ -1,2 +1,2 @@
 #pragma once
-#define VERSION "2.2"
\ No newline at end of file
+#define VERSION "3.0"
\ No newline at end of file