From b7784d8ddacfb4121df1b884ddcc376049caf7b9 Mon Sep 17 00:00:00 2001 From: hcj <1224667075@qq.com> Date: Mon, 9 Sep 2024 17:52:08 +0800 Subject: [PATCH] =?utf8?q?=E5=A2=9E=E5=8A=A0=E5=A4=9A=E5=9B=BD=E8=AF=AD?= =?utf8?q?=E8=A8=80=E5=88=87=E6=8D=A2=E5=AD=97=E4=BD=93=E9=80=BB=E8=BE=91?= =?utf8?q?=EF=BC=88=E8=A1=A5=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../src/LanguageSwitchPresenter.cpp | 24 +++++++++++++------ 1 file changed, 17 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 451f59cbe..f7c0190f9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp @@ -123,6 +123,8 @@ namespace OHOS return true; } + + // if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true && SettingModel::GetInstance().GetPhoneConnectStatus() == false) // { @@ -139,8 +141,21 @@ namespace OHOS // } // } /* -------------------------------------------------------------------------- */ + LanguageId currentLanguageId = LanguageManager::GetInstance().GetLanguageIdByCode(id); + if(is_load_languages(currentLanguageId)) + { + LanguageSwitchView::GetInstance()->show_hint_group(id,true); + return true; + } + else + { + if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true) + { + NativeAbility::GetInstance().EnterSlice(VIEW_WATCH_QR_CODE); + } + } - + if (p_UILabelButtonExt != nullptr) { @@ -163,13 +178,8 @@ namespace OHOS else { - LanguageId currentLanguageId = LanguageManager::GetInstance().GetLanguageIdByCode(id); - if(is_load_languages(currentLanguageId)) - { - LanguageSwitchView::GetInstance()->show_hint_group(id,true); - } - else { + g_planguage->ChangeLanguage(p_LanguageSwitchModel->GetCurLanguageCode()); m_labelext->SetTextId(STR_LANGUAGE_SELECTION); m_labelext->ForceResetText(); // 强制刷新 -- 2.17.1