From: Caisking <3449750381@qq.com> Date: Sat, 12 Oct 2024 06:27:24 +0000 (+0800) Subject: 主界面:主界面心率卡片脱腕提醒之后可以回到主心率卡片 X-Git-Tag: release_V1.2.70_20241020_135402~67^2~1 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F1170%2F1;p=mirrors%2FFD230.git 主界面:主界面心率卡片脱腕提醒之后可以回到主心率卡片 --- 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 2597ad3d8..e044d9f69 100644 --- 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 d1f5d4f17..de0be7c36 100644 --- 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)