From: Caisking <3449750381@qq.com>
Date: Fri, 28 Jun 2024 04:38:44 +0000 (+0800)
Subject: 补交修改
X-Git-Tag: release_V1.2.70_20241020_135402~937
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F396%2F2;p=mirrors%2FFD230.git

补交修改
---

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));