From 295238959e18e9f4adf1e8073eae00530c52d216 Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Tue, 26 Nov 2024 20:45:15 +0800
Subject: [PATCH] =?utf8?q?=E5=BF=83=E7=8E=87=EF=BC=9A=E5=84=AA=E5=8C=96?=
 =?utf8?q?=E5=BF=83=E7=8E=87=E6=9C=80=E9=AB=98=E6=9C=80=E4=BD=8E=E5=80=BC?=
 =?utf8?q?=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../nativeui/heartrate/src/HeartModel.cpp      |  7 +++++--
 .../training_card/src/TraingCardPresenter.cpp  | 18 ++++++++++--------
 2 files changed, 15 insertions(+), 10 deletions(-)

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 138f46f07..55b37f1e9 100644
--- 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) {
           ? "未佩戴状态"
           : (result == HeartResult::TIMEOUT) ? "超时" : "无效数据";
   WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "检测结果:%s情况", resultMsg);
+  uapi_set_screen_on_api(); // 亮屏
   NativeAbility::GetInstance().ChangeSlice(VIEW_CHECK_ABNORMAL);
 }
 // 处理低心率情况
 void HeartModel::handleLowHeartRate() {
   WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "检测结果:低结果情况");
-  HealthState lowHealthState = {BLOOD_CHECK, LOW, thresholdValue};
+  HealthState lowHealthState = {HEART_CHECK, LOW, thresholdValue};
   HealthService::GetInstance()->SetHealthCurrent(lowHealthState);
+  uapi_set_screen_on_api(); // 亮屏
   NativeAbility::GetInstance().ChangeSlice(VIEW_CHECK_INVALID);
 }
 // 处理高心率情况
 void HeartModel::handleHighHeartRate() {
   WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "检测结果:高结果情况");
-  HealthState highHealthState = {BLOOD_CHECK, HIGH, thresholdValue};
+  HealthState highHealthState = {HEART_CHECK, HIGH, thresholdValue};
   HealthService::GetInstance()->SetHealthCurrent(highHealthState);
+  uapi_set_screen_on_api(); // 亮屏
   NativeAbility::GetInstance().ChangeSlice(VIEW_CHECK_INVALID);
 }
 // 设置佩戴状态
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 58526bbfb..51c798220 100644
--- 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) {
     // 退出进入普通模式
     do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NORMAL_MODE, NULL);
     opensensorstuats = false; // 恢复标志位
-    StopAndResetTimer();           // 关闭计时器
+    StopAndResetTimer();      // 关闭计时器
     break;
   case ExerciseState::Pause:
     do_cywee_service_check_msg(CYWEE_SERVICE_CMD_PAUSE, 0);
@@ -294,7 +294,7 @@ void TraingCardPresenter::UpdateDataView() {
       &TrainingDataView::UpdataTime, TrainingDataView::GetInstance()));
 
   TraingModel::GetInstance()->updata_goal();
-  
+
   // 刷新训练数据：心率、卡路里、距离、步数、训练强度、目标完成度
   SportData *sportdata = TraingModel::GetInstance()->GetSportdata();
   RefreshData(sportdata);
@@ -391,7 +391,7 @@ bool TraingCardPresenter::send_sport_cmd(training_ble *cmd) {
         m_sportTag = cmd->sportTag / 1000;
       } else {
         m_sportTag = cmd->sportTag;
-        }
+      }
       TraingModel::GetInstance()->SetSportTag(
           static_cast<ExerciseTag>(cmd->sportTagType), m_sportTag);
       WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "目标设置成功!\r\n");
@@ -413,7 +413,7 @@ bool TraingCardPresenter::send_sport_cmd(training_ble *cmd) {
   if (cmdstate == ExerciseState::Start) {
     if ((currentState == ExerciseState::General)) {
       if (TraingCardView::GetInstance() == nullptr) {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"ble 开启运动");
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ble 开启运动");
         uapi_set_screen_on_api(); // 亮屏
         NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGCRAD);
         // 设置目标类型和项目有且只有一次
@@ -440,7 +440,7 @@ bool TraingCardPresenter::send_sport_cmd(training_ble *cmd) {
       handleStartState();
       return true;
     } else {
-      
+
       reply_APP_OpenSportModeCmd(false);
       // return false;
     }
@@ -449,7 +449,7 @@ bool TraingCardPresenter::send_sport_cmd(training_ble *cmd) {
   if (cmdstate == ExerciseState::Pause) {
     if (currentState == ExerciseState::Start ||
         currentState == ExerciseState::Continue) {
-      WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"ble 暂停运动");
+      WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ble 暂停运动");
       reply_APP_SportPasueResetCmd(TraingModel::GetInstance()->GetSportTime());
       handlePauseState();
       return true;
@@ -459,7 +459,7 @@ bool TraingCardPresenter::send_sport_cmd(training_ble *cmd) {
   // 仅在暂停状态下允许恢复运动
   if (cmdstate == ExerciseState::Continue &&
       currentState == ExerciseState::Pause) {
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"ble 恢复运动");
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ble 恢复运动");
     reply_APP_SportPasueResetCmd(TraingModel::GetInstance()->GetSportTime());
     handleContinueState();
     return true;
@@ -470,7 +470,7 @@ bool TraingCardPresenter::send_sport_cmd(training_ble *cmd) {
       (currentState == ExerciseState::Start ||
        currentState == ExerciseState::Continue ||
        currentState == ExerciseState::Pause)) {
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"ble 结束运动");
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ble 结束运动");
     uint32_t sport_time = TraingModel::GetInstance()->GetSportTime();
     reply_APP_SportStopModeCmd(sport_time);
     handleEndState();
@@ -520,6 +520,7 @@ void TraingCardPresenter::handleEndState() {
 
 /*训练暂停*/
 void TraingCardPresenter::handlePauseState() {
+  uapi_set_screen_on_api(); // 亮屏
   TrainingControlView::GetInstance()->GetLabel()->SetTextId(STR_RESUME);
   TrainingControlView::GetInstance()->GetButton()->SetImageSrc(
       SPORT_CONTINUE_IMAGE, SPORT_CONTINUE_IMAGE);
@@ -530,6 +531,7 @@ void TraingCardPresenter::handlePauseState() {
 
 /*训练继续*/
 void TraingCardPresenter::handleContinueState() {
+  uapi_set_screen_on_api(); // 亮屏
   TrainingControlView::GetInstance()->GetLabel()->SetTextId(STR_PAUSE);
   TrainingControlView::GetInstance()->GetButton()->SetImageSrc(
       SPORT_PAUSE_IMAGE, SPORT_PAUSE_IMAGE);
-- 
2.17.1