About窗口添加硬件版本

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemAboutTheWatchView.h b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemAboutTheWatchView.h
index f847490..fc542a3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemAboutTheWatchView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemAboutTheWatchView.h
@@ -1,8 +1,8 @@
 /*\r
  * @Author: luozheng 1732036298@qq.com\r
  * @Date: 2024-03-30 09:14:38\r
- * @LastEditors: luozheng 1732036298@qq.com\r
- * @LastEditTime: 2024-05-07 10:31:43\r
+ * @LastEditors: SnickerSun snickersun@163.com\r
+ * @LastEditTime: 2024-07-25 11:37:34\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemAboutTheWatchView.h\r
  */\r
 #ifndef SYSTEM_ABOUT_VIEW_H\r
@@ -62,6 +62,8 @@ namespace OHOS
         UILabel *IMEL{nullptr};                        // "IMELTitle"\r
         UILabel *FONTTitle = nullptr;\r
         UILabel *FONT = nullptr;\r
+        UILabel *HWVERTitle = nullptr;\r
+        UILabel *HWVER = nullptr;\r
 \r
         bool initViewStatus{false};\r
     };\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp
index fe53c76..cab3d82 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp
@@ -6,11 +6,13 @@
 \r
 #define WATCH_ABOUT_TITLE_HEIGHT 50\r
 #define WATCH_ABOUT_VALUE_HEIGHT 80\r
-#define WATCH_NAME_POS_TOP 160\r
+#define WATCH_NAME_POS_TOP 140\r
 #define WATCH_NAME_VALUE_POS_TOP (WATCH_NAME_POS_TOP + WATCH_ABOUT_TITLE_HEIGHT)\r
 #define WATCH_FIRMWARE_POS_TOP (WATCH_NAME_VALUE_POS_TOP + WATCH_ABOUT_VALUE_HEIGHT)\r
 #define WATCH_FIRMWARE_VALUE_POS_TOP (WATCH_FIRMWARE_POS_TOP + WATCH_ABOUT_TITLE_HEIGHT)\r
-#define WATCH_BT_NAME_TOP (WATCH_FIRMWARE_VALUE_POS_TOP + WATCH_ABOUT_VALUE_HEIGHT)\r
+#define WATCH_HWVER_TOP (WATCH_FIRMWARE_VALUE_POS_TOP + WATCH_ABOUT_VALUE_HEIGHT)\r
+#define WATCH_HWVER_VALUE_TOP (WATCH_HWVER_TOP + WATCH_ABOUT_TITLE_HEIGHT)\r
+#define WATCH_BT_NAME_TOP (WATCH_HWVER_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT)\r
 #define WATCH_BT_NAME_VALUE_TOP (WATCH_BT_NAME_TOP + WATCH_ABOUT_TITLE_HEIGHT)\r
 #define WATCH_BT_ADDR_TOP (WATCH_BT_NAME_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT)\r
 #define WATCH_BT_ADDR_VALUE_TOP (WATCH_BT_ADDR_TOP + WATCH_ABOUT_TITLE_HEIGHT)\r
@@ -113,6 +115,11 @@ namespace OHOS
             delete FONT;\r
             FONT = nullptr;\r
 \r
+            delete HWVERTitle;\r
+            HWVERTitle = nullptr;\r
+            delete HWVER;\r
+            HWVER = nullptr;\r
+\r
             delete SystemAboutTheWatchScrollView;\r
             SystemAboutTheWatchScrollView = nullptr;\r
         }\r
@@ -528,6 +535,47 @@ namespace OHOS
         }\r
         FONT->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87));\r
         SystemAboutTheWatchScrollView->Add(FONT);\r
+        /* -------------------------------------------------------------------------- */\r
+        Config = {\r
+            .left = TITLE_LABEL_X,\r
+            .top = WATCH_HWVER_TOP,\r
+            .width = TITLE_LABEL_W,\r
+            .height = TITLE_LABEL_H,\r
+            .fontSize = TITLE_LABEL_FONTSIZE,\r
+            .lineHeigh = TITLE_LABEL_LINEHEIGHT,\r
+            .text = "HW Version",\r
+            .lineBreakMode = UILabel::LINE_BREAK_MARQUEE,\r
+        };\r
+        HWVERTitle = InitLabel(Config);\r
+        if (HWVERTitle == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::HWVERTitle new fail!");\r
+            return nullptr;\r
+        }\r
+        SystemAboutTheWatchScrollView->Add(HWVERTitle);\r
+        /* -------------------------------------------------------------------------- */\r
+        Config = {\r
+            .left = LABEL_X,\r
+            .top = WATCH_HWVER_VALUE_TOP,\r
+            .width = LABEL_W,\r
+            .height = LABEL_H,\r
+            .fontSize = LABEL_FONTSIZE,\r
+            .lineHeigh = LABEL_LINEHEIGHT,\r
+            .text = "FD230 V1.0",\r
+            .lineBreakMode = UILabel::LINE_BREAK_WRAP,\r
+        };\r
+        HWVER = InitLabel(Config);\r
+        if (HWVER == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::HWVER new fail!");\r
+            return nullptr;\r
+        }\r
+        HWVER->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87));\r
+        SystemAboutTheWatchScrollView->Add(HWVER);\r
+\r
+\r
+\r
+        \r
         /* -------------------------------------------------------------------------- */\r
         initViewStatus = true;\r
         return SystemAboutTheWatchScrollView;\r