From dd236d8a23a08cfe94e67c7aeb938d10f1d1b808 Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Wed, 23 Oct 2024 14:57:31 +0800
Subject: [PATCH] =?utf8?q?=E5=81=A5=E5=BA=B7=E6=95=B0=E6=8D=AE=EF=BC=9A?=
 =?utf8?q?=E5=A2=9E=E5=8A=A0=E5=AD=98=E5=82=A8=E5=AE=8F=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../bloodoxygen/src/BloodOxygenModel.cpp      | 17 ++++++++++-------
 .../health_service/health_service.h           |  1 +
 .../nativeui/heartrate/src/HeartModel.cpp     | 19 +++++++++++--------
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenModel.cpp
index 1f3c2d484..586273d67 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenModel.cpp
@@ -142,13 +142,16 @@ namespace OHOS
     // 保存检测数据
     void BloodOxygenModel::Blood_Save()
     {
-
-         uint32_t timestamp = BloodResultPresenter::GetInstance()->GetCurrentTime();
-         SetCheckTime(timestamp);
-         
-        //HealthService::GetInstance()->UpdateHealthData(data);
-         HealthService::GetInstance()->send_blood_save();
-             
+        uint32_t timestamp = BloodResultPresenter::GetInstance()->GetCurrentTime();
+        SetCheckTime(timestamp);
+#if MSG_SAVE_TEST
+        BloodOxygenData data;
+        data.SPO2 = currentspo2;
+        data.timestamp = timestamp_ms;
+        HealthService::GetInstance()->UpdateHealthData(data);
+#else
+        HealthService::GetInstance()->send_blood_save();
+    #endif
     }
 
     // 显示检测结果// 显示检测结果
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.h b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.h
index d82e14a47..562aa350e 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.h
@@ -15,6 +15,7 @@
 #include <cstdint>
 
 #define HEART_MAX_POINTS 360
+#define MSG_SAVE_TEST 1
 namespace OHOS
 {
     const char *GET_HEALTH_JSON_PATH_C_STR_HEART();
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
index 4aa5b9e0d..77271cae5 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
@@ -502,15 +502,18 @@ void HeartModel::Heart_Stop() {
   WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "本次心率检测结束");
 }
 // 保存检测数据
-void HeartModel::Heart_Save() {
-
-  uint32_t timestamp = HeartResultPresenter::GetInstance()->GetCurrentTime();
-  SetCheckTime(timestamp);
-
-  //HealthService::GetInstance()->UpdateHealthData(data);
-
+void HeartModel::Heart_Save(){
+
+uint32_t timestamp = HeartResultPresenter::GetInstance()->GetCurrentTime();
+SetCheckTime(timestamp);
+#if MSG_SAVE_TEST
+  HeartRateData data;
+  data.Heart = currentheart;
+  data.timestamp = timestamp_ms;
+  HealthService::GetInstance()->UpdateHealthData(data);
+#else
   HealthService::GetInstance()->send_heart_save();
-
+#endif
   //WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "保存的心率数据：%d%ld", currentheart,data.timestamp);
 }
 
-- 
2.17.1