系统视图修改

diff --git a/code/sdk/application/wearable/nativeapp/CMakeLists.txt b/code/sdk/application/wearable/nativeapp/CMakeLists.txt
index 225c5cf..55a1d84 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/CMakeLists.txt
+++ b/code/sdk/application/wearable/nativeapp/CMakeLists.txt
@@ -215,8 +215,7 @@ set(SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemPresenter.cpp                       
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemView.cpp                                         
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemAboutTheWatchView.cpp                     
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemSuperviseView.cpp         
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemLanguagePresenter.cpp       
+    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemSuperviseView.cpp             
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemLanguageView.cpp     
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemFactoryResetPresenter.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemFactoryResetView.cpp

diff --git a/code/sdk/application/wearable/nativeapp/nativelauncher/include/AppViewIDs.h b/code/sdk/application/wearable/nativeapp/nativelauncher/include/AppViewIDs.h
index ae9a2b6..8ef146e 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativelauncher/include/AppViewIDs.h
+++ b/code/sdk/application/wearable/nativeapp/nativelauncher/include/AppViewIDs.h
@@ -46,7 +46,6 @@ typedef enum : uint16_t
     VIEW_FUTURE_WEATHER,         // 未来天气
     VIEW_GET_WEATHER_DATA_ERROR, // 获取天气数据失败
     VIEW_SYSTEM,                 // 系统
-    VIEW_SYSTEM_SYSTEM_LANGUAGE, // 系统：系统语言
     VIEW_SYSTEM_FACTORY_RESET,   // 系统：恢复出厂设置
     VIEW_SOUND_VIBRATION,        // 声音与震动
     VIEW_SYSTEM_VOLUME,          // 系统音量

diff --git a/code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h b/code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h
index f83153d..2b334b6 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h
+++ b/code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h
@@ -50,7 +50,6 @@ namespace OHOS
         void InitGetWeatherDataErrorSlice(void);
         /* -------------------------------------------------------------------------- */
         void InitSystemSlice(void);
-        void InitSystemLanguageSlice(void);
         void InitSystemFactoryResetSlice(void);
         /* -------------------------------------------------------------------------- */
         void InitSoundAndVibrationSlice(void);

diff --git a/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp
index bda871f..b822538 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp
@@ -71,8 +71,6 @@
 
 #include "system/include/SystemPresenter.h"
 #include "system/include/SystemView.h"
-#include "system/include/SystemLanguagePresenter.h"
-#include "system/include/SystemLanguageView.h"
 #include "system/include/SystemFactoryResetPresenter.h"
 #include "system/include/SystemFactoryResetView.h"
 
@@ -142,7 +140,6 @@ namespace OHOS
         {VIEW_FUTURE_WEATHER, &NativeLauncher::InitFutureWeatherSlice},               // 未来天气
         {VIEW_GET_WEATHER_DATA_ERROR, &NativeLauncher::InitGetWeatherDataErrorSlice}, // 获取天气数据失败
         {VIEW_SYSTEM, &NativeLauncher::InitSystemSlice},                              // 系统实例化地址
-        {VIEW_SYSTEM_SYSTEM_LANGUAGE, &NativeLauncher::InitSystemLanguageSlice},      // 系统:系统语言实例化地址
         {VIEW_SYSTEM_FACTORY_RESET, &NativeLauncher::InitSystemFactoryResetSlice},    // 系统:恢复出厂设置实例化地址
         {VIEW_SOUND_VIBRATION, &NativeLauncher::InitSoundAndVibrationSlice},          // 声音与震动实例化地址
         {VIEW_SYSTEM_VOLUME, &NativeLauncher::InitSystemVolumeSlice},                 // 系统音量
@@ -485,24 +482,16 @@ namespace OHOS
 
     void NativeLauncher::InitSystemSlice(void) // 系统
     {
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NativeLauncher::InitSystemSlice");
         SliceProxy *system = new AbilitySliceProxy<SystemView, SystemPresenter>;
         if (system == nullptr)
         {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "system is nullptr!");
             return;
         }
         NativeAbility::GetInstance().AddSliceProxy(VIEW_SYSTEM, system);
     }
 
-    void NativeLauncher::InitSystemLanguageSlice(void) // 系统：系统语言
-    {
-        SliceProxy *systemlanguage = new AbilitySliceProxy<SystemLanguageView, SystemLanguagePresenter>;
-        if (systemlanguage == nullptr)
-        {
-            return;
-        }
-        NativeAbility::GetInstance().AddSliceProxy(VIEW_SYSTEM_SYSTEM_LANGUAGE, systemlanguage);
-    }
-
     void NativeLauncher::InitSystemFactoryResetSlice(void) // 系统：恢复出厂设置
     {
         SliceProxy *systemfactoryreset = new AbilitySliceProxy<SystemFactoryResetView, SystemFactoryResetPresenter>;

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemLanguagePresenter.h b/code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemLanguagePresenter.h
deleted file mode 100644 (file)
index f4406d4..0000000
--- a/code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemLanguagePresenter.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef SYSTEM_LANGUAGE_PRESENTER_H\r
-#define SYSTEM_LANGUAGE_PRESENTER_H\r
-\r
-#include "Presenter.h"\r
-#include "SystemLanguageView.h"\r
-#include "components/ui_checkbox.h"\r
-namespace OHOS\r
-{\r
-    class SystemLanguageView;\r
-\r
-    class SystemLanguagePresenter : public Presenter<SystemLanguageView>,\r
-                                    public UIView::OnClickListener,\r
-                                    public UIView::OnDragListener\r
-    {\r
-    public:\r
-        SystemLanguagePresenter();\r
-        SystemLanguagePresenter(UICheckBox *checkbox1, UICheckBox *checkbox2) : m_checkbox1(checkbox1), m_checkbox2(checkbox2) {}\r
-        virtual ~SystemLanguagePresenter();\r
-\r
-        void UpdateCheckBoxState(UICheckBox &checkbox, bool isSelected);\r
-        //void ToggleCheckBoxState(UICheckBox &checkbox);\r
-\r
-    public:\r
-        void OnStart() override;\r
-        void OnPause() override;\r
-        void OnResume() override;\r
-        void OnStop() override;\r
-\r
-        static SystemLanguagePresenter *GetInstance();\r
-\r
-    private:\r
-        // 因为继承了OnClickListener，所以有OnClick属性，至于参数,原函数也这样直接继承;\r
-        bool OnClick(UIView &view, const ClickEvent &event) override;\r
-        bool OnDrag(UIView &view, const DragEvent &event) override;\r
-\r
-    private:\r
-        UICheckBox *m_checkbox1 = nullptr;\r
-        UICheckBox *m_checkbox2 = nullptr;\r
-    };\r
-} // namespace OHOS\r
-\r
-#endif // SLEEPDETAIL_PRESENTER_H
\ No newline at end of file

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemLanguageView.h b/code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemLanguageView.h
index 7e251b5..afb6b98 100644 (file)
--- a/code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemLanguageView.h
+++ b/code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemLanguageView.h
@@ -3,11 +3,9 @@
 \r
 #include "BaseView.h"\r
 #include "View.h"\r
-\r
-#include "components/ui_view_group.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_label.h"\r
-#include "components/ui_checkbox.h"\r
+#include "components/ui_radio_button.h"\r
 #include "components/ui_image_view.h"\r
 namespace OHOS\r
 {\r
@@ -15,37 +13,58 @@ namespace OHOS
     static const char *ENGLISH_BUTTON = "EnglishButton";                          // English button\r
     static const char *SIMPLIFIED_CHINESE_CHECKBOX = "SimplifiedChineseCheckBox"; // 简体中文 checkbox\r
     static const char *ENGLISH_CHECKBOX = "EnglishCheckBox";                      // English checkbox\r
-\r
-    class SystemLanguagePresenter;\r
-    class SystemLanguageView : public View<SystemLanguagePresenter>\r
+    class SystemLanguageView\r
     {\r
 \r
     public:\r
+        struct ImageConfig\r
+        {\r
+            int x;\r
+            int y;\r
+            int w;\r
+            int h;\r
+            const char *ImageSrc;\r
+        };\r
+        struct LabelConfig\r
+        {\r
+            int16_t left;\r
+            int16_t top;\r
+            int16_t width;\r
+            int16_t height;\r
+            int16_t fontSize;      // 字体大小\r
+            int16_t lineHeigh;     // 行高\r
+            const char *text;      // 文本\r
+            uint8_t lineBreakMode; // 断行模式。\r
+        };\r
+        struct RadioButtonConfig\r
+        {\r
+            int16_t left;\r
+            int16_t top;\r
+            int16_t width;\r
+            int16_t height;\r
+            const char *name;\r
+            const char *viewId;\r
+            const char *select;\r
+            const char *unselect;\r
+        };\r
         SystemLanguageView();\r
         virtual ~SystemLanguageView();\r
         static SystemLanguageView *GetInstance(void);\r
-\r
-        void OnStart() override;\r
-        void OnSetUpView() override;\r
-        void OnTearDownView() override;\r
-        void OnStop() override;\r
-\r
-    private:\r
-        void InitView(void);\r
-        void DeInitView(void);\r
-\r
-        void init(void);\r
-\r
+        UIScrollView *SystemLanguageViewInit(void);                              // 系统语言视图初始化\r
+        void ClearAll(void);                                                     // 清除所有组件\r
+        UIImageView *SetUpImageVIew(ImageConfig &imageconfig);                   // 设置图片\r
+        UILabel *SetUpLabel(LabelConfig &labelconfig);                           // 设置标签\r
+        UIRadioButton *SetUpRadioButton(RadioButtonConfig &radiobutton);         // 设置单选按钮\r
+        void SetRadioButtonSelectStatus(UIRadioButton &radiobutton, bool state); // 设置单选框的选择状态\r
     private:\r
-        UIViewGroup *container_ = nullptr;\r
         UIScrollView *scrollView = nullptr;\r
-        UILabel *LanguageLabel = nullptr;\r
-        UIImageView *SimplifiedChineseImage = nullptr;\r
-        UICheckBox *SimplifiedChineseCheckBox = nullptr;\r
-        UIImageView *EnglishImage = nullptr;\r
+        UILabel *Title = nullptr;            // 标题\r
+        UIImageView *Background[2]{nullptr}; // 放组件的背景\r
         UILabel *SimplifiedChineseLabel = nullptr;\r
         UILabel *EnglishLabel = nullptr;\r
-        UICheckBox *EnglishCheckBox = nullptr;\r
+        UIRadioButton *SimplifiedChineseRadioButton = nullptr;\r
+        UIRadioButton *EnglishRadioButton = nullptr;\r
+        bool initViewStatus{false};\r
     };\r
 } // namespace OHOS\r
-#endif // SLEEPDETAIL_PRESENTER_H
\ No newline at end of file
+#endif
\ No newline at end of file

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemView.h b/code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemView.h
index 8a8c86f..4e9a968 100644 (file)
--- a/code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemView.h
+++ b/code/sdk/application/wearable/nativeapp/nativeui/system/include/SystemView.h
@@ -11,6 +11,7 @@
 #include "components/ui_button.h"\r
 #include "system/include/SystemAboutTheWatchView.h"\r
 #include "system/include/SystemSuperviseView.h"\r
+#include "system/include/SystemLanguageView.h"\r
 namespace OHOS\r
 {\r
     static const char *ABOUT_THE_WATCH = "AboutTheWatchButton";  // 关于手表\r
@@ -46,6 +47,7 @@ namespace OHOS
         bool ChangeSystemView(int16_t thisView);\r
         bool ChangeSystemAboutView(int16_t thisView);\r
         bool ChangeSystemSuperviseView(int16_t thisView);\r
+        bool ChangeSystemLanguageView(int16_t thisView);\r
         bool ClickFunc(int16_t interface);\r
         void ChangeView(int16_t hideView, int16_t showView);\r
     private:\r
@@ -56,14 +58,13 @@ namespace OHOS
         UIButton * SetTheButton(ButtonConfig &buttonconfig, UIView::OnClickListener *clickListener);\r
         SystemAboutTheWatchView *p_SystemAboutTheWatchView{nullptr};\r
         SystemSuperviseView *p_SystemSuperviseView{nullptr};\r
+        SystemLanguageView *p_SystemLanguageView{nullptr};\r
         UIScrollView *SystemScrollView[5]{nullptr};\r
         UILabel *SystemLabel{nullptr}; // 标题\r
-        UIButton *FactoryResetButton{nullptr};\r
         UIButton *AboutTheWatchButton{nullptr};\r
         UIButton *SuperviseButton = {nullptr};\r
         UIButton *SystemLanguageButton = {nullptr};\r
-        UIView::OnDragListener *draglistener{nullptr};\r
-        UIView::OnClickListener *clickListener{nullptr};\r
+        UIButton *FactoryResetButton{nullptr};\r
         bool initViewStatus{false};\r
     };\r
 } // namespace OHOS\r

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemLanguagePresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemLanguagePresenter.cpp
deleted file mode 100644 (file)
index 7fb76a6..0000000
--- a/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemLanguagePresenter.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-#include "AppViewIDs.h"\r
-#include "NativeAbility.h"\r
-#include "graphic_math.h"\r
-#include "string.h"\r
-#include "system/include/SystemLanguagePresenter.h"\r
-\r
-namespace OHOS\r
-{\r
-\r
-    // 当前Presenter属性实例化的内存指针\r
-    static SystemLanguagePresenter *g_pSystemLanguagePresenter = nullptr;\r
-    int count = 1;\r
-    SystemLanguagePresenter::SystemLanguagePresenter()\r
-    {\r
-\r
-        g_pSystemLanguagePresenter = this;\r
-    }\r
-\r
-    SystemLanguagePresenter::~SystemLanguagePresenter()\r
-    {\r
-\r
-        g_pSystemLanguagePresenter = nullptr;\r
-    }\r
-\r
-    SystemLanguagePresenter *SystemLanguagePresenter::GetInstance()\r
-    {\r
-\r
-        return g_pSystemLanguagePresenter;\r
-    }\r
-\r
-    void SystemLanguagePresenter::OnStart()\r
-    {\r
-\r
-        Presenter<SystemLanguageView>::OnStart();\r
-    }\r
-\r
-    void SystemLanguagePresenter::OnPause(void)\r
-    {\r
-\r
-        Presenter<SystemLanguageView>::OnPause();\r
-    }\r
-\r
-    void SystemLanguagePresenter::OnResume(void)\r
-    {\r
-\r
-        Presenter<SystemLanguageView>::OnResume();\r
-    }\r
-\r
-    void SystemLanguagePresenter::OnStop(void)\r
-    {\r
-\r
-        Presenter<SystemLanguageView>::OnStop();\r
-    }\r
-    bool SystemLanguagePresenter::OnDrag(UIView &view, const DragEvent &event)\r
-    {\r
-        UNUSED(view);\r
-        if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT &&\r
-            (event.GetDeltaX() > 20) && (event.GetDeltaX() > (2 * MATH_ABS(event.GetDeltaY()))))\r
-        {\r
-            NativeAbility::GetInstance().ChangeSlice(VIEW_SYSTEM);\r
-            return true;\r
-        }\r
-        return false;\r
-    }\r
-\r
-    bool SystemLanguagePresenter::OnClick(UIView &view, const ClickEvent &event)\r
-    {\r
-        if (strcmp(view.GetViewId(), SIMPLIFIED_CHINESE_CHECKBOX) == 0)\r
-        {\r
-\r
-            m_checkbox1->SetState(UICheckBox::SELECTED);\r
-            UpdateCheckBoxState(*m_checkbox2, false);\r
-\r
-            return true;\r
-        }\r
-        else if (strcmp(view.GetViewId(), ENGLISH_CHECKBOX) == 0)\r
-        {\r
-            m_checkbox2->SetState(UICheckBox::SELECTED);\r
-            UpdateCheckBoxState(*m_checkbox1, false);\r
-            return true;\r
-        }\r
-        return false;\r
-    }\r
-\r
-    // 根据传入的选中状态更新复选框的状态\r
-    void SystemLanguagePresenter::UpdateCheckBoxState(UICheckBox &checkbox, bool isSelected)\r
-    {\r
-        checkbox.SetState(isSelected ? UICheckBox::SELECTED : UICheckBox::UNSELECTED);\r
-    }\r
-}
\ No newline at end of file

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemLanguageView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemLanguageView.cpp
index 035f377..5d11053 100644 (file)
--- a/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemLanguageView.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemLanguageView.cpp
@@ -1,8 +1,9 @@
 #include "system/include/SystemLanguageView.h"\r
-#include "system/include/SystemLanguagePresenter.h"\r
+#include "system/include/SystemPresenter.h"\r
 #include "string.h"\r
 #include "UiConfig.h"\r
-#include "ui_view.h"\r
+#include "wearable_log.h"\r
+\r
 namespace OHOS\r
 {\r
 \r
@@ -10,261 +11,223 @@ namespace OHOS
 \r
     SystemLanguageView::SystemLanguageView()\r
     {\r
-\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemLanguageView::SystemLanguageView");\r
         g_pSystemLanguageView = this;\r
     }\r
 \r
     SystemLanguageView::~SystemLanguageView()\r
     {\r
-        DeInitView();\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemLanguageView::~SystemLanguageView");\r
+        ClearAll();\r
         g_pSystemLanguageView = nullptr;\r
     }\r
 \r
     SystemLanguageView *SystemLanguageView::GetInstance()\r
     {\r
-\r
         return g_pSystemLanguageView;\r
     }\r
 \r
-    void SystemLanguageView::InitView()\r
+    void SystemLanguageView::ClearAll()\r
     {\r
-        if (container_ == nullptr)\r
+        if (initViewStatus == true)\r
         {\r
-            container_ = new UIViewGroup();\r
-            container_->SetPosition(0, 0, 466, 466);\r
-            container_->SetStyle(STYLE_BACKGROUND_OPA, 0);\r
-            UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(SystemLanguagePresenter::GetInstance());\r
-            if (draglistener == nullptr)\r
+            scrollView->RemoveAll();\r
+            delete Title;\r
+            Title = nullptr;\r
+            for (int i = 0; i < 2; i++)\r
             {\r
-                return;\r
+                delete Background[i];\r
+                Background[i] = nullptr;\r
             }\r
-            container_->SetOnDragListener(draglistener);\r
-            container_->SetTouchable(true);\r
-            container_->SetDraggable(true);\r
-        }\r
-        /***********************************************************************************************************/\r
-        if (scrollView == nullptr)\r
-        {\r
-            scrollView = new UIScrollView();\r
-        }\r
-        scrollView->SetPosition(0, 0);\r
-        scrollView->Resize(466, 466);\r
-        scrollView->SetViewId("scrollView");\r
-        scrollView->SetStyle(STYLE_BACKGROUND_OPA, 0xff);\r
-        scrollView->SetStyle(STYLE_BORDER_RADIUS, 1294);\r
-        container_->Add(scrollView);\r
-        scrollView->SetVisible(true);\r
-        /***********************************************************************************************************/\r
-        // Add Label to App\r
-        if (LanguageLabel == nullptr)\r
-        {\r
-            LanguageLabel = new UILabel();\r
-        }\r
-        LanguageLabel->SetPosition(203, 52);       // widget's left position and top position\r
-        LanguageLabel->Resize(200, 60);            // widget's width and height\r
-        LanguageLabel->SetViewId("LanguageLabel"); // Set style\r
-        LanguageLabel->SetStyle(STYLE_TEXT_FONT, 30);\r
-        LanguageLabel->SetStyle(STYLE_LINE_HEIGHT, 35);\r
-        // Set additional property\r
-        LanguageLabel->SetText("语言");\r
-        LanguageLabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);\r
-        LanguageLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-        LanguageLabel->SetRollSpeed(0);\r
-        LanguageLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
-        scrollView->Add(LanguageLabel);\r
-        LanguageLabel->SetVisible(true);\r
-        /***********************************************************************************************************/\r
-        if (SimplifiedChineseImage == nullptr)\r
-        {\r
-            SimplifiedChineseImage = new UIImageView();\r
-        }\r
-        SimplifiedChineseImage->SetPosition(43, 120);                 \r
-        SimplifiedChineseImage->Resize(380, 100);                     \r
-        SimplifiedChineseImage->SetViewId(SIMPLIFIED_CHINESE_BUTTON);\r
-        SimplifiedChineseImage->SetStyle(STYLE_BORDER_RADIUS, 50);\r
-        SimplifiedChineseImage->SetSrc(PNG_SETTING_BACKGROUND_IMAGE);\r
-        // Add to scrollView1\r
-        scrollView->Add(SimplifiedChineseImage);\r
-        SimplifiedChineseImage->SetVisible(true);\r
-        /***********************************************************************************************************/\r
-        if (SimplifiedChineseLabel == nullptr)\r
-        {\r
-            SimplifiedChineseLabel = new UILabel();\r
-        }\r
-        SimplifiedChineseLabel->SetPosition(90, 153);                \r
-        SimplifiedChineseLabel->Resize(120, 35);                     \r
-        SimplifiedChineseLabel->SetViewId("SimplifiedChineseLabel");\r
-        SimplifiedChineseLabel->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919);\r
-        SimplifiedChineseLabel->SetStyle(STYLE_BACKGROUND_OPA, 0xff);\r
-        SimplifiedChineseLabel->SetStyle(STYLE_TEXT_FONT, 30);\r
-        SimplifiedChineseLabel->SetStyle(STYLE_LINE_HEIGHT, 35);\r
-        // Set additional property\r
-        SimplifiedChineseLabel->SetText("简体中文");\r
-        SimplifiedChineseLabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);\r
-        SimplifiedChineseLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-        SimplifiedChineseLabel->SetRollSpeed(0);\r
-        SimplifiedChineseLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
-        // Add to scrollView1\r
-        scrollView->Add(SimplifiedChineseLabel);\r
-        SimplifiedChineseLabel->SetVisible(true);\r
-        /***********************************************************************************************************/\r
-        // Add CheckBox to App\r
-        if (SimplifiedChineseCheckBox == nullptr)\r
-        {\r
-            SimplifiedChineseCheckBox = new UICheckBox();\r
-        }\r
-        SimplifiedChineseCheckBox->SetState(UICheckBox::SELECTED);\r
-        SimplifiedChineseCheckBox->SetPosition(300, 130);                  // widget's left position and top position\r
-        SimplifiedChineseCheckBox->Resize(80, 80);                         // widget's width and height\r
-        SimplifiedChineseCheckBox->SetViewId(SIMPLIFIED_CHINESE_CHECKBOX); // Set style\r
-        SimplifiedChineseCheckBox->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919);\r
-        SimplifiedChineseCheckBox->SetStyle(STYLE_BACKGROUND_OPA, 0xff);\r
-        SimplifiedChineseCheckBox->SetImages(PNG_CHECKBOX_ON_IMAGE, PNG_CHECKBOX_OFF_IMAGE);\r
-        // Add the CallBack about events\r
-        UIView::OnClickListener *SimplifiedChineseCheckBoxClick = static_cast<UIView::OnClickListener *>(SystemLanguagePresenter::GetInstance());\r
-        SimplifiedChineseCheckBox->SetOnClickListener(SimplifiedChineseCheckBoxClick);\r
-        // Add to scrollView1\r
-        scrollView->Add(SimplifiedChineseCheckBox);\r
-        SimplifiedChineseCheckBox->SetVisible(true);\r
-        /***********************************************************************************************************/\r
-        if (EnglishImage == nullptr)\r
-        {\r
-            EnglishImage = new UIImageView();\r
-        }\r
-        EnglishImage->SetPosition(43, 240);     \r
-        EnglishImage->Resize(380, 100);          \r
-        EnglishImage->SetViewId(ENGLISH_BUTTON);\r
-        EnglishImage->SetStyle(STYLE_BORDER_RADIUS, 50);\r
-        EnglishImage->SetSrc(PNG_SETTING_BACKGROUND_IMAGE);\r
-        scrollView->Add(EnglishImage);\r
-        EnglishImage->SetVisible(true);\r
-        /***********************************************************************************************************/\r
-        if (EnglishLabel == nullptr)\r
-        {\r
-            EnglishLabel = new UILabel();\r
+            delete SimplifiedChineseLabel;\r
+            SimplifiedChineseLabel = nullptr;\r
+            delete EnglishLabel;\r
+            EnglishLabel = nullptr;\r
+            delete SimplifiedChineseRadioButton;\r
+            SimplifiedChineseRadioButton = nullptr;\r
+            delete EnglishRadioButton;\r
+            EnglishRadioButton = nullptr;\r
+            delete scrollView;\r
+            scrollView = nullptr;\r
         }\r
-        EnglishLabel->SetPosition(90, 273);      // widget's left position and top position\r
-        EnglishLabel->Resize(126, 35);           // widget's width and height\r
-        EnglishLabel->SetViewId("EnglishLabel"); // Set style\r
-        EnglishLabel->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919);\r
-        EnglishLabel->SetStyle(STYLE_BACKGROUND_OPA, 0xff);\r
-        EnglishLabel->SetStyle(STYLE_TEXT_FONT, 30);\r
-        EnglishLabel->SetStyle(STYLE_LINE_HEIGHT, 35);\r
-\r
-        // Set additional property\r
-        EnglishLabel->SetText("ENGLISH");\r
-        EnglishLabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);\r
-        EnglishLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-        EnglishLabel->SetRollSpeed(0);\r
-        EnglishLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
-\r
-        // Add to scrollView1\r
-        scrollView->Add(EnglishLabel);\r
-        EnglishLabel->SetVisible(true);\r
+    }\r
 \r
-        // Add CheckBox to App\r
-        if (EnglishCheckBox == nullptr)\r
+    // 设置图片\r
+    UIImageView *SystemLanguageView::SetUpImageVIew(ImageConfig &imageconfig)\r
+    {\r
+        UIImageView *Image = new UIImageView();\r
+        if (Image == nullptr)\r
         {\r
-            EnglishCheckBox = new UICheckBox();\r
+            return nullptr;\r
         }\r
-        EnglishCheckBox->SetPosition(300, 250);      \r
-        EnglishCheckBox->Resize(80, 80);             \r
-        EnglishCheckBox->SetViewId(ENGLISH_CHECKBOX);\r
-        EnglishCheckBox->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919);\r
-        EnglishCheckBox->SetStyle(STYLE_BACKGROUND_OPA, 0xff);\r
-        EnglishCheckBox->SetImages(PNG_CHECKBOX_ON_IMAGE, PNG_CHECKBOX_OFF_IMAGE);\r
-\r
-        // Add the CallBack about events\r
-        UIView::OnClickListener *EnglishCheckBoxClick = static_cast<UIView::OnClickListener *>(SystemLanguagePresenter::GetInstance());\r
-        EnglishCheckBox->SetOnClickListener(EnglishCheckBoxClick);\r
-        // Add to scrollView1\r
-        scrollView->Add(EnglishCheckBox);\r
-        EnglishCheckBox->SetVisible(true);\r
+        Image->SetPosition(imageconfig.x, imageconfig.y, imageconfig.w, imageconfig.h);\r
+        Image->SetSrc(imageconfig.ImageSrc);\r
+        return Image;\r
+    }\r
 \r
-        /***********************************************************************************************************/\r
-        // Add the CallBack about SimplifiedChineseImage sevents\r
-        UIView::OnClickListener *ButtonClick = static_cast<UIView::OnClickListener *>(new SystemLanguagePresenter(SimplifiedChineseCheckBox, EnglishCheckBox));\r
-        SimplifiedChineseCheckBox->SetOnClickListener(ButtonClick);\r
-        EnglishCheckBox->SetOnClickListener(ButtonClick);\r
+    // 设置标签\r
+    UILabel *SystemLanguageView::SetUpLabel(LabelConfig &labelconfig)\r
+    {\r
+        UILabel *label = new UILabel();\r
+        if (label == nullptr)\r
+        {\r
+            return nullptr;\r
+        }\r
+        label->SetPosition(labelconfig.left, labelconfig.top, labelconfig.width, labelconfig.height); // 位置大小\r
+        label->SetStyle(STYLE_TEXT_FONT, labelconfig.fontSize);                                       // 字体大小\r
+        label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh);                                    // 字体行高\r
+        label->SetText(labelconfig.text);                                                             // 内容\r
+        label->SetLineBreakMode(labelconfig.lineBreakMode);                                           // 断行模式。\r
+        label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
+        label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);\r
+        return label;\r
     }\r
 \r
-    void SystemLanguageView::DeInitView()\r
+    // 设置单选按钮\r
+    UIRadioButton *SystemLanguageView::SetUpRadioButton(RadioButtonConfig &radioButtonconfig)\r
     {\r
-        if (container_ != nullptr)\r
+        UIRadioButton *radiobutton = new UIRadioButton(radioButtonconfig.name);\r
+        if (radiobutton == nullptr)\r
         {\r
-            container_->RemoveAll();\r
-            delete container_;\r
-            container_ = nullptr;\r
+            return nullptr;\r
         }\r
-        if (scrollView != nullptr)\r
-        {\r
-            delete scrollView;\r
-            scrollView = nullptr;\r
-        }\r
-        if (LanguageLabel != nullptr)\r
-        {\r
-            delete LanguageLabel;\r
-            LanguageLabel = nullptr;\r
-        }\r
-        if (SimplifiedChineseImage != nullptr)\r
+        radiobutton->SetPosition(radioButtonconfig.left, radioButtonconfig.top, radioButtonconfig.width, radioButtonconfig.height);\r
+        radiobutton->SetViewId(radioButtonconfig.viewId);\r
+        radiobutton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919);\r
+        radiobutton->SetStyle(STYLE_BACKGROUND_OPA, 0xff);\r
+        radiobutton->SetImages(radioButtonconfig.select, radioButtonconfig.unselect);\r
+        return radiobutton;\r
+    }\r
+\r
+    // 设置单选框的选择状态\r
+    void SystemLanguageView::SetRadioButtonSelectStatus(UIRadioButton &radiobutton, bool state)\r
+    {\r
+        if (state == true)\r
         {\r
-            delete SimplifiedChineseImage;\r
-            SimplifiedChineseImage = nullptr;\r
+            radiobutton.SetState(UICheckBox::SELECTED);\r
         }\r
-        if (SimplifiedChineseCheckBox != nullptr)\r
+        else\r
         {\r
-            delete SimplifiedChineseCheckBox;\r
-            SimplifiedChineseCheckBox = nullptr;\r
+            radiobutton.SetState(UICheckBox::UNSELECTED);\r
         }\r
-        if (EnglishImage != nullptr)\r
+    }\r
+\r
+    UIScrollView *SystemLanguageView::SystemLanguageViewInit(void)\r
+    {\r
+        /* ------------------------------- scrollView ------------------------------- */\r
+        scrollView = new UIScrollView();\r
+        if (scrollView == nullptr)\r
         {\r
-            delete EnglishImage;\r
-            EnglishImage = nullptr;\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemLanguageView::scrollView new fail!");\r
         }\r
-        if (SimplifiedChineseLabel != nullptr)\r
+        scrollView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());\r
+        scrollView->SetStyle(STYLE_BACKGROUND_OPA, 0xff);\r
+        scrollView->SetStyle(STYLE_BORDER_RADIUS, 1294);\r
+        scrollView->SetVisible(true);\r
+        UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(SystemPresenter::GetInstance());\r
+        if (draglistener == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "function = %s,Line = %d,draglistener can not be nullptr!", __FUNCTION__, __LINE__);\r
+            return nullptr;\r
+        }\r
+        scrollView->SetOnDragListener(draglistener);\r
+        /* ---------------------------------- Title --------------------------------- */\r
+        Title = new UILabel();\r
+        if (Title == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemLanguageView::Title new fail!");\r
+            return nullptr;\r
+        }\r
+        Title->SetPosition(203, 52);\r
+        Title->SetStyle(STYLE_TEXT_FONT, 30);\r
+        Title->SetStyle(STYLE_LINE_HEIGHT, 35);\r
+        Title->SetText("语言");\r
+        Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);\r
+        Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
+        Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        scrollView->Add(Title);\r
+        /* ------------------------------- Background ------------------------------- */\r
+        ImageConfig imageconfig = {\r
+            .x = 43,\r
+            .y = 120,\r
+            .w = 380,\r
+            .h = 100,\r
+            .ImageSrc = "/user/res/SETTING_BACKGROUND.bin",\r
+        };\r
+        Background[0] = SetUpImageVIew(imageconfig);\r
+        if (Background[0] == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemLanguageView::Background[0] new fail!");\r
+            return nullptr;\r
+        }\r
+        imageconfig.y = 240;\r
+        Background[1] = SetUpImageVIew(imageconfig);\r
+        if (Background[1] == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemLanguageView::Background[1] new fail!");\r
+            return nullptr;\r
+        }\r
+        scrollView->Add(Background[0]);\r
+        scrollView->Add(Background[1]);\r
+        /* ------------------------- SimplifiedChineseLabel ------------------------- */\r
+        LabelConfig labelconfig = {\r
+            .left = 90,\r
+            .top = 153,\r
+            .width = 200,\r
+            .height = 60,\r
+            .fontSize = 30,\r
+            .lineHeigh = 35,\r
+            .text = "简体中文",\r
+            .lineBreakMode = UILabel::LINE_BREAK_ADAPT,\r
+        };\r
+        SimplifiedChineseLabel = SetUpLabel(labelconfig);\r
+        if (SimplifiedChineseLabel == nullptr)\r
         {\r
-            delete SimplifiedChineseLabel;\r
-            SimplifiedChineseLabel = nullptr;\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemLanguageView::SimplifiedChineseLabel new fail!");\r
+            return nullptr;\r
         }\r
-        if (EnglishLabel != nullptr)\r
-        {\r
-            delete EnglishLabel;\r
-            EnglishLabel = nullptr;\r
-        }\r
-        if (EnglishCheckBox != nullptr)\r
+        scrollView->Add(SimplifiedChineseLabel);\r
+        /* ------------------------------ EnglishLabel ------------------------------ */\r
+        labelconfig.top = 273;\r
+        labelconfig.text = "ENGLISH";\r
+        EnglishLabel = SetUpLabel(labelconfig);\r
+        if (EnglishLabel == nullptr)\r
         {\r
-            delete EnglishCheckBox;\r
-            EnglishCheckBox = nullptr;\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemLanguageView::EnglishLabel new fail!");\r
+            return nullptr;\r
         }\r
-    }\r
-\r
-    void SystemLanguageView::OnStart()\r
-    {\r
-        View<SystemLanguagePresenter>::OnStart();\r
-        InitView();\r
-        // container_容器属性 add\r
-        RootView::GetInstance()->Add(container_);\r
-    }\r
-\r
-    void SystemLanguageView::OnSetUpView()\r
-    {\r
-\r
-        View<SystemLanguagePresenter>::OnSetUpView();\r
-        Draw();\r
-    }\r
-\r
-    void SystemLanguageView::OnTearDownView()\r
-    {\r
-\r
-        View<SystemLanguagePresenter>::OnTearDownView();\r
-        return;\r
-    }\r
-\r
-    void SystemLanguageView::OnStop()\r
-    {\r
-\r
-        View<SystemLanguagePresenter>::OnStop();\r
-        RootView::GetInstance()->RemoveAll();\r
-        return;\r
+        scrollView->Add(EnglishLabel);\r
+        /* ---------------------- SimplifiedChineseRadioButton ---------------------- */\r
+        RadioButtonConfig radioButtonConfig = {\r
+            .left = 300,\r
+            .top = 120,\r
+            .width = 100,\r
+            .height = 100,\r
+            .name = "LanguageCategory",\r
+            .viewId = SIMPLIFIED_CHINESE_CHECKBOX,\r
+            .select = "/user/res/CHECKBOX_ON.bin",\r
+            .unselect = "/user/res/CHECKBOX_OFF.bin",\r
+        };\r
+        SimplifiedChineseRadioButton = SetUpRadioButton(radioButtonConfig);\r
+        if (SimplifiedChineseRadioButton == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemLanguageView::SimplifiedChineseRadioButton new fail!");\r
+            return nullptr;\r
+        }\r
+        SetRadioButtonSelectStatus(*SimplifiedChineseRadioButton, true);\r
+        scrollView->Add(SimplifiedChineseRadioButton);\r
+        /* --------------------------- EnglishRadioButton --------------------------- */\r
+        radioButtonConfig.left = 300;\r
+        radioButtonConfig.top = 240;\r
+        radioButtonConfig.viewId = ENGLISH_CHECKBOX;\r
+        EnglishRadioButton = SetUpRadioButton(radioButtonConfig);\r
+        if (EnglishRadioButton == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemLanguageView::EnglishRadioButton new fail!");\r
+            return nullptr;\r
+        }\r
+        scrollView->Add(EnglishRadioButton);\r
+        initViewStatus = true;\r
+        return scrollView;\r
     }\r
 }
\ No newline at end of file

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemPresenter.cpp
index 6165368..9a31522 100644 (file)
--- a/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemPresenter.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemPresenter.cpp
@@ -73,17 +73,17 @@ namespace OHOS
         // 根据控件id查找是哪个控件触发了点击回调\r
         if (strcmp(view.GetViewId(), ABOUT_THE_WATCH) == 0)\r
         {\r
-            SystemView::GetInstance()->ChangeView(0,1);\r
+            SystemView::GetInstance()->ChangeView(0, 1);\r
             return true;\r
         }\r
         else if (strcmp(view.GetViewId(), SUPERVISE) == 0)\r
         {\r
-            SystemView::GetInstance()->ChangeView(0,2);\r
+            SystemView::GetInstance()->ChangeView(0, 2);\r
             return true;\r
         }\r
         else if (strcmp(view.GetViewId(), SYSTEM_LANGUAGE) == 0)\r
         {\r
-            NativeAbility::GetInstance().ChangeSlice(VIEW_SYSTEM_SYSTEM_LANGUAGE);\r
+            SystemView::GetInstance()->ChangeView(0, 3);\r
             return true;\r
         }\r
         else if (strcmp(view.GetViewId(), FACTORY_RESET) == 0)\r

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemView.cpp
index b16c7df..10b9948 100644 (file)
--- a/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemView.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemView.cpp
@@ -40,7 +40,7 @@ namespace OHOS
         SystemScrollView[0]->SetScrollBlankSize(35);\r
         SystemScrollView[0]->SetReboundSize(50);\r
         SystemScrollView[0]->SetDirection(1);\r
-        draglistener = static_cast<UIView::OnDragListener *>(SystemPresenter::GetInstance());\r
+        UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(SystemPresenter::GetInstance());\r
         if (draglistener == nullptr)\r
         {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::draglistener can not be nullptr!");\r
@@ -109,7 +109,7 @@ namespace OHOS
             return;\r
         }\r
         /* -------------------------------------------------------------------------- */\r
-        clickListener = static_cast<UIView::OnClickListener *>(SystemPresenter::GetInstance());\r
+        UIView::OnClickListener *clickListener = static_cast<UIView::OnClickListener *>(SystemPresenter::GetInstance());\r
         /* -------------------------------------------------------------------------- */\r
         ButtonConfig buttonconfig;\r
         buttonconfig.x = 43;\r
@@ -161,11 +161,12 @@ namespace OHOS
         if (initViewStatus == true)\r
         {\r
             SystemScrollView[0]->RemoveAll();\r
-            for (int i = 0; i < 3; i++)\r
-            {\r
-                delete SystemScrollView[i];\r
-                SystemScrollView[i] = nullptr;\r
-            }\r
+            delete p_SystemAboutTheWatchView;\r
+            p_SystemAboutTheWatchView = nullptr;\r
+            delete p_SystemSuperviseView;\r
+            p_SystemSuperviseView = nullptr;\r
+            delete p_SystemLanguageView;\r
+            p_SystemLanguageView = nullptr;\r
             delete SystemLabel;\r
             SystemLabel = nullptr;\r
             delete AboutTheWatchButton;\r
@@ -179,13 +180,15 @@ namespace OHOS
         }\r
     }\r
 \r
+    // 0.跳转到系统视图，其他视图都市通过这个视图跳转\r
     bool SystemView::ChangeSystemView(int16_t thisView)\r
     {\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeSystemView");\r
         RootView::GetInstance()->Add(SystemScrollView[thisView]);\r
         return true;\r
     }\r
 \r
-    //跳转到关于手表\r
+    // 1.跳转到关于手表\r
     bool SystemView::ChangeSystemAboutView(int16_t thisView)\r
     {\r
         if (SystemScrollView[thisView] == nullptr)\r
@@ -198,19 +201,12 @@ namespace OHOS
                 return false;\r
             }\r
             SystemScrollView[thisView] = p_SystemAboutTheWatchView->SystemAbouTheWatchtInitIView();\r
-           RootView::GetInstance()->Add(SystemScrollView[thisView]);\r
+            RootView::GetInstance()->Add(SystemScrollView[thisView]);\r
         }\r
         return true;\r
     }\r
-    /* -------------------------------------------------------------------------- */\r
-    // 1.MainStopWatchViewMapper:结构体定义了一个将视图ID映射到特定成员函数指针的映射表。\r
-    struct SystemViewMapper\r
-    {\r
-        const int16_t viewId;\r
-        bool (SystemView::*func)(int16_t thisView);\r
-    };\r
 \r
-    //跳转到系统监管\r
+    // 2.跳转到系统监管\r
     bool SystemView::ChangeSystemSuperviseView(int16_t thisView)\r
     {\r
         if (SystemScrollView[thisView] == nullptr)\r
@@ -223,16 +219,44 @@ namespace OHOS
                 return false;\r
             }\r
             SystemScrollView[thisView] = p_SystemSuperviseView->SystemSuperviseViewInit();\r
-           RootView::GetInstance()->Add(SystemScrollView[thisView]);\r
+            RootView::GetInstance()->Add(SystemScrollView[thisView]);\r
+        }\r
+        return true;\r
+    }\r
+\r
+    // 3.跳转到系统语言界面\r
+    bool SystemView::ChangeSystemLanguageView(int16_t thisView)\r
+    {\r
+        if (SystemScrollView[thisView] == nullptr)\r
+        {\r
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeSystemLanguageView");\r
+            p_SystemLanguageView = new SystemLanguageView();\r
+            if (p_SystemLanguageView == nullptr)\r
+            {\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView:: new scrollView[%d] fail", thisView);\r
+                return false;\r
+            }\r
+            SystemScrollView[thisView] = p_SystemLanguageView->SystemLanguageViewInit();\r
+            RootView::GetInstance()->Add(SystemScrollView[thisView]);\r
         }\r
         return true;\r
     }\r
+\r
+    /* -------------------------------------------------------------------------- */\r
+    // 1.MainStopWatchViewMapper:结构体定义了一个将视图ID映射到特定成员函数指针的映射表。\r
+    struct SystemViewMapper\r
+    {\r
+        const int16_t viewId;\r
+        bool (SystemView::*func)(int16_t thisView);\r
+    };\r
+\r
     // 2.ViewMapper[] 是一个静态的视图映射数组，将视图ID与MainStopWatchView类中的特定成员函数指针进行了绑定。\r
     static const SystemViewMapper ViewMapper[] =\r
         {\r
             {0, &SystemView::ChangeSystemView},\r
             {1, &SystemView::ChangeSystemAboutView},\r
-            {2, &SystemView::ChangeSystemSuperviseView}\r
+            {2, &SystemView::ChangeSystemSuperviseView},\r
+            {3, &SystemView::ChangeSystemLanguageView},\r
     };\r
 \r
     // 3.根据传入的interface参数执行相应视图ID关联的成员函数。\r
@@ -257,9 +281,9 @@ namespace OHOS
     // 4.切换视图\r
     void SystemView::ChangeView(int16_t hideView, int16_t showView)\r
     {\r
-        if (hideView > 4)\r
+        if (hideView > 5)\r
         {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainStopWatchView:: StopWatchViewId Overstep ones bounds");\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView:: SystemViewId Overstep ones bounds");\r
             return;\r
         }\r
         SystemScrollView[hideView]->SetVisible(false);\r
@@ -267,6 +291,7 @@ namespace OHOS
         SystemScrollView[showView]->SetVisible(true);\r
         Draw();\r
     }\r
+    /* -------------------------------------------------------------------------- */\r
 \r
     void SystemView::OnStart()\r
     {\r

diff --git a/code/sdk/open_source/openharmony/base/startup/syspara_lite/src/hal_sys_param.c b/code/sdk/open_source/openharmony/base/startup/syspara_lite/src/hal_sys_param.c
index 14051ee..0d90e0c 100755 (executable)
--- a/code/sdk/open_source/openharmony/base/startup/syspara_lite/src/hal_sys_param.c
+++ b/code/sdk/open_source/openharmony/base/startup/syspara_lite/src/hal_sys_param.c
@@ -39,7 +39,7 @@ const char g_roBuildOs[] = {"OpenHarmony-3.2.11.9"};
 const char g_roBuildVerShow[] = {"1.0.0"};
 const int g_roFirstApiLevel = 1;
 const char INCREMENTAL_VERSION[] = {"version"};
-const char BUILD_TYPE[] = {"debug"};
+const char BUILD_TYPE[] = {"release"};
 const char BUILD_USER[] = {"luozheng"};
 const char BUILD_HOST[] = {"linux"};
 const char BUILD_TIME[] = {"2024111"};