From d359b2671e32db0dc67445564b718dac1903ee37 Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Fri, 28 Jun 2024 12:38:44 +0800
Subject: [PATCH] =?utf8?q?=E8=A1=A5=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../health_service/health_service.cpp         | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp
index 4f739bb37..cddf883c1 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp
@@ -226,9 +226,17 @@ namespace OHOS
         }
 
         cJSON *SPO2 = cJSON_GetObjectItemCaseSensitive(latestData, "value");
-
-        cJSON_ReplaceItemInObject(latestData, "value", cJSON_CreateNumber(data.SPO2));
-        cJSON_ReplaceItemInObject(latestData, "timestamp", cJSON_CreateNumber(data.timestamp));
+        if (SPO2 == nullptr && !cJSON_IsNumber(SPO2))
+        {
+            // Add spo2_latest_data
+            cJSON_AddItemToObject(latestData, "value", cJSON_CreateNumber(data.SPO2));
+            cJSON_AddItemToObject(latestData, "timestamp", cJSON_CreateNumber(data.timestamp));
+        }
+        else
+        {
+            cJSON_ReplaceItemInObject(latestData, "value", cJSON_CreateNumber(data.SPO2));
+            cJSON_ReplaceItemInObject(latestData, "timestamp", cJSON_CreateNumber(data.timestamp));
+        }
 
         // Update or add to spo2_data_list
         cJSON *dataList = cJSON_GetObjectItem(oxygen_root, "spo2_data_list");
@@ -299,9 +307,17 @@ namespace OHOS
         }
 
         cJSON *Heart = cJSON_GetObjectItemCaseSensitive(latestData, "value");
-
-        cJSON_ReplaceItemInObject(latestData, "value", cJSON_CreateNumber(data.Heart));
-        cJSON_ReplaceItemInObject(latestData, "timestamp", cJSON_CreateNumber(data.timestamp));
+        if (Heart == nullptr && !cJSON_IsNumber(Heart))
+        {
+            // Add heart_latest_data
+            cJSON_AddItemToObject(latestData, "value", cJSON_CreateNumber(data.Heart));
+            cJSON_AddItemToObject(latestData, "timestamp", cJSON_CreateNumber(data.timestamp));
+        }
+        else
+        {
+            cJSON_ReplaceItemInObject(latestData, "value", cJSON_CreateNumber(data.Heart));
+            cJSON_ReplaceItemInObject(latestData, "timestamp", cJSON_CreateNumber(data.timestamp));
+        }
 
         // // 更新heart_latest_data中的value和timestamp值
         // cJSON_AddItemToObject(latestData, "value", cJSON_CreateNumber(data.Heart));
-- 
2.17.1