From 64ff03b08a7bd519a08700a89b58747c5bd13f85 Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Fri, 14 Jun 2024 15:06:42 +0800
Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96=E4=B8=BB=E7=95=8C=E9=9D=A2not?=
 =?utf8?q?ify=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../nativeui/main/src/MainPresenterSample.cpp | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

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 777f9ffd4..04b8aa8db 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
@@ -345,23 +345,34 @@ namespace OHOS
     void MainPresenterSample::Notify(void)
     {
         CardId cardId = view_->GetHorCurrentCard();
-        if (cardId != HEART_RATE)
+
+        static CardId previousCardId = WATCH_FACE;
+
+        if (previousCardId == HEART_RATE && cardId != HEART_RATE)
         {
-            // 关闭心率检测
+            // 从心率卡片变为其他卡片时调用关闭心率检测的函数
             HeartModel::GetInstance()->Heart_Control(HeartState::End);
         }
-        // 指南针卡片
-        else if (cardId == COMPASS)
+
+        // 更新上一个卡片的值
+        previousCardId = cardId;
+
+        switch (cardId)
         {
+        case HEART_RATE:
+            // 开启心率检测
+            HeartModel::GetInstance()->Heart_Control(HeartState::Start);
+            break;
+
+        case COMPASS:
             SetCompassRotate();
-        }
-        // 音乐卡片
-        else if (cardId == MUSIC_PLAYER)
-        {
+            break;
+
+        case MUSIC_PLAYER:
             SetCircleProgress();
-        }
-        // 主界面
-        else if (cardId == WATCH_FACE)
+            break;
+
+        case WATCH_FACE:
         {
             DialSetting &setting = GetDialSetting();
             if (setting.dialFlag)
@@ -374,11 +385,7 @@ namespace OHOS
                 dynamic_cast<MainClockView *>(view_->GetViewById(WATCH_FACE))->UpdateTime();
             }
         }
-        // 心率卡片
-        else if (cardId == HEART_RATE)
-        {
-            // 开启心率检测
-            HeartModel::GetInstance()->Heart_Control(HeartState::Start);
+        break;
         }
     }
 
-- 
2.17.1