From: SnickerSun Date: Thu, 25 Jul 2024 03:56:29 +0000 (+0800) Subject: About窗口添加硬件版本 X-Git-Tag: release_V1.2.70_20241020_135402~750^2~1 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=75a32c8e910c8a4282b53e6c814d287a8544eb6d;p=mirrors%2FFD230.git 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 f847490b3..fc542a334 100644 --- 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 @@ /* * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-30 09:14:38 - * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-05-07 10:31:43 + * @LastEditors: SnickerSun snickersun@163.com + * @LastEditTime: 2024-07-25 11:37:34 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemAboutTheWatchView.h */ #ifndef SYSTEM_ABOUT_VIEW_H @@ -62,6 +62,8 @@ namespace OHOS UILabel *IMEL{nullptr}; // "IMELTitle" UILabel *FONTTitle = nullptr; UILabel *FONT = nullptr; + UILabel *HWVERTitle = nullptr; + UILabel *HWVER = nullptr; bool initViewStatus{false}; }; 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 fe53c7606..cab3d82b4 100644 --- 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 @@ #define WATCH_ABOUT_TITLE_HEIGHT 50 #define WATCH_ABOUT_VALUE_HEIGHT 80 -#define WATCH_NAME_POS_TOP 160 +#define WATCH_NAME_POS_TOP 140 #define WATCH_NAME_VALUE_POS_TOP (WATCH_NAME_POS_TOP + WATCH_ABOUT_TITLE_HEIGHT) #define WATCH_FIRMWARE_POS_TOP (WATCH_NAME_VALUE_POS_TOP + WATCH_ABOUT_VALUE_HEIGHT) #define WATCH_FIRMWARE_VALUE_POS_TOP (WATCH_FIRMWARE_POS_TOP + WATCH_ABOUT_TITLE_HEIGHT) -#define WATCH_BT_NAME_TOP (WATCH_FIRMWARE_VALUE_POS_TOP + WATCH_ABOUT_VALUE_HEIGHT) +#define WATCH_HWVER_TOP (WATCH_FIRMWARE_VALUE_POS_TOP + WATCH_ABOUT_VALUE_HEIGHT) +#define WATCH_HWVER_VALUE_TOP (WATCH_HWVER_TOP + WATCH_ABOUT_TITLE_HEIGHT) +#define WATCH_BT_NAME_TOP (WATCH_HWVER_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT) #define WATCH_BT_NAME_VALUE_TOP (WATCH_BT_NAME_TOP + WATCH_ABOUT_TITLE_HEIGHT) #define WATCH_BT_ADDR_TOP (WATCH_BT_NAME_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT) #define WATCH_BT_ADDR_VALUE_TOP (WATCH_BT_ADDR_TOP + WATCH_ABOUT_TITLE_HEIGHT) @@ -113,6 +115,11 @@ namespace OHOS delete FONT; FONT = nullptr; + delete HWVERTitle; + HWVERTitle = nullptr; + delete HWVER; + HWVER = nullptr; + delete SystemAboutTheWatchScrollView; SystemAboutTheWatchScrollView = nullptr; } @@ -528,6 +535,47 @@ namespace OHOS } FONT->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87)); SystemAboutTheWatchScrollView->Add(FONT); + /* -------------------------------------------------------------------------- */ + Config = { + .left = TITLE_LABEL_X, + .top = WATCH_HWVER_TOP, + .width = TITLE_LABEL_W, + .height = TITLE_LABEL_H, + .fontSize = TITLE_LABEL_FONTSIZE, + .lineHeigh = TITLE_LABEL_LINEHEIGHT, + .text = "HW Version", + .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, + }; + HWVERTitle = InitLabel(Config); + if (HWVERTitle == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::HWVERTitle new fail!"); + return nullptr; + } + SystemAboutTheWatchScrollView->Add(HWVERTitle); + /* -------------------------------------------------------------------------- */ + Config = { + .left = LABEL_X, + .top = WATCH_HWVER_VALUE_TOP, + .width = LABEL_W, + .height = LABEL_H, + .fontSize = LABEL_FONTSIZE, + .lineHeigh = LABEL_LINEHEIGHT, + .text = "FD230 V1.0", + .lineBreakMode = UILabel::LINE_BREAK_WRAP, + }; + HWVER = InitLabel(Config); + if (HWVER == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::HWVER new fail!"); + return nullptr; + } + HWVER->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87)); + SystemAboutTheWatchScrollView->Add(HWVER); + + + + /* -------------------------------------------------------------------------- */ initViewStatus = true; return SystemAboutTheWatchScrollView;