From bdb54aa7733d2856be11e7489ae34936df711908 Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Tue, 9 Jul 2024 15:04:47 +0800
Subject: [PATCH] =?utf8?q?=E4=BF=AE=E5=A4=8D=E7=9D=A1=E7=9C=A0=E6=98=BE?=
 =?utf8?q?=E7=A4=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../nativeui/heartrate/src/HeartModel.cpp     |  1 +
 .../nativeui/main/src/MainPresenterSample.cpp | 19 ++++++++++++-------
 .../nativeui/sleep/include/SleepModel.h       |  4 ++--
 .../nativeui/sleep/src/SleepModel.cpp         | 11 ++++++++---
 4 files changed, 23 insertions(+), 12 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 426e957d0..e373c0ce3 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
@@ -496,6 +496,7 @@ namespace OHOS
             uint8_t md = PPG_SERVICE_CMD_TYPE_DO_PPG_TEST;
             send_ppg_cmd_msg(md);
             heartstate = true;
+            checkstate = check;
         }
     }
     void HeartModel::Heart_Start()
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
index d0a5ef6e0..e73387513 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
@@ -310,13 +310,17 @@ namespace OHOS
         }
         int32_t playerState;
         PlayersModel::GetInstance()->GetPlayerCtr()->GetPlayerState(playerState);
-	    state_ = playersView->GetPlayerButtonState();
-	    if ((playerState != PLAYER_STARTED) && (state_ == UICheckBox::UICheckBoxState::SELECTED)) {
-	        playersView->SetPlayerButtonState(UICheckBox::UICheckBoxState::UNSELECTED);
-	    } else if ((playerState == PLAYER_STARTED) && (state_ == UICheckBox::UICheckBoxState::UNSELECTED)) {
-	        playersView->SetPlayerButtonState(UICheckBox::UICheckBoxState::SELECTED);
-	    }
-	    if (state_ == UICheckBox::UICheckBoxState::SELECTED) {
+        state_ = playersView->GetPlayerButtonState();
+        if ((playerState != PLAYER_STARTED) && (state_ == UICheckBox::UICheckBoxState::SELECTED))
+        {
+            playersView->SetPlayerButtonState(UICheckBox::UICheckBoxState::UNSELECTED);
+        }
+        else if ((playerState == PLAYER_STARTED) && (state_ == UICheckBox::UICheckBoxState::UNSELECTED))
+        {
+            playersView->SetPlayerButtonState(UICheckBox::UICheckBoxState::SELECTED);
+        }
+        if (state_ == UICheckBox::UICheckBoxState::SELECTED)
+        {
             PlayersModel::GetInstance()->GetPlayerCtr()->GetCurrentTime(playerCurrentTime_);
             PlayersModel::GetInstance()->GetDuration(playerMusicDuration_);
             if (playerMusicDuration_ != 0)
@@ -362,6 +366,7 @@ namespace OHOS
         {
         case HEART_RATE:
             // 开启心率检测 [UI优先级最高直接打断正在检测 重新检测]
+            HeartModel::GetInstance()->Heart_Control(HeartState::End, HeartCheck::PASSIVITY);
             HeartModel::GetInstance()->Heart_Control(HeartState::Start, HeartCheck::INITIATIVE);
             break;
 
diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepModel.h b/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepModel.h
index 7163a6246..70c39cb20 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepModel.h
@@ -124,8 +124,8 @@ namespace OHOS
         std::string goalsleepStr{"--"};
         std::string goalwakeStr{"--"};
 
-        uint8_t sleep_total_time = 0;
-        uint8_t goal_total_time = 0;
+        int sleep_total_time = 0;
+        int goal_total_time = 0;
 
         SLEEPSTATE sleepstate_ = SLEEPSTATE::WAKE;
     };
diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp
index 73203e9ed..809028a45 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp
@@ -233,12 +233,14 @@ namespace OHOS
         SleepDataUI *data = ReadSleepData();
         if (data != nullptr)
         {
-            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ReadSleepData sleepStr %s  wakeStr %s sleep_total_time %d",
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ReadSleepData sleepStr %s  wakeStr %s sleep_total_time %d",
                           data->sleeptime.c_str(), data->waketime.c_str(), data->totaltime);
-            sleepStr = data->sleeptime;
-            wakeStr = data->waketime;
+            update_time_info(data->sleep_timestamp, sleepStr);
+            update_time_info(data->wake_timestamp, wakeStr);
             sleep_total_time = data->totaltime;
         }
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ReadSleepData sleepStr %s  wakeStr %s sleep_total_time %d",
+                      sleepStr.c_str(), wakeStr.c_str(), sleep_total_time);
     }
     static constexpr const char *SLEEP_JSON_PATH = "/user/userdata/health/sleep.json";
     // 读取睡眠数据
@@ -395,6 +397,9 @@ namespace OHOS
 
             update_time_info(UIdata->sleep_timestamp, sleepStr);
             update_time_info(UIdata->wake_timestamp, wakeStr);
+            UIdata->sleeptime = sleepStr;
+            UIdata->waketime = wakeStr;
+
             sleep_total_time = UIdata->totaltime;
 
             SaveSleepData(*UIdata);
-- 
2.17.1