Merge #1378 into sdk602patch0911 from refs/changes/1378/head

Code review from 罗正

* refs/changes/1378/head: (2 commits squashed)

  - #1157语言只保留中文和英文，其他语言现隐藏，APP同步修改

  - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1378

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 87afd92..7de9c05 100644 (file)
--- 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 f486840..67fcbb2 100644 (file)
--- 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 b3336ff..044ddcb 100644 (file)
--- 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;
     }