From ecd45ae3922cd19b7d36e609c141b623557c6af6 Mon Sep 17 00:00:00 2001
From: luozheng <1732036298@qq.com>
Date: Sat, 9 Nov 2024 16:32:21 +0800
Subject: [PATCH] =?utf8?q?#1157=E8=AF=AD=E8=A8=80=E5=8F=AA=E4=BF=9D?=
 =?utf8?q?=E7=95=99=E4=B8=AD=E6=96=87=E5=92=8C=E8=8B=B1=E6=96=87=EF=BC=8C?=
 =?utf8?q?=E5=85=B6=E4=BB=96=E8=AF=AD=E8=A8=80=E7=8E=B0=E9=9A=90=E8=97=8F?=
 =?utf8?q?=EF=BC=8CAPP=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../languagecode/src/LanguageSwitchModel.cpp        | 13 ++++++++++++-
 .../languagecode/src/LanguageSwitchPresenter.cpp    |  9 ++++++++-
 .../languagecode/src/LanguageSwitchView.cpp         |  5 +++++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchModel.cpp
index 87afd9277..7de9c0573 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchModel.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-03-28 16:36:46
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-11-05 14:19:02
+ * @LastEditTime: 2024-11-09 16:31:39
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchModel.cpp
  */
 #include "languagecode/include/LanguageSwitchModel.h"
@@ -28,6 +28,17 @@ namespace OHOS
     void LanguageSwitchModel::LanguageSwitchViewupdata(uint32_t id)
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "LanguageSwitchViewupdata:%d",id);
+        
+        if(id == 0 || id == 1)
+        {
+            OHOS::language::GetInstance()->ChangeLanguage(id);
+            if(LanguageSwitchView::GetInstance())
+            {
+                NativeAbility::GetInstance().ChangeSlice(VIEW_LANGUAGE_SWITCH);
+            }
+        }
+        return;
+
         if(is_load_languages(id))
         {
             if(LanguageSwitchView::GetInstance())
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 f48684041..67fcbb2e7 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-11-05 14:19:24
+ * @LastEditTime: 2024-11-09 15:30:10
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
  */
 #include "AppViewIDs.h"
@@ -53,10 +53,17 @@ namespace OHOS
             return;
         }
 
+        #if 0
         for (uint8_t i = 0; i < MAX_LANGUAGE; i++)
         {
             view_->AddLanguageItemToList(languages[i]);
         }
+        #else
+        for (uint8_t i = 0; i < 2; i++)
+        {
+            view_->AddLanguageItemToList(languages[i]);
+        }
+        #endif
     }
 
     void LanguageSwitchPresenter::OnPause(void)
diff --git a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchView.cpp b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchView.cpp
index b3336ffe6..044ddcbe1 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchView.cpp
@@ -183,6 +183,11 @@ namespace OHOS
         FocusManager::GetInstance()->RequestFocus(LanguageList);
         FocusManager::GetInstance()->RequestFocusByDirection(FOCUS_DIRECTION_UP);
         LanguageList->SetRotateFactor(1.0);
+        if(p_LanguageSwitchListAdapter->GetCount() < 3)
+        {
+            LanguageList->SetReboundSize(0);
+            LanguageList->SetScrollBlankSize(0);
+        }
         return true;
     }
 
-- 
2.17.1