恢复出厂设置视图优化

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 7663dcf..1e514d5 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-22 09:33:26
+ * @LastEditTime: 2024-10-26 14:51:09
  * @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
  */
@@ -43,6 +43,7 @@ namespace OHOS
         UILabelExt *FactoryResetNote{nullptr};
         UIButton *FactoryResetButtonCheckOn{nullptr};  // 重置确认
         UIButton *FactoryResetButtonCheckOff{nullptr}; // 重置否定
+        UIImageView *temp{nullptr};
         bool initViewStatus{false};
     };
 } // namespace OHOS

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 8fbdb4d..f13850f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/FactoryResetView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/FactoryResetView.cpp
@@ -62,6 +62,11 @@ namespace OHOS
                     delete FactoryResetButtonCheckOff;
                     FactoryResetButtonCheckOff = nullptr;
                 }
+                if (temp != nullptr)
+                {
+                    delete temp;
+                    temp = nullptr;
+                }
                 group->Remove(scrollView);
                 delete scrollView;
                 scrollView = nullptr;
@@ -104,8 +109,8 @@ namespace OHOS
             }
             scrollView->SetPosition(0, 0, 466, 466);
             scrollView->SetStyle(STYLE_BACKGROUND_OPA, 0xff);
-            scrollView->SetScrollBlankSize(50);
-            scrollView->SetReboundSize(35);
+            // scrollView->SetScrollBlankSize(30);
+            // scrollView->SetReboundSize(30);
             scrollView->SetMaxScrollDistance(1000);
             scrollView->SetThrowDrag(true);
             scrollView->RequestFocus();
@@ -193,6 +198,24 @@ namespace OHOS
                 return nullptr;
             }
             FactoryResetButtonCheckOn->SetOnClickListener(FactoryResetButtonCheckOnClick);
+            /* -------------------------------------------------------------------------- */
+            if ((FactoryResetButtonCheckOn->GetY() + FactoryResetButtonCheckOn->GetHeight() > Screen::GetInstance().GetHeight()))
+            {
+                if (temp == nullptr)
+                {
+                    temp = new UIImageView();
+                    if (temp == nullptr)
+                    {
+                        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemFactoryResetView::new temp fail!");
+                        return nullptr;
+                    }
+                    temp->SetPosition(43, FactoryResetButtonCheckOn->GetY() + FactoryResetButtonCheckOn->GetHeight(), 380, 40);
+                    temp->SetVisible(false);
+                    scrollView->Add(temp);
+                    scrollView->SetScrollBlankSize(30);
+                    scrollView->SetReboundSize(30);
+                }
+            }
 
             /* ----------------------------- Add to scroView ---------------------------- */
             scrollView->Add(Title);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemFactoryResetView.h b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemFactoryResetView.h
index 9a6d0d9..7b1c93a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemFactoryResetView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemFactoryResetView.h
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com\r
  * @Date: 2024-01-29 15:37:44\r
  * @LastEditors: luozheng 1732036298@qq.com\r
- * @LastEditTime: 2024-05-07 09:39:01\r
+ * @LastEditTime: 2024-10-26 11:47:49\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemFactoryResetView.h\r
  */\r
 #ifndef SYSTEM_FACTORYRESET_VIEW_H\r
@@ -35,6 +35,7 @@ namespace OHOS
         UILabelExt *FactoryResetNote{nullptr};\r
         UIButton *FactoryResetButtonCheckOn{nullptr};  // 重置确认\r
         UIButton *FactoryResetButtonCheckOff{nullptr}; // 重置否定\r
+        UIImageView *temp{nullptr};\r
         bool initViewStatus{false};\r
     };\r
 } // namespace OHOS\r

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 47e63d3..cfbe5c7 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemFactoryResetView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemFactoryResetView.cpp
@@ -48,6 +48,9 @@ namespace OHOS
             delete FactoryResetButtonCheckOff;\r
             FactoryResetButtonCheckOff = nullptr;\r
 \r
+            delete temp;\r
+            temp = nullptr;\r
+\r
             delete scrollView;\r
             scrollView = nullptr;\r
         }\r
@@ -64,8 +67,8 @@ 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->SetScrollBlankSize(30);\r
+        // scrollView->SetReboundSize(30);\r
         scrollView->SetMaxScrollDistance(1000);\r
         scrollView->SetThrowDrag(true);\r
         scrollView->RequestFocus();\r
@@ -87,7 +90,7 @@ namespace OHOS
         Title->SetPosition(83, 52, 300, 35);\r
         Title->SetStyle(STYLE_TEXT_FONT, 30);\r
         Title->SetStyle(STYLE_LINE_HEIGHT, 35);\r
-        Title->SetTextId(STR_FACTORY_RESET);/*恢复出厂*/\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
@@ -132,7 +135,7 @@ namespace OHOS
         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
-        if(FactoryResetButtonCheckOffClick == nullptr)\r
+        if (FactoryResetButtonCheckOffClick == nullptr)\r
         {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemFactoryResetView::FactoryResetButtonCheckOffClick is nullptr!");\r
             return nullptr;\r
@@ -154,13 +157,30 @@ namespace OHOS
         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
-        if(FactoryResetButtonCheckOnClick == nullptr)\r
+        if (FactoryResetButtonCheckOnClick == nullptr)\r
         {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemFactoryResetView::FactoryResetButtonCheckOnClick is nullptr!");\r
             return nullptr;\r
         }\r
         FactoryResetButtonCheckOn->SetOnClickListener(FactoryResetButtonCheckOnClick);\r
-\r
+        /* -------------------------------------------------------------------------- */\r
+        if ((FactoryResetButtonCheckOn->GetY() + FactoryResetButtonCheckOn->GetHeight() > Screen::GetInstance().GetHeight()))\r
+        {\r
+            if (temp == nullptr)\r
+            {\r
+                temp = new UIImageView();\r
+                if (temp == nullptr)\r
+                {\r
+                    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemFactoryResetView::new temp fail!");\r
+                    return nullptr;\r
+                }\r
+                temp->SetPosition(43, FactoryResetButtonCheckOn->GetY() + FactoryResetButtonCheckOn->GetHeight(), 380, 40);\r
+                temp->SetVisible(false);\r
+                scrollView->Add(temp);\r
+                scrollView->SetScrollBlankSize(30);\r
+                scrollView->SetReboundSize(30);\r
+            }\r
+        }\r
         /* ----------------------------- Add to scroView ---------------------------- */\r
         scrollView->Add(Title);\r
         scrollView->Add(FactoryResetImage);\r