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