From: Caisking <3449750381@qq.com>
Date: Tue, 26 Nov 2024 09:15:31 +0000 (+0800)
Subject: 心率：增加最大心率無效數為30
X-Git-Tag: fd230_release_V1.3.102~28
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=2d9943b6b8505cac289877b38675106f594da656;p=mirrors%2FFD230.git

心率：增加最大心率無效數為30
---

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 89cdf29e1..138f46f07 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
@@ -46,7 +46,7 @@ extern "C" {
 
 #define MAX_UNWEAR_COUNT 2
 #define MAX_VALID_HRS_COUNT 10    //最大有效数
-#define MAX_DISVALID_HRS_COUNT 10 //最大无效数
+#define MAX_DISVALID_HRS_COUNT 30 //最大无效数
 #define MIN_DISPLAY_HEART 50      //最新心率
 #define DISPLAY_COUNT 0
 #define HEARTTEST 1 //[0 开启测试 1 关闭]
@@ -529,13 +529,13 @@ void HeartModel::Heart_Result() {
       if (thresholdState == 0 && currentheart < thresholdValue) {
         // 当前心率低于阈值
         heartresult_ = HeartResult::LOW_RESULT;
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,
                       "检测结果:低结果情况,currentheart=%d,ThresholdValue=%d",
                       currentheart, thresholdValue);
       } else if (thresholdState == 1 && currentheart > thresholdValue) {
         // 当前心率高于阈值
         heartresult_ = HeartResult::HIGH_RESULT;
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,
                       "检测结果:高结果情况,currentheart=%d,ThresholdValue=%d",
                       currentheart, thresholdValue);
       }
@@ -549,7 +549,7 @@ void HeartModel::Heart_Result() {
 void HeartModel::handleHeartResult() {
   switch (heartresult_) {
   case HeartResult::SUCCESS:
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "检测结果:成功");
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "检测结果:成功");
     Heart_Save();
     // 更新曲线
     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "准备更新UI");
@@ -573,7 +573,7 @@ void HeartModel::handleHeartResult() {
     break;
 
   default:
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "检测结果:未知状态");
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "检测结果:未知状态");
     break;
   }
 }
@@ -583,19 +583,19 @@ void HeartModel::logAndChangeSlice(HeartResult result) {
       (result == HeartResult::NOT_WORN)
           ? "未佩戴状态"
           : (result == HeartResult::TIMEOUT) ? "超时" : "无效数据";
-  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "检测结果:%s情况", resultMsg);
+  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "检测结果:%s情况", resultMsg);
   NativeAbility::GetInstance().ChangeSlice(VIEW_CHECK_ABNORMAL);
 }
 // 处理低心率情况
 void HeartModel::handleLowHeartRate() {
-  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "检测结果:低结果情况");
+  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "检测结果:低结果情况");
   HealthState lowHealthState = {BLOOD_CHECK, LOW, thresholdValue};
   HealthService::GetInstance()->SetHealthCurrent(lowHealthState);
   NativeAbility::GetInstance().ChangeSlice(VIEW_CHECK_INVALID);
 }
 // 处理高心率情况
 void HeartModel::handleHighHeartRate() {
-  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "检测结果:高结果情况");
+  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "检测结果:高结果情况");
   HealthState highHealthState = {BLOOD_CHECK, HIGH, thresholdValue};
   HealthService::GetInstance()->SetHealthCurrent(highHealthState);
   NativeAbility::GetInstance().ChangeSlice(VIEW_CHECK_INVALID);
@@ -681,7 +681,7 @@ void HeartModel::UpHeartdata(uint16_t heart) {
     max_valid_count = MAX_DISVALID_HRS_COUNT;
 
   if (disvalid_counter_ >= max_valid_count) {
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,
                   "检测结果:无效数达标 disvalid_counter:%d", disvalid_counter_);
     SetResult(HeartResult::INVALID_DATA); // 标记为无效数据
     Heart_Stop();