心率：優化心率最高最低值提醒

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 138f46f..55b37f1 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
@@ -584,20 +584,23 @@ void HeartModel::logAndChangeSlice(HeartResult result) {
           ? "未佩戴状态"\r
           : (result == HeartResult::TIMEOUT) ? "超时" : "无效数据";\r
   WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "检测结果:%s情况", resultMsg);\r
+  uapi_set_screen_on_api(); // 亮屏\r
   NativeAbility::GetInstance().ChangeSlice(VIEW_CHECK_ABNORMAL);\r
 }\r
 // 处理低心率情况\r
 void HeartModel::handleLowHeartRate() {\r
   WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "检测结果:低结果情况");\r
-  HealthState lowHealthState = {BLOOD_CHECK, LOW, thresholdValue};\r
+  HealthState lowHealthState = {HEART_CHECK, LOW, thresholdValue};\r
   HealthService::GetInstance()->SetHealthCurrent(lowHealthState);\r
+  uapi_set_screen_on_api(); // 亮屏\r
   NativeAbility::GetInstance().ChangeSlice(VIEW_CHECK_INVALID);\r
 }\r
 // 处理高心率情况\r
 void HeartModel::handleHighHeartRate() {\r
   WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "检测结果:高结果情况");\r
-  HealthState highHealthState = {BLOOD_CHECK, HIGH, thresholdValue};\r
+  HealthState highHealthState = {HEART_CHECK, HIGH, thresholdValue};\r
   HealthService::GetInstance()->SetHealthCurrent(highHealthState);\r
+  uapi_set_screen_on_api(); // 亮屏\r
   NativeAbility::GetInstance().ChangeSlice(VIEW_CHECK_INVALID);\r
 }\r
 // 设置佩戴状态\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
index 58526bb..51c7982 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
@@ -188,7 +188,7 @@ bool TraingCardPresenter::ControlSensor(ExerciseState state) {
     // 退出进入普通模式\r
     do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NORMAL_MODE, NULL);\r
     opensensorstuats = false; // 恢复标志位\r
-    StopAndResetTimer();           // 关闭计时器\r
+    StopAndResetTimer();      // 关闭计时器\r
     break;\r
   case ExerciseState::Pause:\r
     do_cywee_service_check_msg(CYWEE_SERVICE_CMD_PAUSE, 0);\r
@@ -294,7 +294,7 @@ void TraingCardPresenter::UpdateDataView() {
       &TrainingDataView::UpdataTime, TrainingDataView::GetInstance()));\r
 \r
   TraingModel::GetInstance()->updata_goal();\r
-  \r
+\r
   // 刷新训练数据：心率、卡路里、距离、步数、训练强度、目标完成度\r
   SportData *sportdata = TraingModel::GetInstance()->GetSportdata();\r
   RefreshData(sportdata);\r
@@ -391,7 +391,7 @@ bool TraingCardPresenter::send_sport_cmd(training_ble *cmd) {
         m_sportTag = cmd->sportTag / 1000;\r
       } else {\r
         m_sportTag = cmd->sportTag;\r
-        }\r
+      }\r
       TraingModel::GetInstance()->SetSportTag(\r
           static_cast<ExerciseTag>(cmd->sportTagType), m_sportTag);\r
       WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "目标设置成功!\r\n");\r
@@ -413,7 +413,7 @@ bool TraingCardPresenter::send_sport_cmd(training_ble *cmd) {
   if (cmdstate == ExerciseState::Start) {\r
     if ((currentState == ExerciseState::General)) {\r
       if (TraingCardView::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"ble 开启运动");\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ble 开启运动");\r
         uapi_set_screen_on_api(); // 亮屏\r
         NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGCRAD);\r
         // 设置目标类型和项目有且只有一次\r
@@ -440,7 +440,7 @@ bool TraingCardPresenter::send_sport_cmd(training_ble *cmd) {
       handleStartState();\r
       return true;\r
     } else {\r
-      \r
+\r
       reply_APP_OpenSportModeCmd(false);\r
       // return false;\r
     }\r
@@ -449,7 +449,7 @@ bool TraingCardPresenter::send_sport_cmd(training_ble *cmd) {
   if (cmdstate == ExerciseState::Pause) {\r
     if (currentState == ExerciseState::Start ||\r
         currentState == ExerciseState::Continue) {\r
-      WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"ble 暂停运动");\r
+      WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ble 暂停运动");\r
       reply_APP_SportPasueResetCmd(TraingModel::GetInstance()->GetSportTime());\r
       handlePauseState();\r
       return true;\r
@@ -459,7 +459,7 @@ bool TraingCardPresenter::send_sport_cmd(training_ble *cmd) {
   // 仅在暂停状态下允许恢复运动\r
   if (cmdstate == ExerciseState::Continue &&\r
       currentState == ExerciseState::Pause) {\r
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"ble 恢复运动");\r
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ble 恢复运动");\r
     reply_APP_SportPasueResetCmd(TraingModel::GetInstance()->GetSportTime());\r
     handleContinueState();\r
     return true;\r
@@ -470,7 +470,7 @@ bool TraingCardPresenter::send_sport_cmd(training_ble *cmd) {
       (currentState == ExerciseState::Start ||\r
        currentState == ExerciseState::Continue ||\r
        currentState == ExerciseState::Pause)) {\r
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"ble 结束运动");\r
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ble 结束运动");\r
     uint32_t sport_time = TraingModel::GetInstance()->GetSportTime();\r
     reply_APP_SportStopModeCmd(sport_time);\r
     handleEndState();\r
@@ -520,6 +520,7 @@ void TraingCardPresenter::handleEndState() {
 \r
 /*训练暂停*/\r
 void TraingCardPresenter::handlePauseState() {\r
+  uapi_set_screen_on_api(); // 亮屏\r
   TrainingControlView::GetInstance()->GetLabel()->SetTextId(STR_RESUME);\r
   TrainingControlView::GetInstance()->GetButton()->SetImageSrc(\r
       SPORT_CONTINUE_IMAGE, SPORT_CONTINUE_IMAGE);\r
@@ -530,6 +531,7 @@ void TraingCardPresenter::handlePauseState() {
 \r
 /*训练继续*/\r
 void TraingCardPresenter::handleContinueState() {\r
+  uapi_set_screen_on_api(); // 亮屏\r
   TrainingControlView::GetInstance()->GetLabel()->SetTextId(STR_PAUSE);\r
   TrainingControlView::GetInstance()->GetButton()->SetImageSrc(\r
       SPORT_PAUSE_IMAGE, SPORT_PAUSE_IMAGE);\r