From 9e680df0e387cb9fd71fb2ab36f3124bc6e58dcd Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Tue, 8 Jul 2025 00:55:40 +0800
Subject: [PATCH] =?UTF-8?q?v3.1.2|=20=E6=B3=84=E9=9C=B2=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=9D=E5=A7=8B=E5=8E=8B=E5=8A=9B=E5=92=8C?=
 =?UTF-8?q?=E5=8E=8B=E5=B7=AE=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appsrc/appconfig/basic/zappversion.hpp      |  2 +-
 appsrc/service/app/air_leak_detect_test.cpp | 16 +++++++++++++---
 appsrc/service/app/air_leak_detect_test.hpp |  7 +++++--
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/appsrc/appconfig/basic/zappversion.hpp b/appsrc/appconfig/basic/zappversion.hpp
index 234144a..80b877c 100644
--- a/appsrc/appconfig/basic/zappversion.hpp
+++ b/appsrc/appconfig/basic/zappversion.hpp
@@ -1,3 +1,3 @@
 #pragma once
-#define VERSION      "3.1.1"
+#define VERSION      "3.1.2"
 #define PROJECT_NAME "TRANSMIT_DM"
\ No newline at end of file
diff --git a/appsrc/service/app/air_leak_detect_test.cpp b/appsrc/service/app/air_leak_detect_test.cpp
index cc57e35..1db5ec3 100644
--- a/appsrc/service/app/air_leak_detect_test.cpp
+++ b/appsrc/service/app/air_leak_detect_test.cpp
@@ -127,6 +127,7 @@ void AirLeakDetectTest::airLeakDetectTestThread(int inflationTimeMs) {
     m_workstate = kstabilizingPressure;
     for (int i = 0; i < leakTestStabilizationTimeS; ++i) {
       pressurePa = readPressurePa();
+
       thisThread.sleepForMs(1000);
       logger->info(" waiting for stabilizing pressure, current pressure: {} kPa", pressurePa / 1000.0);
       if (thisThread.getExitFlag()) {
@@ -139,9 +140,13 @@ void AirLeakDetectTest::airLeakDetectTestThread(int inflationTimeMs) {
   {
     // 检漏中
     logger->info("leak testing.....");
-    m_workstate = kleakTesting;
+    m_workstate       = kleakTesting;
+    pressurePa        = readPressurePa();
+    initialPressurePa = pressurePa;
+
     while (!thisThread.getExitFlag()) {
-      pressurePa = readPressurePa();
+      pressurePa     = readPressurePa();
+      diffPressurePa = pressurePa - initialPressurePa;
       thisThread.sleepForMs(1000);
     }
   }
@@ -188,12 +193,17 @@ void AirLeakDetectTest::stopStateReport(shared_ptr<MsgProcessContext> cxt) {}
 json AirLeakDetectTest::getState() {
   json state;
   if (getWorkstate() == kidle) {
-    pressurePa = readPressurePa();
+    pressurePa        = readPressurePa();
+    initialPressurePa = 0;
+    diffPressurePa    = 0;
   }
   state["pressure"]         = fmt::format("{:.2f}", pressurePa / 1000.0);
+  state["initialPressure"]  = fmt::format("{:.2f}", initialPressurePa / 1000.0);
+  state["diffPressurePa"]   = fmt::format("{:.2f}", diffPressurePa / 1000.0);
   state["workState"]        = state2str(getWorkstate());
   state["workStateDisplay"] = state2chstr(getWorkstate());
   return state;
 }
 
 float AirLeakDetectTest::readPressurePa() { return CalibrationInfoDao::ins()->acPressureSensorTare(m_dics->ACPostPS_readPa() / 1000.0) * 1000; }
+void  AirLeakDetectTest::updatePressure() { pressurePa = readPressurePa(); }
diff --git a/appsrc/service/app/air_leak_detect_test.hpp b/appsrc/service/app/air_leak_detect_test.hpp
index 0076621..f74189d 100644
--- a/appsrc/service/app/air_leak_detect_test.hpp
+++ b/appsrc/service/app/air_leak_detect_test.hpp
@@ -71,8 +71,10 @@ class AirLeakDetectTest : public enable_shared_from_this<AirLeakDetectTest> {
   unique_ptr<Thread> m_thread;
   unique_ptr<Thread> stateUpdateThread;
 
-  state_t m_workstate = kidle;
-  float   pressurePa  = 0;
+  state_t m_workstate       = kidle;
+  float   pressurePa        = 0;
+  float   initialPressurePa = 0;
+  float   diffPressurePa    = 0;
 
  public:
   void initialize();
@@ -91,6 +93,7 @@ class AirLeakDetectTest : public enable_shared_from_this<AirLeakDetectTest> {
   json getState();
 
   float readPressurePa();
+  void  updatePressure();
 
  private:
   void airLeakDetectTestThread(int inflationTimeMs);