From a3ea0d44dfbaea0aae84223b8e27f2038f2cfa97 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Mon, 11 Sep 2023 10:43:45 +0800
Subject: [PATCH] fix some bug

---
 src/service/data_export_service.cpp       |  7 ++++++-
 src/service/device_io_control_service.cpp | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/service/data_export_service.cpp b/src/service/data_export_service.cpp
index 77338c7..ca7c83f 100644
--- a/src/service/data_export_service.cpp
+++ b/src/service/data_export_service.cpp
@@ -18,8 +18,13 @@ bool DataExportService::isDetectedUDisk(string& diskpath) {
     string dev = fmt::format("/dev/sd{}", (char)('a' + i));
     logger->info("check dev: {}", dev);
     if (access(dev.c_str(), F_OK) == 0) {
+      string subdev = fmt::format("/dev/sd{}1", (char)('a' + i));
+      if (access(subdev.c_str(), F_OK) == 0) {
+        diskpath = subdev;
+      } else {
+        diskpath = dev;
+      }
       m_ismounted = true;
-      diskpath    = dev;
       return true;
     }
   }
diff --git a/src/service/device_io_control_service.cpp b/src/service/device_io_control_service.cpp
index 4d0b23a..faa2604 100644
--- a/src/service/device_io_control_service.cpp
+++ b/src/service/device_io_control_service.cpp
@@ -274,6 +274,21 @@ DeviceIoControlService::h2o2sensor_data_t DeviceIoControlService::getH2O2SenSorD
   data.temp       = m_hpp272_data_1.temperature1 / 100;
   data.saturation = m_hpp272_data_1.h2o_h2o2_rs / 100;
 
+  /**
+   * @brief 
+   * TODO:传感器未初始化完成时，除了温度外，读取到的数据都是小于零，这里做了一个简单的处理，后续需要修改
+   * 
+   */
+  if (data.h2o2 < 0) {
+    data.h2o2 = 0;
+  }
+  if (data.humid < 0) {
+    data.humid = 0;
+  }
+  if (data.saturation < 0) {
+    data.saturation = 0;
+  }
+
   return data;
 }