系统视图添加系统升级功能

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h
index f027780..9711967 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h
@@ -9,16 +9,18 @@
 #include "components/ui_label.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_button.h"\r
+#include "components/ui_label_button_ext.h"\r
 #include "system/include/SystemAboutTheWatchView.h"\r
 #include "system/include/SystemSuperviseView.h"\r
 #include "system/include/SystemLanguageView.h"\r
 #include "system/include/SystemFactoryResetView.h"\r
 namespace OHOS\r
 {\r
-    static const char *ABOUT_THE_WATCH = "AboutTheWatchButton";  // 关于手表\r
-    static const char *SUPERVISE = "SuperviseButton";            // 监管\r
-    static const char *SYSTEM_LANGUAGE = "SystemLanguageButton"; // 系统语言\r
-    static const char *FACTORY_RESET = "FactoryResetButton";     // 恢复出厂设置\r
+    static const char *ABOUT_THE_WATCH = "AboutTheWatchButton";   // 关于手表\r
+    static const char *SUPERVISE = "SuperviseButton";             // 监管\r
+    static const char *SYSTEM_LANGUAGE = "SystemLanguageButton";  // 系统语言\r
+    static const char *FACTORY_RESET = "FactoryResetButton";      // 恢复出厂设置\r
+    static const char *SYSTEM_UPGRADE = "SystemUpgradeButtonExt"; // 系统升级\r
     static const char *ABOUT_THE_WATCH_IMAGESRC = "/user/res/system/SYSTEM_ABOUT_THE_WATCH.bin";\r
     static const char *SUPERVISE_IMAGESRC = "/user/res/system/SYSTEM_SUPERVISE.bin";\r
     static const char *SYSTEM_LANGUAGE_IMAGESRC = "/user/res/system/SYSTEM_SYSTEM_LANGUAGE.bin";\r
@@ -53,12 +55,13 @@ namespace OHOS
         bool ClickFunc(int16_t interface);\r
         void ChangeView(int16_t hideView, int16_t showView);\r
         UIScrollView *GetSystemScrollView(int ViewId);\r
+\r
     private:\r
         void InitIView(void);\r
         void ClearAll(void);\r
         bool SetTheSystemScrollView(void);\r
         bool SetTheTitle(void);\r
-        UIButton * SetTheButton(ButtonConfig &buttonconfig, UIView::OnClickListener *clickListener);\r
+        UIButton *SetTheButton(ButtonConfig &buttonconfig, UIView::OnClickListener *clickListener);\r
         SystemAboutTheWatchView *p_SystemAboutTheWatchView{nullptr};\r
         SystemSuperviseView *p_SystemSuperviseView{nullptr};\r
         SystemLanguageView *p_SystemLanguageView{nullptr};\r
@@ -69,6 +72,7 @@ namespace OHOS
         UIButton *SuperviseButton = {nullptr};\r
         UIButton *SystemLanguageButton = {nullptr};\r
         UIButton *FactoryResetButton{nullptr};\r
+        UILabelButtonExt *SystemUpgradeButtonExt{nullptr};\r
         bool initViewStatus{false};\r
     };\r
 } // namespace OHOS\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp
index 00a0173..f5fd4bf 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp
@@ -6,6 +6,7 @@
 #include "font/font_global_manager.h"\r
 #include "font/ui_font.h"\r
 #include "language/LanguageInit.h"\r
+#include "../../../../../../drivers/peripheral/utils/custom_utils.h"\r
 \r
 namespace OHOS\r
 {\r
@@ -115,6 +116,11 @@ namespace OHOS
             p_SystemView->ChangeView(FACTORYRESETVIEW, SYSTEMVIEW);\r
             return true;\r
         }\r
+        else if(strcmp(view.GetViewId(), SYSTEM_UPGRADE))\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "uaip_cmd_update_request");\r
+            uaip_cmd_update_request();\r
+        }\r
         return false;\r
     }\r
 \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 57ed3a5..8aae178 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp
@@ -187,6 +187,24 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::FactoryResetButton fail!");\r
             return;\r
         }\r
+        /* -------------------------------------------------------------------------- */\r
+        SystemUpgradeButtonExt = new UILabelButtonExt();\r
+        if (SystemUpgradeButtonExt == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::SystemUpgradeButtonExt new fail!");\r
+        }\r
+        SystemUpgradeButtonExt->SetPosition(43, 600, 380, 100);\r
+        SystemUpgradeButtonExt->SetViewId(SYSTEM_UPGRADE);\r
+        SystemUpgradeButtonExt->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919);\r
+        SystemUpgradeButtonExt->SetImagePosition(326, 37);\r
+        SystemUpgradeButtonExt->SetImageSrc("/user/res/SETTING_NEXT.bin", nullptr);\r
+        SystemUpgradeButtonExt->SetText("系统升级");\r
+        SystemUpgradeButtonExt->SetAlign(TEXT_ALIGNMENT_LEFT);\r
+        SystemUpgradeButtonExt->SetLabelPosition(45, 0);\r
+        SystemUpgradeButtonExt->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        SystemUpgradeButtonExt->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED);\r
+        SystemUpgradeButtonExt->SetOnClickListener(clickListener);\r
+\r
         initViewStatus = true;\r
     }\r
 \r
@@ -354,6 +372,7 @@ namespace OHOS
         SystemScrollView[SYSTEMVIEW]->Add(SuperviseButton);\r
         SystemScrollView[SYSTEMVIEW]->Add(SystemLanguageButton);\r
         SystemScrollView[SYSTEMVIEW]->Add(FactoryResetButton);\r
+        SystemScrollView[SYSTEMVIEW]->Add(SystemUpgradeButtonExt);\r
         RootView::GetInstance()->Add(SystemScrollView[SYSTEMVIEW]);\r
         Draw();\r
     }\r