From a7635ed5ff5009f58c33bf24439b28cabbac4796 Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Thu, 5 Sep 2024 15:16:52 +0800
Subject: [PATCH] =?utf8?q?=E5=A2=9E=E5=8A=A0=E5=BF=83=E7=8E=87=E8=A1=80?=
 =?utf8?q?=E6=B0=A7=20=E5=81=A5=E5=BA=B7=E6=95=B0=E6=8D=AE=E7=9A=84nextday?=
 =?utf8?q?=E6=B8=85=E7=A9=BA=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../health_service/health_service.cpp         | 33 +++++--------------
 1 file changed, 9 insertions(+), 24 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 c8760f731..6d9550e4f 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
@@ -368,24 +368,10 @@ namespace OHOS
     // 清空健康数据
     bool HealthService::CleanHealthData()
     {
-        HeartRateData heartdata;
-        heartdata.Heart = 0;
-        heartdata.timestamp = 0;
-        BloodOxygenData blooddata;
-        blooddata.SPO2 = 0;
-        blooddata.timestamp = 0;
-        if (!UpdateHealthData(heartdata))
-        {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UpdateHealthData heartdata is error");
-            return false;
-        }
-        if (!UpdateHealthData(blooddata))
-        {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UpdateHealthData blooddata is error");
-            return false;
-        }
-        HeartModel::GetInstance()->ReInit();
-        BloodOxygenModel::GetInstance()->ReInit();
+        ClearHourlyHeartRates();
+        HeartModel::GetInstance()->ClearDisplayData();
+        BloodOxygenModel::GetInstance()->ClearDisplayData();
+
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CleanHealthData  is ok");
         return true;
     }
@@ -449,9 +435,8 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "************************************************");
         }
 
-        // 如果不是同一天，清空文件内容
+        // 如果不是同一天，关闭文件
         file.close();
-        SaveDailyHeartRate();
 
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: Not same-day data");
         return false; // 不是同一天
@@ -503,13 +488,13 @@ namespace OHOS
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Updating heart rate: 小时 %d, 心率值 %d", hour, heartRate);
 
         // 确保 hour 在有效范围内，并且心率不是异常值（例如负值）
-        if (hour < MAX_HOURS && heartRate > 0) // 心率不应为负
+        if (hour < MAX_HOURS && heartRate > 0) // 心率不应为负 并且 小时不能为24
         {
             dailyHeartRates[hour] = heartRate;
-        }
 
-        // 记录目前更新时间点
-        currenthour = hour;
+            // 记录目前更新时间点
+            currenthour = hour;
+        }
     }
 
     uint16_t HealthService::GetHourlyHeartRate(uint16_t hour)
-- 
2.17.1