From e07c635d1e9f51c32d9c0e54f6a09beb1ff4bff3 Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Tue, 8 Jul 2025 12:10:31 +0800 Subject: [PATCH] =?utf8?q?w9:=E7=AC=AC=E4=B8=80=E6=AC=A1=E7=BB=91=E5=AE=9A?= =?utf8?q?=E5=AE=8C=E6=88=90=E5=B0=B1=E8=BF=9B=E5=85=A5=E6=A0=A1=E5=87=86?= =?utf8?q?=E7=95=8C=E9=9D=A2,=E5=8F=AA=E6=9C=89=E4=B8=A4=E6=AC=A1=E6=A0=A1?= =?utf8?q?=E5=87=86=E5=AE=8C=E6=88=90=E5=90=8E=E6=89=8D=E8=83=BD=E8=BF=9B?= =?utf8?q?=E5=85=A5=E4=B8=BB=E7=95=8C=E9=9D=A2=EF=BC=8C=E5=BE=85=E9=AA=8C?= =?utf8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeui/bloodpressure/src/BPMainPresenter.cpp | 14 +++++++++++--- .../nativeui/main/src/MainPresenterSample.cpp | 2 ++ .../src/RebootAndShutdownModel.cpp | 11 +++++++++++ 3 files changed, 24 insertions(+), 3 deletions(-) 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 3b50d462b..665d52abf 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainPresenter.cpp @@ -163,10 +163,18 @@ namespace OHOS BPMainView::GetInstance()->ChangeView(BPCALIBRATIONPASSVIEW, BPLASTCALIBRATIONTIME); passflag = 1; } - else + else //全部校准成功 { - // 退出 - NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true) + { + ConfigModel::GetInstance()->SetisFirstTimeStart(false); + NativeAbility::GetInstance().SetDefaultSliceId(VIEW_MAIN); + NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);//如果是第一次绑定进到主界面 + } + else + { + NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + } passflag = 0; } } 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 12586c5fb..ce939bda9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp @@ -106,6 +106,7 @@ namespace OHOS } void MainPresenterSample::OnResume(void) { +#ifdef FD230 #if IS_SUPPORT_BIND_VOTE if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true) { uapi_remove_bind_vote(); //页面已经展示后的调用逻辑。取消绑定投票 @@ -119,6 +120,7 @@ namespace OHOS // DialModelTime::GetInstance()->UpdateTime(); // dynamic_cast(view_->GetViewById(WATCH_FACE))->StartDial(); // } +#endif } void MainPresenterSample::OnStop(void) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp index f8a5d39fe..985adcfa8 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp @@ -100,6 +100,7 @@ namespace OHOS /*处理恢复出厂设置后第一次跳转主界面*/ void RebootAndShutdownModel::HandFirstTimeStartJumpToMainView(void) { + #ifdef FD230 if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true) { uapi_set_screen_on_api(); @@ -114,6 +115,16 @@ namespace OHOS NativeAbility::GetInstance().SetDefaultSliceId(VIEW_MAIN); NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN); } + #else if defined(BOARD_W9) + if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true) + { + uapi_set_screen_on_api(); + uapi_systemVolumeSet(VOLUME_50);//恢复出厂设置系统音量要设置50% + uapi_callVolumeSet(VOLUME_100);//恢复出厂设置通话音量要设置100% + NativeAbility::GetInstance().SetDefaultSliceId(VIEW_BLOOD_PRESSURE_CALIBRATION); + NativeAbility::GetInstance().ChangeSlice(VIEW_BLOOD_PRESSURE_CALIBRATION); + } + #endif } #ifdef __cplusplus -- 2.17.1