心率：主界面增加心率未佩戴弹窗

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 6ac1cb3..7f0f087 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
@@ -446,8 +446,7 @@ void HeartModel::Heart_Stop() {
   displayheart = 0;\r
 \r
   /*主界面卡片检测 或者 被动检测*/\r
-  if (checkstate == HeartCheck::CARDCHECK ||\r
-      checkstate == HeartCheck::PASSIVITY) {\r
+  if ( checkstate == HeartCheck::PASSIVITY) {\r
     if (heartresult_ == HeartResult::SUCCESS) {\r
       Heart_Save();\r
       /*更新曲线*/\r

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 f69dc53..fff0cea 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
@@ -279,7 +279,6 @@ namespace OHOS
         /* -------------------------------------------------------------------------- */
 
         CardId cardId = view_->GetHorCurrentCard();
-        
         SetTaskPeroid(cardId);
         if (cardId == COMPASS)
         {
@@ -378,7 +377,9 @@ namespace OHOS
         if (previousCardId == HEART_RATE && currentCardId != HEART_RATE)
         {
             LogCardTransition(previousCardId, currentCardId);
-            HeartModel::GetInstance()->Heart_Control(HeartState::End, HeartCheck::CARDCHECK);
+            // HeartModel::GetInstance()->Heart_Control(HeartState::End,
+            //                                          HeartCheck::CARDCHECK);
+            HeartModel::GetInstance()->Heart_Stop();
         }
 
         // 从睡眠卡片跳转到其他卡片时切换到睡眠卡片主界面
@@ -468,8 +469,11 @@ namespace OHOS
     /*心率卡片*/
     void MainPresenterSample::StartHeartRateDetection()
     {
-        HeartModel::GetInstance()->Heart_Control(HeartState::End, HeartCheck::PASSIVITY);
-        HeartModel::GetInstance()->Heart_Control(HeartState::Start, HeartCheck::CARDCHECK);
+      // HeartModel::GetInstance()->Heart_Control(HeartState::End,
+      // HeartCheck::PASSIVITY);
+      // HeartModel::GetInstance()->Heart_Control(HeartState::Start,
+      // HeartCheck::CARDCHECK);
+      HeartModel::GetInstance()->Heart_Start();
     }
     /*主表盘*/
     void MainPresenterSample::UpdateWatchFace()