修改恢复出厂设置适配多国语言

diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/include/FactoryResetView.h b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/include/FactoryResetView.h
index d6199e5..91f8a80 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/include/FactoryResetView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/include/FactoryResetView.h
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-07-20 14:12:16
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-07-20 14:54:48
+ * @LastEditTime: 2024-07-22 09:33:26
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/include/FactoryResetVIew.h
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -17,6 +17,7 @@
 #include "components/ui_button.h"
 #include "components/ui_view_group.h"
 #include "components/ui_label_ext.h"
+#include "components/ui_scroll_view.h"
 namespace OHOS
 {
     static constexpr const char *FACTORY_RESET_GROUPVIEW = "FactoryResetGroupView";
@@ -35,6 +36,7 @@ namespace OHOS
 
     private:
         UIViewGroup *group{nullptr};
+        UIScrollView*scrollView{nullptr};
         UILabelExt *Title{nullptr};
         UIImageView *FactoryResetImage{nullptr};
         UILabelExt *FactoryResetNote{nullptr};

diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/FactoryResetView.cpp b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/FactoryResetView.cpp
index b09d102..06a74c4 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/FactoryResetView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/FactoryResetView.cpp
@@ -31,37 +31,41 @@ namespace OHOS
     {
         if (initViewStatus == true)
         {
-            group->RemoveAll();
-
-            if (Title != nullptr)
+            if (scrollView != nullptr)
             {
-                delete Title;
-                Title = nullptr;
-            }
+                scrollView->RemoveAll();
+                if (Title != nullptr)
+                {
+                    delete Title;
+                    Title = nullptr;
+                }
 
-            if (FactoryResetImage != nullptr)
-            {
-                delete FactoryResetImage;
-                FactoryResetImage = nullptr;
-            }
+                if (FactoryResetImage != nullptr)
+                {
+                    delete FactoryResetImage;
+                    FactoryResetImage = nullptr;
+                }
 
-            if (FactoryResetNote != nullptr)
-            {
-                delete FactoryResetNote;
-                FactoryResetNote = nullptr;
-            }
+                if (FactoryResetNote != nullptr)
+                {
+                    delete FactoryResetNote;
+                    FactoryResetNote = nullptr;
+                }
 
-            if (FactoryResetButtonCheckOn != nullptr)
-            {
-                delete FactoryResetButtonCheckOn;
-                FactoryResetButtonCheckOn = nullptr;
+                if (FactoryResetButtonCheckOn != nullptr)
+                {
+                    delete FactoryResetButtonCheckOn;
+                    FactoryResetButtonCheckOn = nullptr;
+                }
+                if (FactoryResetButtonCheckOff != nullptr)
+                {
+                    delete FactoryResetButtonCheckOff;
+                    FactoryResetButtonCheckOff = nullptr;
+                }
+                group->Remove(scrollView);
+                delete scrollView;
+                scrollView = nullptr;
             }
-            if (FactoryResetButtonCheckOff != nullptr)
-            {
-                delete FactoryResetButtonCheckOff;
-                FactoryResetButtonCheckOff = nullptr;
-            }
-
             delete group;
             group = nullptr;
         }
@@ -91,6 +95,21 @@ namespace OHOS
                 return nullptr;
             }
             group->SetOnDragListener(dragListener);
+            /* ------------------------------- scrollView ------------------------------- */
+            scrollView = new UIScrollView();
+            if (scrollView == nullptr)
+            {
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FactoryResetView::scrollView new fail!");
+                return nullptr;
+            }
+            scrollView->SetPosition(0, 0, 466, 466);
+            scrollView->SetStyle(STYLE_BACKGROUND_OPA, 0xff);
+            scrollView->SetScrollBlankSize(50);
+            scrollView->SetReboundSize(35);
+            scrollView->SetMaxScrollDistance(1000);
+            scrollView->SetThrowDrag(true);
+            scrollView->RequestFocus();
+            scrollView->SetRotateFactor(2);
             /* ---------------------------------- Title --------------------------------- */
             Title = new UILabelExt();
             if (Title == nullptr)
@@ -137,10 +156,11 @@ namespace OHOS
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FactoryResetView::new FactoryResetButtonCheckOff fail!");
                 return nullptr;
             }
-            FactoryResetButtonCheckOff->SetPosition(97, 320, 130, 130);
+            FactoryResetButtonCheckOff->SetPosition(97, FactoryResetNote->GetTextHeight() + FactoryResetNote->GetY() + 30, 130, 130);
             FactoryResetButtonCheckOff->SetViewId(FACTORY_RESET_BUTTON_CHECK_OFF);
             FactoryResetButtonCheckOff->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);
             FactoryResetButtonCheckOff->SetStyle(STYLE_BACKGROUND_OPA, 0x00);
+            FactoryResetButtonCheckOff->SetImagePosition(15, 15);
             FactoryResetButtonCheckOff->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff191919, UIButton::PRESSED);
             FactoryResetButtonCheckOff->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED);
             FactoryResetButtonCheckOff->SetImageSrc(PNG_SYSTEM_CHECK_OFF_IMAGE, PNG_SYSTEM_CHECK_OFF_IMAGE);
@@ -158,10 +178,11 @@ namespace OHOS
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FactoryResetView::new FactoryResetButtonCheckOn fail!");
                 return nullptr;
             }
-            FactoryResetButtonCheckOn->SetPosition(240, 320, 130, 130);
+            FactoryResetButtonCheckOn->SetPosition(240, FactoryResetButtonCheckOff->GetY(), 130, 130);
             FactoryResetButtonCheckOn->SetViewId(FACTORY_RESET_BUTTON_CHECK_ON);
             FactoryResetButtonCheckOn->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);
             FactoryResetButtonCheckOn->SetStyle(STYLE_BACKGROUND_OPA, 0x00);
+            FactoryResetButtonCheckOn->SetImagePosition(15, 15);
             FactoryResetButtonCheckOn->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff191919, UIButton::PRESSED);
             FactoryResetButtonCheckOn->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED);
             FactoryResetButtonCheckOn->SetImageSrc(PNG_SYSTEM_CHECK_ON_IMAGE, PNG_SYSTEM_CHECK_ON_IMAGE);
@@ -174,11 +195,12 @@ namespace OHOS
             FactoryResetButtonCheckOn->SetOnClickListener(FactoryResetButtonCheckOnClick);
 
             /* ----------------------------- Add to scroView ---------------------------- */
-            group->Add(Title);
-            group->Add(FactoryResetImage);
-            group->Add(FactoryResetNote);
-            group->Add(FactoryResetButtonCheckOff);
-            group->Add(FactoryResetButtonCheckOn);
+            scrollView->Add(Title);
+            scrollView->Add(FactoryResetImage);
+            scrollView->Add(FactoryResetNote);
+            scrollView->Add(FactoryResetButtonCheckOff);
+            scrollView->Add(FactoryResetButtonCheckOn);
+            group->Add(scrollView);
 
             initViewStatus = true;
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemFactoryResetView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemFactoryResetView.cpp
index 2491335..e0002e5 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemFactoryResetView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemFactoryResetView.cpp
@@ -64,6 +64,12 @@ namespace OHOS
         scrollView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());\r
         scrollView->SetStyle(STYLE_BACKGROUND_OPA, 0xff);\r
         scrollView->SetStyle(STYLE_BORDER_RADIUS, 100);\r
+        scrollView->SetScrollBlankSize(50);\r
+        scrollView->SetReboundSize(35);\r
+        scrollView->SetMaxScrollDistance(1000);\r
+        scrollView->SetThrowDrag(true);\r
+        scrollView->RequestFocus();\r
+        scrollView->SetRotateFactor(2);\r
         UIView::OnDragListener *dragListener = static_cast<UIView::OnDragListener *>(SystemPresenter::GetInstance());\r
         if (dragListener == nullptr)\r
         {\r
@@ -81,9 +87,9 @@ namespace OHOS
         Title->SetPosition(83, 52, 300, 35);\r
         Title->SetStyle(STYLE_TEXT_FONT, 30);\r
         Title->SetStyle(STYLE_LINE_HEIGHT, 35);\r
-        // Title->SetText("恢复出厂");\r
-        Title->SetTextId(STR_FACTORY_RESET);\r
-        Title->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);\r
+        Title->SetTextId(STR_FACTORY_RESET);/*恢复出厂*/\r
+        Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
+        Title->SetRollSpeed(70);\r
         Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
         Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         /* ---------------------------- FactoryResetImage --------------------------- */\r
@@ -105,8 +111,7 @@ namespace OHOS
         FactoryResetNote->SetPosition(53, 228, 360, 70);\r
         FactoryResetNote->SetStyle(STYLE_TEXT_FONT, 30);\r
         FactoryResetNote->SetStyle(STYLE_LINE_HEIGHT, 35);\r
-        // FactoryResetNote->SetText("该操作会清空并重置手表数据，是否确认继续？");\r
-        FactoryResetNote->SetTextId(STR_RESET_CONFIRM_NOTE);\r
+        FactoryResetNote->SetTextId(STR_RESET_CONFIRM_NOTE); /*该操作会清空并重置手表数据，是否确认继续？*/\r
         FactoryResetNote->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);\r
         FactoryResetNote->SetTextColor(Color::GetColorFromRGBA(0xff, 0x8a, 0x36, 0xff));\r
         FactoryResetNote->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
@@ -118,12 +123,13 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemFactoryResetView::new FactoryResetButtonCheckOff fail!");\r
             return nullptr;\r
         }\r
-        FactoryResetButtonCheckOff->SetPosition(97, 320, 130, 130);\r
+        FactoryResetButtonCheckOff->SetPosition(97, FactoryResetNote->GetY() + FactoryResetNote->GetTextHeight() + 30, 130, 130);\r
         FactoryResetButtonCheckOff->SetViewId(FACTORYRESET_CHECKOFF);\r
         FactoryResetButtonCheckOff->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);\r
         FactoryResetButtonCheckOff->SetStyle(STYLE_BACKGROUND_OPA, 0x00);\r
+        FactoryResetButtonCheckOff->SetImagePosition(15, 15);\r
         FactoryResetButtonCheckOff->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff191919, UIButton::PRESSED);\r
-        FactoryResetButtonCheckOff->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED);\r
+        FactoryResetButtonCheckOff->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED);\r
         FactoryResetButtonCheckOff->SetImageSrc(PNG_SYSTEM_CHECK_OFF_IMAGE, PNG_SYSTEM_CHECK_OFF_IMAGE);\r
         UIView::OnClickListener *FactoryResetButtonCheckOffClick = static_cast<UIView::OnClickListener *>(SystemPresenter::GetInstance());\r
         FactoryResetButtonCheckOff->SetOnClickListener(FactoryResetButtonCheckOffClick);\r
@@ -134,12 +140,13 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemFactoryResetView::new FactoryResetButtonCheckOn fail!");\r
             return nullptr;\r
         }\r
-        FactoryResetButtonCheckOn->SetPosition(240, 320, 130, 130);\r
+        FactoryResetButtonCheckOn->SetPosition(240, FactoryResetButtonCheckOff->GetY(), 130, 130);\r
         FactoryResetButtonCheckOn->SetViewId(FACTORYRESET_CHECKON);\r
         FactoryResetButtonCheckOn->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);\r
         FactoryResetButtonCheckOn->SetStyle(STYLE_BACKGROUND_OPA, 0x00);\r
+        FactoryResetButtonCheckOn->SetImagePosition(15, 15);\r
         FactoryResetButtonCheckOn->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff191919, UIButton::PRESSED);\r
-        FactoryResetButtonCheckOn->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED);\r
+        FactoryResetButtonCheckOn->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED);\r
         FactoryResetButtonCheckOn->SetImageSrc(PNG_SYSTEM_CHECK_ON_IMAGE, PNG_SYSTEM_CHECK_ON_IMAGE);\r
         UIView::OnClickListener *FactoryResetButtonCheckOnClick = static_cast<UIView::OnClickListener *>(SystemPresenter::GetInstance());\r
         FactoryResetButtonCheckOn->SetOnClickListener(FactoryResetButtonCheckOnClick);\r