From cdfe7bd2e960e6cf541167e55b55bc8aec004643 Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Sun, 29 Sep 2024 16:08:02 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9=E7=AC=AC=E4=B8=80=E6=AC=A1?= =?utf8?q?=E5=90=AF=E5=8A=A8=E6=97=B6=E8=BF=9B=E5=85=A5=E7=95=8C=E9=9D=A2?= =?utf8?q?=E9=80=BB=E8=BE=91=E3=80=82=E4=B8=8D=E5=86=8D=E6=A0=B9=E6=8D=AE?= =?utf8?q?=E6=89=8B=E6=9C=BA=E6=98=AF=E5=90=A6=E8=BF=9E=E6=8E=A5=E5=81=9A?= =?utf8?q?=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../src/RebootAndShutdownModel.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) 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 027102b55..958358535 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-07-18 14:55:27 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-29 17:20:33 + * @LastEditTime: 2024-09-29 15:35:47 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp */ @@ -48,15 +48,12 @@ namespace OHOS /*处理恢复出厂设置后第一次跳转主界面*/ void RebootAndShutdownModel::HandFirstTimeStartJumpToMainView(void) { - if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true && SettingModel::GetInstance().GetPhoneConnectStatus() == true) + if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true) { - if (ConfigModel::GetInstance()->GetLanguage() != -1) - { - uapi_set_screen_on_api(); - NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN); - ConfigModel::GetInstance()->SetisFirstTimeStart(false); - NativeAbility::GetInstance().SetDefaultSliceId(VIEW_MAIN); - } + uapi_set_screen_on_api(); + ConfigModel::GetInstance()->SetisFirstTimeStart(false); + NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN); + NativeAbility::GetInstance().SetDefaultSliceId(VIEW_MAIN); } } -- 2.17.1