From: 胡传军 <1224667075@qq.com>
Date: Mon, 9 Sep 2024 09:54:13 +0000 (+0000)
Subject: Merge #920 into sdk602patch0626 from refs/changes/920/head
X-Git-Tag: release_V1.2.70_20241020_135402~520^2
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=ce18adbcb1454294f5bac4d6308d5b5162ea64a1;p=mirrors%2FFD230.git

Merge #920 into sdk602patch0626 from refs/changes/920/head

Code review from 胡传军

* refs/changes/920/head: (4 commits squashed)

  - 增加运动中自动拒接电话

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

  - 增加多国语言切换字体逻辑（补）

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>

CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/920
---

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(); // 强制刷新