系统视图优化修改

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 e0002e5..47e63d3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemFactoryResetView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemFactoryResetView.cpp
@@ -132,6 +132,11 @@ 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
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemFactoryResetView::FactoryResetButtonCheckOffClick is nullptr!");\r
+            return nullptr;\r
+        }\r
         FactoryResetButtonCheckOff->SetOnClickListener(FactoryResetButtonCheckOffClick);\r
         /* ------------------------ FactoryResetButtonCheckOn ----------------------- */\r
         FactoryResetButtonCheckOn = new UIButton();\r
@@ -149,6 +154,11 @@ 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
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemFactoryResetView::FactoryResetButtonCheckOnClick is nullptr!");\r
+            return nullptr;\r
+        }\r
         FactoryResetButtonCheckOn->SetOnClickListener(FactoryResetButtonCheckOnClick);\r
 \r
         /* ----------------------------- Add to scroView ---------------------------- */\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp
index 095d065..f45b072 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp
@@ -145,18 +145,21 @@ namespace OHOS
             {513, STR_SYSTEM_LANGUAGE},\r
             {633, STR_FACTORY_RESET},\r
         };\r
+        labelConfig = {\r
+            .left = 90,\r
+            .top = 153,\r
+            .width = 240,\r
+            .height = 35,\r
+            .fontSize = 30,\r
+            .lineHeigh = 35,\r
+            .textId = STR_ABOUT_WATCH,\r
+            .lineBreakMode = UILabel::LINE_BREAK_OSCILLATION,\r
+        };\r
         for (int i = 0; i < sizeof(labelSetups) / sizeof(labelSetups[0]); ++i)\r
         {\r
-            labelConfig = {\r
-                .left = 90,\r
-                .top = labelSetups[i].y,\r
-                .width = 240,\r
-                .height = 35,\r
-                .fontSize = 30,\r
-                .lineHeigh = 35,\r
-                .textId = labelSetups[i].textId,\r
-                .lineBreakMode = UILabel::LINE_BREAK_OSCILLATION,\r
-            };\r
+\r
+            labelConfig.top = labelSetups[i].y;\r
+            labelConfig.textId = labelSetups[i].textId;\r
             SystemViewLabel[i] = SystemViewLabelInit(labelConfig);\r
             if (SystemViewLabel[i] == nullptr)\r
             {\r
@@ -223,7 +226,7 @@ namespace OHOS
         SystemScrollView[SYSTEMVIEW]->SetThrowDrag(true);         // 设置手指抬起屏幕后是否继续滚动。\r
         SystemScrollView[SYSTEMVIEW]->SetMaxScrollDistance(1000); // 设置手指抬起屏幕后的最大滚动距离。\r
         SystemScrollView[SYSTEMVIEW]->RequestFocus();\r
-        SystemScrollView[SYSTEMVIEW]->SetRotateFactor(true);\r
+        SystemScrollView[SYSTEMVIEW]->SetRotateFactor(1.0);\r
         SystemScrollView[SYSTEMVIEW]->SetOnDragListener(presenter_);\r
         SystemScrollView[SYSTEMVIEW]->SetTouchable(true);\r
         SystemScrollView[SYSTEMVIEW]->SetDraggable(true);\r