From a8176891ee5425f39427bd271ff6440a1755e611 Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Mon, 22 Jul 2024 19:15:22 +0800 Subject: [PATCH] =?utf8?q?=E8=A7=A3=E5=86=B3=E6=89=8B=E8=A1=A8=E8=A7=A3?= =?utf8?q?=E7=BB=91=E5=90=8E=E6=81=A2=E5=A4=8D=E5=87=BA=E5=8E=82=E8=AE=BE?= =?utf8?q?=E7=BD=AE=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=89=8B=E6=9C=BA=E6=98=AF?= =?utf8?q?=E7=9B=B4=E6=8E=A5=E4=B8=8E=E6=89=8B=E8=A1=A8=E9=85=8D=E5=AF=B9?= =?utf8?q?=E6=88=90=E5=8A=9F=E6=9C=AA=E9=80=89=E6=8B=A9=E8=AF=AD=E8=A8=80?= =?utf8?q?=EF=BC=8C=E8=BF=9B=E5=85=A5=E4=B8=BB=E7=95=8C=E9=9D=A2=E5=90=8E?= =?utf8?q?=E5=8F=91=E7=8E=B0=E6=89=8B=E8=A1=A8=E7=BC=BA=E5=B0=91=E5=AD=97?= =?utf8?q?=E4=BD=93=E9=97=AE=E9=A2=98=E3=80=82=201.=E5=A6=82=E6=9E=9C?= =?utf8?q?=E6=89=8B=E6=9C=BA=E4=B8=8E=E6=89=8B=E8=A1=A8=E5=85=88=E7=BB=91?= =?utf8?q?=E5=AE=9A=E6=88=90=E5=8A=9F=EF=BC=8C=E6=9C=AA=E9=80=89=E6=8B=A9?= =?utf8?q?=E8=AF=AD=E8=A8=80=EF=BC=8C=E9=9C=80=E9=80=89=E6=8B=A9=E8=AF=AD?= =?utf8?q?=E8=A8=80=E6=89=8D=E8=BF=9B=E5=85=A5=E4=B8=BB=E7=95=8C=E9=9D=A2?= =?utf8?q?=E3=80=82=202.=E5=A6=82=E6=9E=9C=E5=B7=B2=E9=80=89=E6=8B=A9?= =?utf8?q?=E8=AF=AD=E8=A8=80=EF=BC=8C=E8=BF=99=E6=97=B6=E6=89=8B=E6=9C=BA?= =?utf8?q?=E4=B8=8E=E6=89=8B=E8=A1=A8=E7=BB=91=E5=AE=9A=E6=88=90=E5=8A=9F?= =?utf8?q?=E5=B0=86=E8=87=AA=E5=8A=A8=E8=BF=9B=E5=85=A5=E4=B8=BB=E7=95=8C?= =?utf8?q?=E9=9D=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../languagecode/src/LanguageSwitchPresenter.cpp | 14 ++++++++++++-- .../src/RebootAndShutdownModel.cpp | 13 ++++++++----- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp index fa31424c7..c7baeb376 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-28 14:17:43 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-07-20 18:11:50 + * @LastEditTime: 2024-07-22 19:03:52 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp */ #include "AppViewIDs.h" @@ -14,6 +14,7 @@ #include #include "languagecode/LanguageInit.h" #include "ConfigModel.h" +#include "settings/include/SettingModel.h" namespace OHOS { extern Language languages[]; @@ -94,10 +95,19 @@ namespace OHOS WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingPresenter::OnClick"); /* -------------------------------------------------------------------------- */ - if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true) + if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true && SettingModel::GetInstance().GetPhoneConnectStatus() == false) { NativeAbility::GetInstance().EnterSlice(VIEW_WATCH_QR_CODE); } + else if(ConfigModel::GetInstance()->GetisFirstTimeStart() == true && SettingModel::GetInstance().GetPhoneConnectStatus() == true) + { + if (ConfigModel::GetInstance()->GetLanguage() == -1) + { + uapi_set_screen_on_api(); + NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN); + ConfigModel::GetInstance()->SetisFirstTimeStart(false); + } + } /* -------------------------------------------------------------------------- */ UNUSED(event); 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 af0dbbae5..227c699be 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-07-22 10:45:31 + * @LastEditTime: 2024-07-22 18:52:05 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp */ @@ -32,9 +32,12 @@ namespace OHOS { if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true && SettingModel::GetInstance().GetPhoneConnectStatus() == true) { - uapi_set_screen_on_api(); - NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN); - ConfigModel::GetInstance()->SetisFirstTimeStart(false); + if (ConfigModel::GetInstance()->GetLanguage() != -1) + { + uapi_set_screen_on_api(); + NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN); + ConfigModel::GetInstance()->SetisFirstTimeStart(false); + } } } @@ -136,7 +139,7 @@ namespace OHOS display_api->turn_on_screen(); // if (display_api->get_screen_state() == SCREEN_OFF) /*处于灭屏状态才亮屏*/ // { - + // } // else // { -- 2.17.1