From: luozheng <1732036298@qq.com> Date: Tue, 8 Jul 2025 04:10:31 +0000 (+0800) Subject: w9:第一次绑定完成就进入校准界面,只有两次校准完成后才能进入主界面,待验证 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F1941%2F1;p=mirrors%2FFD230.git w9:第一次绑定完成就进入校准界面,只有两次校准完成后才能进入主界面,待验证 --- 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