From be45af03bf6007d5ea169e1cec0c937d88bb7292 Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Mon, 15 Apr 2024 19:34:25 +0800 Subject: [PATCH] =?utf8?q?=E8=A7=A3=E6=B1=BA=E2=80=9D=E5=85=B3=E4=BA=8E?= =?utf8?q?=E6=89=8B=E8=A1=A8=E2=80=9C=E8=A7=86=E5=9B=BE4G=20Modem=E6=A0=87?= =?utf8?q?=E7=AD=BE=20=E5=92=8CIMEI=E4=B8=8D=E8=83=BD=E6=98=BE=E7=A4=BA?= =?utf8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../system/include/SystemAboutTheWatchView.h | 44 +- .../system/src/SystemAboutTheWatchView.cpp | 536 +++++++++--------- 2 files changed, 307 insertions(+), 273 deletions(-) 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 f54a1cebd..e0fefb4a1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemAboutTheWatchView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemAboutTheWatchView.h @@ -1,3 +1,10 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-03-30 09:14:38 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-04-15 18:20:29 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemAboutTheWatchView.h + */ #ifndef SYSTEM_ABOUT_VIEW_H #define SYSTEM_ABOUT_VIEW_H @@ -25,36 +32,35 @@ namespace OHOS int16_t height; int16_t fontSize; // 字体大小 int16_t lineHeigh; // 行高 - char *text; // 文本 + std::string text; // 文本 uint8_t lineBreakMode; // 断行模式。 }; UIScrollView *SystemAbouTheWatchtInitIView(void); void ClearAll(void); + UILabelExt *InitLabel_Ext(LabelConfig &labelConfig); UILabel *InitLabel(LabelConfig &labelConfig); private: bool SetSystemAboutTheWatchScrollView(void); UIScrollView *SystemAboutTheWatchScrollView{nullptr}; - UILabel *SystemAboutTheWatchTitle{nullptr}; // “关于” - UILabel *WatchNameTitle{nullptr}; // “手表名称” - UILabel *WatchName{nullptr}; - UILabel *FirmwareVersionTitle{nullptr}; // "固件版本" - UILabel *FirmwareVersion{nullptr}; - UILabel *AlgorithmVersionTitle{nullptr}; // “算法版本” - UILabel *AlgorithmVersion{nullptr}; - UILabel *BluetoothAddressTitle{nullptr}; // “蓝牙地址” - UILabel *BluetoothAddress{nullptr}; - UILabel *LANAddressTitle{nullptr}; // “局域网地址” - UILabel *LANAddress = nullptr; - UILabel *FONTTitle = nullptr; + UILabelExt *SystemAboutTheWatchTitle{nullptr}; // "关于" + UILabelExt *WatchNameTitle{nullptr}; // "手表名称Title" + UILabel *WatchName{nullptr}; // "手表名称" + UILabelExt *FirmwareVersionTitle{nullptr}; // "固件版本Title" + UILabel *FirmwareVersion{nullptr}; // "固件版本" + UILabelExt *BluetoothNameTitle{nullptr}; // "蓝牙名称Title" + UILabel *BluetoothName{nullptr}; // "蓝牙名称" + UILabelExt *BluetoothAddressTitle{nullptr}; // "蓝牙地址Title" + UILabel *BluetoothAddress{nullptr}; // "蓝牙地址" + UILabelExt *Network4GTitle{nullptr}; // "4G ModemTitle" + UILabel *Network4G{nullptr}; // "4G Modem" + UILabelExt *PyVerTitle{nullptr}; // "pyVerTitle" + UILabel *PyVer{nullptr}; // "pyVer" + UILabelExt *IMELTitle{nullptr}; // "IMELTitle" + UILabel *IMEL{nullptr}; // "IMELTitle" + UILabelExt *FONTTitle = nullptr; UILabel *FONT = nullptr; - UILabel *CAT1Title = nullptr; - UILabel *CAT1mode = nullptr; - - UILabel *pyTitle = nullptr; - UILabel *pymode = 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 27c59e575..feab9bcb4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp @@ -4,28 +4,45 @@ #include "custom_utils.h" #include "config/include/ConfigModel.h" -#define WATCH_ABOUT_TITLE_HEIGHT 50 -#define WATCH_ABOUT_VALUE_HEIGHT 80 -#define WATCH_NAME_POS_TOP 160 -#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_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) -#define WATCH_MODEM_VERSION_TOP (WATCH_BT_ADDR_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT) -#define WATCH_MODEM_VERSION_VALUE_TOP (WATCH_MODEM_VERSION_TOP + WATCH_ABOUT_TITLE_HEIGHT) -#define WATCH_MODEM_APP_VERSION_TOP (WATCH_MODEM_VERSION_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT) -#define WATCH_MODEM_APP_VERSION_VALUE_TOP (WATCH_MODEM_APP_VERSION_TOP + WATCH_ABOUT_TITLE_HEIGHT) -#define WATCH_IMEI_TOP (WATCH_MODEM_APP_VERSION_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT) -#define WATCH_IMEI_VALUE_TOP (WATCH_IMEI_TOP + WATCH_ABOUT_TITLE_HEIGHT) -#define WATCH_FONT_TOP (WATCH_IMEI_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT) -#define WATCH_FONT_VALUE_TOP (WATCH_FONT_TOP + WATCH_ABOUT_TITLE_HEIGHT) - +#define WATCH_ABOUT_TITLE_HEIGHT 50 +#define WATCH_ABOUT_VALUE_HEIGHT 80 +#define WATCH_NAME_POS_TOP 160 +#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_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) +#define WATCH_MODEM_VERSION_TOP (WATCH_BT_ADDR_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT) +#define WATCH_MODEM_VERSION_VALUE_TOP (WATCH_MODEM_VERSION_TOP + WATCH_ABOUT_TITLE_HEIGHT) +#define WATCH_MODEM_APP_VERSION_TOP (WATCH_MODEM_VERSION_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT) +#define WATCH_MODEM_APP_VERSION_VALUE_TOP (WATCH_MODEM_APP_VERSION_TOP + WATCH_ABOUT_TITLE_HEIGHT) +#define WATCH_IMEI_TOP (WATCH_MODEM_APP_VERSION_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT) +#define WATCH_IMEI_VALUE_TOP (WATCH_IMEI_TOP + WATCH_ABOUT_TITLE_HEIGHT) +#define WATCH_FONT_TOP (WATCH_IMEI_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT) +#define WATCH_FONT_VALUE_TOP (WATCH_FONT_TOP + WATCH_ABOUT_TITLE_HEIGHT) namespace OHOS { + static constexpr uint16_t SYSTEM_ABOUT_THEWATCH_TITLE_X = 93; + static constexpr uint16_t SYSTEM_ABOUT_THEWATCH_TITLE_Y = 52; + static constexpr uint16_t SYSTEM_ABOUT_THEWATCH_TITLE_W = 280; + static constexpr uint16_t SYSTEM_ABOUT_THEWATCH_TITLE_H = 40; + static constexpr uint16_t SYSTEM_ABOUT_THEWATCH_TITLE_FONTSIZE = 30; + static constexpr uint16_t SYSTEM_ABOUT_THEWATCH_TITLE_LINEHEIGHT = 35; + + static constexpr uint16_t TITLE_LABEL_X = 53; + static constexpr uint16_t TITLE_LABEL_W = 360; + static constexpr uint16_t TITLE_LABEL_H = 40; + static constexpr uint16_t TITLE_LABEL_FONTSIZE = 30; + static constexpr uint16_t TITLE_LABEL_LINEHEIGHT = 35; + + static constexpr uint16_t LABEL_X = 33; + static constexpr uint16_t LABEL_W = 400; + static constexpr uint16_t LABEL_H = 40; + static constexpr uint16_t LABEL_FONTSIZE = 30; + static constexpr uint16_t LABEL_LINEHEIGHT = 35; static SystemAboutTheWatchView *g_pSystemAboutTheWatchView{nullptr}; @@ -44,7 +61,6 @@ namespace OHOS SystemAboutTheWatchView *SystemAboutTheWatchView::GetInstance() { - return g_pSystemAboutTheWatchView; } @@ -53,42 +69,70 @@ namespace OHOS if (initViewStatus == true) { SystemAboutTheWatchScrollView->RemoveAll(); + delete SystemAboutTheWatchTitle; SystemAboutTheWatchTitle = nullptr; + delete WatchNameTitle; WatchNameTitle = nullptr; delete WatchName; WatchName = nullptr; + delete FirmwareVersionTitle; FirmwareVersionTitle = nullptr; delete FirmwareVersion; FirmwareVersion = nullptr; - delete AlgorithmVersionTitle; - AlgorithmVersionTitle = nullptr; - delete AlgorithmVersion; - AlgorithmVersion = nullptr; + + delete BluetoothNameTitle; + BluetoothNameTitle = nullptr; + delete BluetoothName; + BluetoothName = nullptr; + delete BluetoothAddressTitle; BluetoothAddressTitle = nullptr; delete BluetoothAddress; BluetoothAddress = nullptr; - delete LANAddressTitle; - LANAddressTitle = nullptr; - delete LANAddress; - LANAddress = nullptr; + + delete Network4GTitle; + Network4GTitle = nullptr; + delete Network4G; + Network4G = nullptr; + + delete PyVerTitle; + PyVerTitle = nullptr; + delete PyVer; + PyVer = nullptr; + + delete IMELTitle; + IMELTitle = nullptr; + delete IMEL; + IMEL = nullptr; + delete FONTTitle; FONTTitle = nullptr; delete FONT; - delete CAT1Title; - CAT1Title = nullptr; - delete CAT1mode; - CAT1mode = nullptr; - delete pyTitle; - pyTitle = nullptr; - delete pymode; - pymode = nullptr; + FONT = nullptr; + delete SystemAboutTheWatchScrollView; - SystemAboutTheWatchScrollView = nullptr; + SystemAboutTheWatchScrollView = nullptr; + } + } + + UILabelExt *SystemAboutTheWatchView::InitLabel_Ext(LabelConfig &labelConfig) + { + UILabelExt *label = new UILabelExt(); + if (label == nullptr) + { + return nullptr; } + label->SetPosition(labelConfig.left, labelConfig.top, labelConfig.width, labelConfig.height); // 位置大小 + label->SetStyle(STYLE_TEXT_FONT, labelConfig.fontSize); // 字体大小 + label->SetStyle(STYLE_LINE_HEIGHT, labelConfig.lineHeigh); // 字体行高 + label->SetText(labelConfig.text.c_str()); // 内容 + label->SetLineBreakMode(labelConfig.lineBreakMode); // 断行模式。 + label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_TOP); + label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelConfig.fontSize); + return label; } UILabel *SystemAboutTheWatchView::InitLabel(LabelConfig &labelConfig) @@ -101,7 +145,7 @@ namespace OHOS label->SetPosition(labelConfig.left, labelConfig.top, labelConfig.width, labelConfig.height); // 位置大小 label->SetStyle(STYLE_TEXT_FONT, labelConfig.fontSize); // 字体大小 label->SetStyle(STYLE_LINE_HEIGHT, labelConfig.lineHeigh); // 字体行高 - label->SetText(labelConfig.text); // 内容 + label->SetText(labelConfig.text.c_str()); // 内容 label->SetLineBreakMode(labelConfig.lineBreakMode); // 断行模式。 label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_TOP); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelConfig.fontSize); @@ -119,13 +163,13 @@ namespace OHOS SystemAboutTheWatchScrollView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); SystemAboutTheWatchScrollView->SetStyle(STYLE_BACKGROUND_OPA, 0xff); SystemAboutTheWatchScrollView->SetStyle(STYLE_BORDER_RADIUS, 1294); - SystemAboutTheWatchScrollView->SetScrollBlankSize(35); + SystemAboutTheWatchScrollView->SetScrollBlankSize(TITLE_LABEL_LINEHEIGHT); SystemAboutTheWatchScrollView->SetReboundSize(50); SystemAboutTheWatchScrollView->SetDirection(1); UIView::OnDragListener *draglistener = static_cast(SystemPresenter::GetInstance()); if (draglistener == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::draglistener can not be nullptr!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::draglistener can not be nullptr!"); return false; } SystemAboutTheWatchScrollView->SetOnDragListener(draglistener); @@ -147,350 +191,334 @@ namespace OHOS } /* -------------------------------------------------------------------------- */ LabelConfig Config = { - .left = 203, - .top = 52, - .width = 60, - .height = 35, - .fontSize = 30, - .lineHeigh = 35, + .left = SYSTEM_ABOUT_THEWATCH_TITLE_X, + .top = SYSTEM_ABOUT_THEWATCH_TITLE_Y, + .width = SYSTEM_ABOUT_THEWATCH_TITLE_W, + .height = SYSTEM_ABOUT_THEWATCH_TITLE_H, + .fontSize = SYSTEM_ABOUT_THEWATCH_TITLE_FONTSIZE, + .lineHeigh = SYSTEM_ABOUT_THEWATCH_TITLE_LINEHEIGHT, .text = "关于", - .lineBreakMode = UILabel::LINE_BREAK_ADAPT, + .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, }; - SystemAboutTheWatchTitle = InitLabel(Config); + SystemAboutTheWatchTitle = InitLabel_Ext(Config); if (SystemAboutTheWatchTitle == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::SystemAboutTheWatchTitle new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::SystemAboutTheWatchTitle new fail!"); return nullptr; } SystemAboutTheWatchScrollView->Add(SystemAboutTheWatchTitle); /* -------------------------------------------------------------------------- */ Config = { - .left = 173, + .left = TITLE_LABEL_X, .top = WATCH_NAME_POS_TOP, - .width = 120, - .height = 35, - .fontSize = 30, - .lineHeigh = 35, + .width = TITLE_LABEL_W, + .height = TITLE_LABEL_H, + .fontSize = TITLE_LABEL_FONTSIZE, + .lineHeigh = TITLE_LABEL_LINEHEIGHT, .text = "手表名称", - .lineBreakMode = UILabel::LINE_BREAK_ADAPT, + .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, }; - WatchNameTitle = InitLabel(Config); + WatchNameTitle = InitLabel_Ext(Config); if (WatchNameTitle == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::WatchNameTitle new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::WatchNameTitle new fail!"); return nullptr; } SystemAboutTheWatchScrollView->Add(WatchNameTitle); /* -------------------------------------------------------------------------- */ Config = { - .left = 37, + .left = LABEL_X, .top = WATCH_NAME_VALUE_POS_TOP, - .width = 400, - .height = 30, - .fontSize = 26, - .lineHeigh = 30, + .width = LABEL_W, + .height = LABEL_H, + .fontSize = LABEL_FONTSIZE, + .lineHeigh = LABEL_LINEHEIGHT, .text = "Watch Soar", - .lineBreakMode = UILabel::LINE_BREAK_ELLIPSIS, + .lineBreakMode = UILabel::LINE_BREAK_WRAP, }; WatchName = InitLabel(Config); if (WatchName == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::WatchName new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::WatchName new fail!"); return nullptr; } - WatchName->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87)); + WatchName->SetTextColor(Color::GetColorFromRGBA(0x88, 0x88, 0x88, 0xff)); SystemAboutTheWatchScrollView->Add(WatchName); /* -------------------------------------------------------------------------- */ Config = { - .left = 173, + .left = TITLE_LABEL_X, .top = WATCH_FIRMWARE_POS_TOP, - .width = 120, - .height = 35, - .fontSize = 30, - .lineHeigh = 35, + .width = TITLE_LABEL_W, + .height = TITLE_LABEL_H, + .fontSize = TITLE_LABEL_FONTSIZE, + .lineHeigh = TITLE_LABEL_LINEHEIGHT, .text = "固件版本", - .lineBreakMode = UILabel::LINE_BREAK_ADAPT, + .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, }; - FirmwareVersionTitle = InitLabel(Config); + FirmwareVersionTitle = InitLabel_Ext(Config); if (FirmwareVersionTitle == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::FirmwareVersionTitle new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::FirmwareVersionTitle new fail!"); return nullptr; } SystemAboutTheWatchScrollView->Add(FirmwareVersionTitle); /* -------------------------------------------------------------------------- */ - char version_buf[128]={0}; - uint32_t version_len=128; - uapi_get_buildversion((uint8_t*)version_buf,version_len); + char version_buf[128] = {0}; + uint32_t version_len = 128; + uapi_get_buildversion((uint8_t *)version_buf, version_len); Config = { - .left = 37, + .left = LABEL_X, .top = WATCH_FIRMWARE_VALUE_POS_TOP, - .width = 400, - .height = 30, - .fontSize = 26, - .lineHeigh = 30, - .text = (char*)version_buf, + .width = LABEL_W, + .height = LABEL_H, + .fontSize = LABEL_FONTSIZE, + .lineHeigh = LABEL_LINEHEIGHT, + .text = (char *)version_buf, .lineBreakMode = UILabel::LINE_BREAK_WRAP, }; FirmwareVersion = InitLabel(Config); if (FirmwareVersion == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::FirmwareVersion new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::FirmwareVersion new fail!"); return nullptr; } - FirmwareVersion->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87)); + FirmwareVersion->SetTextColor(Color::GetColorFromRGBA(0x88, 0x88, 0x88, 0xff)); SystemAboutTheWatchScrollView->Add(FirmwareVersion); /* -------------------------------------------------------------------------- */ Config = { - .left = 173, - .top = WATCH_IMEI_TOP, - .width = 120, - .height = 35, - .fontSize = 30, - .lineHeigh = 35, - .text = "IMEI", - .lineBreakMode = UILabel::LINE_BREAK_ADAPT, + .left = TITLE_LABEL_X, + .top = WATCH_BT_NAME_TOP, + .width = TITLE_LABEL_W, + .height = TITLE_LABEL_H, + .fontSize = TITLE_LABEL_FONTSIZE, + .lineHeigh = TITLE_LABEL_LINEHEIGHT, + .text = "蓝牙名称", + .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, }; - AlgorithmVersionTitle = InitLabel(Config); - if (AlgorithmVersionTitle == nullptr) + BluetoothNameTitle = InitLabel_Ext(Config); + if (BluetoothNameTitle == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::AlgorithmVersionTitle new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::BluetoothNameTitle new fail!"); return nullptr; } - SystemAboutTheWatchScrollView->Add(AlgorithmVersionTitle); + SystemAboutTheWatchScrollView->Add(BluetoothNameTitle); /* -------------------------------------------------------------------------- */ + uint8_t ble_name[LABEL_FONTSIZE] = {0}; + uint32_t ble_name_len = sizeof(ble_name); + errcode_t ret = uapi_get_nv_btname(ble_name, &ble_name_len); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "get btname %s ,ret 0x%X\n", ble_name, ret); + Config = { - .left = 37, - .top = WATCH_IMEI_VALUE_TOP, - .width = 400, - .height = 30, - .fontSize = 26, - .lineHeigh = 30, - .text = "", - .lineBreakMode = UILabel::LINE_BREAK_ELLIPSIS, + .left = LABEL_X, + .top = WATCH_BT_NAME_VALUE_TOP, + .width = LABEL_W, + .height = LABEL_H, + .fontSize = LABEL_FONTSIZE, + .lineHeigh = LABEL_LINEHEIGHT, + .text = (char *)ble_name, + .lineBreakMode = UILabel::LINE_BREAK_WRAP, }; - Config.text = const_cast(ConfigModel::GetInstance()->Getimei().c_str()); - - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Imei %s , %s \r\n",Config.text,ConfigModel::GetInstance()->Getimei().c_str()); - - - - AlgorithmVersion = InitLabel(Config); - if (AlgorithmVersion == nullptr) + BluetoothName = InitLabel(Config); + if (BluetoothName == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::AlgorithmVersion new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::BluetoothName new fail!"); return nullptr; } - AlgorithmVersion->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87)); - SystemAboutTheWatchScrollView->Add(AlgorithmVersion); + BluetoothName->SetTextColor(Color::GetColorFromRGBA(0x88, 0x88, 0x88, 0xff)); + SystemAboutTheWatchScrollView->Add(BluetoothName); /* -------------------------------------------------------------------------- */ Config = { - .left = 173, + .left = TITLE_LABEL_X, .top = WATCH_BT_ADDR_TOP, - .width = 120, - .height = 35, - .fontSize = 30, - .lineHeigh = 35, + .width = TITLE_LABEL_W, + .height = TITLE_LABEL_H, + .fontSize = TITLE_LABEL_FONTSIZE, + .lineHeigh = TITLE_LABEL_LINEHEIGHT, .text = "蓝牙地址", - .lineBreakMode = UILabel::LINE_BREAK_ADAPT, + .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, }; - BluetoothAddressTitle = InitLabel(Config); + BluetoothAddressTitle = InitLabel_Ext(Config); if (BluetoothAddressTitle == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::BluetoothAddressTitle new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::BluetoothAddressTitle new fail!"); return nullptr; } SystemAboutTheWatchScrollView->Add(BluetoothAddressTitle); /* -------------------------------------------------------------------------- */ - uint8_t btaddr[6] ={0}; - uint8_t btaddr_str[64]={0}; + uint8_t btaddr[6] = {0}; + uint8_t btaddr_str[64] = {0}; uint32_t len = 6; - errcode_t ret = uapi_get_nv_btaddr((uint8_t*)btaddr,&len); - sprintf((char*)btaddr_str , "%02X:%02X:%02X:%02X:%02X:%02X",btaddr[0],btaddr[1],btaddr[2],btaddr[3],btaddr[4],btaddr[5]); + ret = uapi_get_nv_btaddr((uint8_t *)btaddr, &len); + sprintf((char *)btaddr_str, "%02X:%02X:%02X:%02X:%02X:%02X", btaddr[0], btaddr[1], btaddr[2], btaddr[3], btaddr[4], btaddr[5]); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"get btaddr %s , ret 0x%X\n",btaddr_str,ret); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "get btaddr %s , ret 0x%X\n", btaddr_str, ret); Config = { - .left = 37, + .left = LABEL_X, .top = WATCH_BT_ADDR_VALUE_TOP, - .width = 400, - .height = 30, - .fontSize = 26, - .lineHeigh = 30, - .text = "", - .lineBreakMode = UILabel::LINE_BREAK_ELLIPSIS, + .width = LABEL_W, + .height = LABEL_H, + .fontSize = LABEL_FONTSIZE, + .lineHeigh = LABEL_LINEHEIGHT, + .text = (char *)btaddr_str, + .lineBreakMode = UILabel::LINE_BREAK_WRAP, }; - Config.text = (char*)btaddr_str; - BluetoothAddress = InitLabel(Config); if (BluetoothAddress == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::BluetoothAddress new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::BluetoothAddress new fail!"); return nullptr; } - BluetoothAddress->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87)); + BluetoothAddress->SetTextColor(Color::GetColorFromRGBA(0x88, 0x88, 0x88, 0xff)); SystemAboutTheWatchScrollView->Add(BluetoothAddress); /* -------------------------------------------------------------------------- */ Config = { - .left = 173, - .top = WATCH_BT_NAME_TOP, - .width = 120, - .height = 35, - .fontSize = 30, - .lineHeigh = 35, - .text = "蓝牙名称", - .lineBreakMode = UILabel::LINE_BREAK_ADAPT, + .left = TITLE_LABEL_X, + .top = WATCH_MODEM_VERSION_TOP, + .width = TITLE_LABEL_W, + .height = TITLE_LABEL_H, + .fontSize = TITLE_LABEL_FONTSIZE, + .lineHeigh = TITLE_LABEL_LINEHEIGHT, + .text = "4G Modem", + .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, }; - LANAddressTitle = InitLabel(Config); - if (LANAddressTitle == nullptr) + Network4GTitle = InitLabel_Ext(Config); + if (Network4GTitle == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::LANAddressTitle new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::Network4GTitle new fail!"); return nullptr; } - SystemAboutTheWatchScrollView->Add(LANAddressTitle); + SystemAboutTheWatchScrollView->Add(Network4GTitle); /* -------------------------------------------------------------------------- */ - - uint8_t ble_name[20] = {0}; - uint32_t ble_name_len = sizeof(ble_name) ; - ret = uapi_get_nv_btname(ble_name, &ble_name_len); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"get btname %s ,ret 0x%X\n",ble_name,ret); - Config = { - .left = 37, - .top = WATCH_BT_NAME_VALUE_TOP, - .width = 400, - .height = 30, - .fontSize = 26, - .lineHeigh = 30, - .text = "", - .lineBreakMode = UILabel::LINE_BREAK_ELLIPSIS, + .left = LABEL_X, + .top = WATCH_MODEM_VERSION_VALUE_TOP, + .width = LABEL_W, + .height = LABEL_H, + .fontSize = LABEL_FONTSIZE - 2, + .lineHeigh = LABEL_LINEHEIGHT, + .text = ConfigModel::GetInstance()->GetmoderVer(), + .lineBreakMode = UILabel::LINE_BREAK_WRAP, }; - Config.text = (char*)ble_name; - LANAddress = InitLabel(Config); - if (LANAddress == nullptr) + Network4G = InitLabel(Config); + if (Network4G == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::BTNAME new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::Network4G new fail!"); return nullptr; } - LANAddress->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87)); - SystemAboutTheWatchScrollView->Add(LANAddress); + Network4G->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87)); + SystemAboutTheWatchScrollView->Add(Network4G); /* -------------------------------------------------------------------------- */ Config = { - .left = 173, - .top = WATCH_FONT_TOP, - .width = 120, - .height = 35, - .fontSize = 30, - .lineHeigh = 35, - .text = "FONTS", - .lineBreakMode = UILabel::LINE_BREAK_ADAPT, + .left = TITLE_LABEL_X, + .top = WATCH_MODEM_APP_VERSION_TOP, + .width = TITLE_LABEL_W, + .height = TITLE_LABEL_H, + .fontSize = TITLE_LABEL_FONTSIZE, + .lineHeigh = TITLE_LABEL_LINEHEIGHT, + .text = "pyVer", + .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, }; - FONTTitle = InitLabel(Config); - if (FONTTitle == nullptr) + PyVerTitle = InitLabel_Ext(Config); + if (PyVerTitle == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::FONTTitle new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::PyVerTitle new fail!"); return nullptr; } - SystemAboutTheWatchScrollView->Add(FONTTitle); + SystemAboutTheWatchScrollView->Add(PyVerTitle); /* -------------------------------------------------------------------------- */ Config = { - .left = 37, - .top = WATCH_FONT_VALUE_TOP, - .width = 400, - .height = 30, - .fontSize = 26, - .lineHeigh = 30, - .text = "HarmonyOS Sans", - .lineBreakMode = UILabel::LINE_BREAK_ELLIPSIS, + .left = LABEL_X, + .top = WATCH_MODEM_APP_VERSION_VALUE_TOP, + .width = LABEL_W, + .height = LABEL_H, + .fontSize = LABEL_FONTSIZE, + .lineHeigh = LABEL_LINEHEIGHT, + .text = ConfigModel::GetInstance()->GetpyVer(), + .lineBreakMode = UILabel::LINE_BREAK_WRAP, }; - LANAddress = InitLabel(Config); - if (LANAddress == nullptr) + PyVer = InitLabel(Config); + if (PyVer == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::LANAddress new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::PyVer new fail!"); return nullptr; } - LANAddress->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87)); - SystemAboutTheWatchScrollView->Add(LANAddress); - + PyVer->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87)); + SystemAboutTheWatchScrollView->Add(PyVer); + /* -------------------------------------------------------------------------- */ Config = { - .left = 173, - .top = WATCH_MODEM_VERSION_TOP, - .width = 120, - .height = 35, - .fontSize = 30, - .lineHeigh = 35, - .text = "4G Modem", - .lineBreakMode = UILabel::LINE_BREAK_ADAPT, + .left = TITLE_LABEL_X, + .top = WATCH_IMEI_TOP, + .width = TITLE_LABEL_W, + .height = TITLE_LABEL_H, + .fontSize = TITLE_LABEL_FONTSIZE, + .lineHeigh = TITLE_LABEL_LINEHEIGHT, + .text = "IMEI", + .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, }; - CAT1Title = InitLabel(Config); - if (CAT1Title == nullptr) + IMELTitle = InitLabel_Ext(Config); + if (IMELTitle == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::FONTTitle new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::IMELTitle new fail!"); return nullptr; } - SystemAboutTheWatchScrollView->Add(CAT1Title); + SystemAboutTheWatchScrollView->Add(IMELTitle); /* -------------------------------------------------------------------------- */ Config = { - .left = 37, - .top = WATCH_MODEM_VERSION_VALUE_TOP, - .width = 400, - .height = 30, - .fontSize = 26, - .lineHeigh = 30, - .text = "HarmonyOS Sans", + .left = LABEL_X, + .top = WATCH_IMEI_VALUE_TOP, + .width = LABEL_W, + .height = LABEL_H, + .fontSize = LABEL_FONTSIZE, + .lineHeigh = TITLE_LABEL_LINEHEIGHT, + .text = ConfigModel::GetInstance()->Getimei(), .lineBreakMode = UILabel::LINE_BREAK_WRAP, }; - Config.text=const_cast(ConfigModel::GetInstance()->GetmoderVer().c_str()); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "modemver %s , %s \r\n",Config.text,ConfigModel::GetInstance()->GetmoderVer().c_str()); - - CAT1mode = InitLabel(Config); - if (CAT1mode == nullptr) + IMEL = InitLabel(Config); + if (IMEL == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::LANAddress new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::IMEL new fail!"); return nullptr; } - CAT1mode->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87)); - SystemAboutTheWatchScrollView->Add(CAT1mode); - - Config = { - .left = 173, - .top = WATCH_MODEM_APP_VERSION_TOP, - .width = 120, - .height = 35, - .fontSize = 30, - .lineHeigh = 35, - .text = "pyVer", - .lineBreakMode = UILabel::LINE_BREAK_ADAPT, + IMEL->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87)); + SystemAboutTheWatchScrollView->Add(IMEL); + /* -------------------------------------------------------------------------- */ + Config = { + .left = TITLE_LABEL_X, + .top = WATCH_FONT_TOP, + .width = TITLE_LABEL_W, + .height = TITLE_LABEL_H, + .fontSize = TITLE_LABEL_FONTSIZE, + .lineHeigh = TITLE_LABEL_LINEHEIGHT, + .text = "FONTS", + .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, }; - pyTitle = InitLabel(Config); - if (pyTitle == nullptr) + FONTTitle = InitLabel_Ext(Config); + if (FONTTitle == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::FONTTitle new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::FONTTitle new fail!"); return nullptr; } - SystemAboutTheWatchScrollView->Add(pyTitle); + SystemAboutTheWatchScrollView->Add(FONTTitle); /* -------------------------------------------------------------------------- */ Config = { - .left = 37, - .top = WATCH_MODEM_APP_VERSION_VALUE_TOP, - .width = 400, - .height = 30, - .fontSize = 26, - .lineHeigh = 30, - .text = "PyVer_3", + .left = LABEL_X, + .top = WATCH_FONT_VALUE_TOP, + .width = LABEL_W, + .height = LABEL_H, + .fontSize = LABEL_FONTSIZE, + .lineHeigh = LABEL_LINEHEIGHT, + .text = "HarmonyOS Sans", .lineBreakMode = UILabel::LINE_BREAK_WRAP, }; - Config.text=const_cast(ConfigModel::GetInstance()->GetpyVer().c_str()); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "pyver %s , %s \r\n",Config.text,ConfigModel::GetInstance()->GetpyVer().c_str()); - - pymode = InitLabel(Config); - if (CAT1mode == nullptr) + FONT = InitLabel(Config); + if (FONT == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::LANAddress new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::FONT new fail!"); return nullptr; } - pymode->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87)); - SystemAboutTheWatchScrollView->Add(pymode); - + FONT->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87)); + SystemAboutTheWatchScrollView->Add(FONT); + /* -------------------------------------------------------------------------- */ initViewStatus = true; return SystemAboutTheWatchScrollView; } -- 2.17.1