From: Caisking <3449750381@qq.com>
Date: Mon, 28 Oct 2024 10:48:20 +0000 (+0800)
Subject: 心率：增加取消长亮屏限制
X-Git-Tag: fd230_release_V1.3.102~171^2~4
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=11b5e702745e6ebfd54a75867febfc36c43a5c45;p=mirrors%2FFD230.git

心率：增加取消长亮屏限制
---

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 77271cae5..ca4dd2390 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
@@ -222,7 +222,7 @@ HeartModel::HeartModel() {
   }
   //读取最大最小值
   HealthService::GetInstance()->LoadHeartMaxMin(displayheart_max,
-                                               displayheart_min);
+                                                displayheart_min);
   // 配置动态数组
   SetArrayData();
 }
@@ -483,29 +483,28 @@ void HeartModel::Heart_Stop() {
     Heart_Control(HeartState::End, HeartCheck::PASSIVITY);
     return;
   }
+  if (sensorstate) {
+    // 恢复正常亮屏
+    HeartModel::GetInstance()->heart_stop_screen60s_timer();
+    // 取消常亮屏
+    ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON);
+    //设置runtime
+    uapi_dev_runtime_set_heartrate_detect_status(0);
+    Heart_Result(); // 处理结果
 
-  // 恢复正常亮屏
-  HeartModel::GetInstance()->heart_stop_screen60s_timer();
-  // 取消常亮屏
-  ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON);
-
-  //设置runtime
-  uapi_dev_runtime_set_heartrate_detect_status(0);
-
-  Heart_Result(); // 处理结果
-
-  //为了防止主界面卡片一直重复开传感器
-  if (checkstate != HeartCheck::CARDCHECK) {
-    //重置传感器状态
-    sensorstate = false;
+    //为了防止主界面卡片一直重复开传感器
+    if (checkstate != HeartCheck::CARDCHECK) {
+      //重置传感器状态
+      sensorstate = false;
+    }
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "本次心率检测结束");
   }
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "本次心率检测结束");
 }
 // 保存检测数据
-void HeartModel::Heart_Save(){
+void HeartModel::Heart_Save() {
 
-uint32_t timestamp = HeartResultPresenter::GetInstance()->GetCurrentTime();
-SetCheckTime(timestamp);
+  uint32_t timestamp = HeartResultPresenter::GetInstance()->GetCurrentTime();
+  SetCheckTime(timestamp);
 #if MSG_SAVE_TEST
   HeartRateData data;
   data.Heart = currentheart;
@@ -514,7 +513,8 @@ SetCheckTime(timestamp);
 #else
   HealthService::GetInstance()->send_heart_save();
 #endif
-  //WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "保存的心率数据：%d%ld", currentheart,data.timestamp);
+  // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "保存的心率数据：%d%ld",
+  // currentheart,data.timestamp);
 }
 
 void HeartModel::Heart_Result() {