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

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