健康数据：增加存储宏控制

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 1f3c2d4..586273d 100644 (file)
--- 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 d82e14a..562aa35 100644 (file)
--- 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 4aa5b9e..77271ca 100644 (file)
--- 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, "本次心率检测结束");\r
 }\r
 // 保存检测数据\r
-void HeartModel::Heart_Save() {\r
-\r
-  uint32_t timestamp = HeartResultPresenter::GetInstance()->GetCurrentTime();\r
-  SetCheckTime(timestamp);\r
-\r
-  //HealthService::GetInstance()->UpdateHealthData(data);\r
-\r
+void HeartModel::Heart_Save(){\r
+\r
+uint32_t timestamp = HeartResultPresenter::GetInstance()->GetCurrentTime();\r
+SetCheckTime(timestamp);\r
+#if MSG_SAVE_TEST\r
+  HeartRateData data;\r
+  data.Heart = currentheart;\r
+  data.timestamp = timestamp_ms;\r
+  HealthService::GetInstance()->UpdateHealthData(data);\r
+#else\r
   HealthService::GetInstance()->send_heart_save();\r
-\r
+#endif\r
   //WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "保存的心率数据：%d%ld", currentheart,data.timestamp);\r
 }\r
 \r