From: xue <2144439972@qq.com> Date: Thu, 19 Jun 2025 02:39:04 +0000 (+0800) Subject: 修复界面切换bug X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=18c92423efcf14c2f65590df18670319a1e5b7fe;p=mirrors%2FFD230.git 修复界面切换bug --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPMainPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPMainPresenter.h index ac164fffc..da1a32f49 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPMainPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPMainPresenter.h @@ -25,7 +25,7 @@ namespace OHOS BPMainPresenter(); virtual ~BPMainPresenter(); static BPMainPresenter *GetInstance(void); - void ReSetPassflag(); + void SetPassflag(int value); void OnStart() override; void OnPause() override; diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainPresenter.cpp index 571c5753f..3b50d462b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainPresenter.cpp @@ -73,9 +73,9 @@ namespace OHOS { return g_pBPMainPresenter; } - void BPMainPresenter::ReSetPassflag() + void BPMainPresenter::SetPassflag(int value) { - passflag = 0; + passflag = value; } void BPMainPresenter::OnStart() { @@ -166,7 +166,8 @@ namespace OHOS else { // 退出 - // passflag = 0; + NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + passflag = 0; } } else if (strcmp(view.GetViewId(), "SBPLeft") == 0) @@ -209,6 +210,7 @@ namespace OHOS { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CALIBRATIONLATTERBUTTON"); // 退出 + NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); } return true; WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPPresenter::OnClick"); diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainView.cpp index e16dca570..09a3c21f0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainView.cpp @@ -111,12 +111,15 @@ namespace OHOS if (BPModel::GetInstance()->GetCalibrationFlag() == 0) { - ChangeView(MAX_BPVIEW, BPCALPOSREQVIEW);// 切换到第一个界面 - BPMainPresenter::GetInstance()->ReSetPassflag();//重置校准成功按钮标志位 - } + ChangeView(MAX_BPVIEW, BPCALPOSREQVIEW); // 切换到第一个界面 + BPMainPresenter::GetInstance()->SetPassflag(0); // 重置校准成功按钮标志位 + } else + { ChangeView(MAX_BPVIEW, BPLASTCALIBRATIONTIME); + BPMainPresenter::GetInstance()->SetPassflag(1); // 校准成功按钮标志位 + } // 增加按键监听 RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::BPMainPresenter::GetInstance();