From: hcj <1224667075@qq.com> Date: Mon, 9 Sep 2024 09:52:08 +0000 (+0800) Subject: 增加多国语言切换字体逻辑(补) X-Git-Tag: release_V1.2.70_20241020_135402~516^2~10 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=b7784d8ddacfb4121df1b884ddcc376049caf7b9;p=mirrors%2FFD230.git 增加多国语言切换字体逻辑(补) --- 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(); // 强制刷新