主界面:主界面心率卡片脱腕提醒之后可以回到主心率卡片

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalPresenter.cpp
index 2597ad3..e044d9f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalPresenter.cpp
@@ -98,6 +98,10 @@ namespace OHOS
             }
             // 回到上一个检测界面
             uint16 preSlice = NativeAbility::GetInstance().GetPreSliceId();
+            if (preSlice == VIEW_MAIN) {
+                MainModel::GetInstance().SetFromSetCardView(true);
+                MainModel::GetInstance().SetFromCardId(HEART_RATE);
+              }
             NativeAbility::GetInstance().ChangeSlice(preSlice, TransitionType::TRANSITION_ZOOM);
         }
         return true;

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 d1f5d4f..de0be7c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
@@ -69,7 +69,7 @@ namespace OHOS
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "~MainPresenterSample");
         g_pMainPresenterSample = nullptr;
         /*从主界面退出，关闭心率检测*/
-        HeartModel::GetInstance()->Heart_Control(HeartState::End, HeartCheck::CARDCHECK);
+        HeartModel::GetInstance()->Heart_Control(HeartState::End, HeartCheck::INITIATIVE);
     }
 
     MainPresenterSample *MainPresenterSample::GetInstance(void)