From 3e82c7fb43ac57072ecc528d5e05e6b6d2d8da62 Mon Sep 17 00:00:00 2001 From: Caisking Date: Sat, 7 Jun 2025 18:29:01 +0800 Subject: [PATCH] =?utf8?q?N9=20UI=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?= =?utf8?q?=E5=AE=8F=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativelauncher/include/UiConfig.h | 2 +- .../fd230app/nativeui/main/src/MainModel.cpp | 8 ++++---- .../nativeui/set_dial/src/SetDialModel.cpp | 10 +++++++--- .../system/src/SystemAboutTheWatchView.cpp | 20 +++++++++++++++---- .../system/src/SystemSuperviseView.cpp | 2 ++ .../ble_service/bleservice/bleService.h | 4 ++-- .../config/target_config/brandy/config.py | 10 +++++----- .../brandy/mk_fs_image/n9/file.bin | 4 ++-- .../brandy/mk_fs_image/n9/file_tmp.bin | 4 ++-- .../n9/fs/user/dial/res_dial/birdie.bin | 3 --- .../n9/fs/user/dial/res_dial/dawninsight.bin | 3 --- .../fs/user/dial/res_dial/mirrorvoyager.bin | 3 --- .../fs/user/dial/res_dial/obsidianrhythm.bin | 3 --- .../n9/fs/user/dial/res_dial/satellite.bin | 3 --- .../service/src/graphic_service_wrapper.cpp | 8 ++++---- 15 files changed, 45 insertions(+), 42 deletions(-) delete mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/dial/res_dial/birdie.bin delete mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/dial/res_dial/dawninsight.bin delete mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/dial/res_dial/mirrorvoyager.bin delete mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/dial/res_dial/obsidianrhythm.bin delete mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/dial/res_dial/satellite.bin diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h index 9ebc8619a..df62ff5a1 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h +++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h @@ -101,7 +101,7 @@ namespace OHOS #ifdef CUSTOM_Z1 static constexpr const char *DEFAULT_DIALBACK_PATH = APP_RES_PATH "/dial_soures/z1background.bin"; static constexpr const char *DEFAULT_DIALPER_PATH = APP_RES_PATH "/dial_soures/Z1VIEW.bin"; -#elseif BOARD_N9 +#elif BOARD_W9 static constexpr const char *DEFAULT_DIALBACK_PATH = APP_RES_PATH "/dial_soures/main_bg.bin"; static constexpr const char *DEFAULT_DIALPER_PATH = APP_RES_PATH "/dial_soures/thumbnail.bin"; #else diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp index 724a403fd..bd8a79723 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp @@ -53,7 +53,7 @@ namespace OHOS const DialInfo dialInfoMap[] = { #ifdef CUSTOM_Z1 {DIAL_CLOCK, "Z1", DEFAULT_DIALPER_PATH, DEFAULT_TASK_PERIOD}, -#elseif BOARD_N9 +#elif BOARD_W9 {DIAL_CLOCK, "N9", DEFAULT_DIALPER_PATH, DEFAULT_TASK_PERIOD}, #else {DIAL_CLOCK, "KUMI", DEFAULT_DIALPER_PATH, DEFAULT_TASK_PERIOD}, @@ -438,7 +438,7 @@ namespace OHOS if (len < 0) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: Failed to retrieve dial settings. Initializing to default settings.\r\n"); - #ifdef BOARD_N9 + #ifdef BOARD_W9 InitDialSettingDefault(DIAL_CLOCK);//N9使用默认静态表盘 #else //判断黑耀表盘是否存在 @@ -468,7 +468,7 @@ namespace OHOS else { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: First value is empty. Initializing to default settings.\r\n"); - #ifdef BOARD_N9 + #ifdef BOARD_W9 InitDialSettingDefault(DIAL_CLOCK);//N9使用默认静态表盘 #else //判断黑耀表盘是否存在 @@ -494,7 +494,7 @@ namespace OHOS else { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: Second value is empty. Initializing to default settings.\r\n"); - #ifdef BOARD_N9 + #ifdef BOARD_W9 InitDialSettingDefault(DIAL_CLOCK);//N9使用默认静态表盘 #else //判断黑耀表盘是否存在 diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp index 314260dfc..70451e57e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp @@ -34,17 +34,16 @@ namespace OHOS { std::unordered_map registeredDials{ #ifdef CUSTOM_Z1 {DEFAULT_DIAL_ID_0, "Z1"}, -#elseif BOARD_N9 +#elif BOARD_W9 {DEFAULT_DIAL_ID_0, "N9"}, #else {DEFAULT_DIAL_ID_0, "KUMI"}, {DEFAULT_DIAL_ID, "obsidianrhythm"}, // 默认表盘修改为 黑耀律动 -#endif {DEFAULT_DIAL_ID_1, "satellite"}, // 卫星表盘 {DEFAULT_DIAL_ID_2, "birdie"}, // 飞鸟表盘 {DEFAULT_DIAL_ID_3, "dawninsight"}, // 晨曦智影 {MAX_DEFAULT_DIAL_ID, "mirrorvoyager"}, // 镜影行者 - +#endif }; // 表盘市场UID 对应表盘name // 存储表盘到文件 @@ -538,6 +537,11 @@ const std::vector defaultDials = { "obsidianrhythm", "mirrorvoyager", "satellite", "dawninsight", "birdie"}; void SetDialModel::LoadAllDialFromDefult(void) { + + #ifdef BOARD_W9 + return;//暂时没有默认表盘 + #endif + DIR *dirp = opendir(APP_DEFAULT_DIAL_PATH); if (dirp == nullptr) { perror("Failed to open directory"); 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 06d90c7c9..5c27ec41b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp @@ -267,6 +267,8 @@ namespace OHOS .lineHeigh = LABEL_LINEHEIGHT, #ifdef CUSTOM_Z1 .text = "Z1", + #elif BOARD_W9 + .text = "Watch N9", #else .text = "Watch Soar", #endif @@ -310,10 +312,14 @@ namespace OHOS .height = LABEL_H, .fontSize = LABEL_FONTSIZE, .lineHeigh = LABEL_LINEHEIGHT, - #if defined(SUPPORT_CHINA_MOBILE_DMP) || defined(SUPPORT_TELECOM_DMP) //移动、电信入库软件要求 版本号固定 - .text = "Watch Soar V1.0", + #if defined(SUPPORT_CHINA_MOBILE_DMP) || defined(SUPPORT_TELECOM_DMP) + #ifdef BOARD_W9 + .text = "Watch N9 V1.0", + #else + .text = "Watch Soar V1.0", + #endif #else - .text = (char *)version_buf, + .text = (char *)version_buf, #endif .lineBreakMode = UILabel::LINE_BREAK_WRAP, }; @@ -617,6 +623,12 @@ namespace OHOS } SystemAboutTheWatchScrollView->Add(HWVERTitle); /* -------------------------------------------------------------------------- */ + char * versionstr; +#ifdef BOARD_W9 + versionstr= "Watch V1.0"; +#else + versionstr= "FD230 V1.0"; +#endif Config = { .left = LABEL_X, .top = WATCH_HWVER_VALUE_TOP, @@ -624,7 +636,7 @@ namespace OHOS .height = LABEL_H, .fontSize = LABEL_FONTSIZE, .lineHeigh = LABEL_LINEHEIGHT, - .text = "Watch V1.0", + .text = versionstr, .lineBreakMode = UILabel::LINE_BREAK_WRAP, }; HWVER = InitLabel(Config); diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemSuperviseView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemSuperviseView.cpp index 79cbfc0ea..cf559e7ff 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemSuperviseView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemSuperviseView.cpp @@ -101,6 +101,8 @@ namespace OHOS ProductModelName->SetStyle(STYLE_LINE_HEIGHT, 30); // 字体行高 #ifdef CUSTOM_Z1 ProductModelName->SetText("Z1"); // 内容 + #elif BOARD_W9 + ProductModelName->SetText("Watch N9"); // 内容 #else ProductModelName->SetText("Watch Soar"); // 内容 #endif diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.h b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.h index b55b0e44f..dc51b1a4b 100644 --- a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.h +++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.h @@ -35,8 +35,8 @@ extern uint16_t g_ble_server_handle; #ifdef CUSTOM_Z1 #define BLE_DEFAULT_NAME "Z1"//" -#elseif BOARD_N9 -#define BLE_DEFAULT_NAME "WATCH"//"N9 +#elif BOARD_W9 +#define BLE_DEFAULT_NAME "WATCH N9"//"N9 #else #define BLE_DEFAULT_NAME "WATCH Soar"//"FD230 #endif diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py index 93b291b5d..b3a09fec0 100755 --- a/code/sdk/build/config/target_config/brandy/config.py +++ b/code/sdk/build/config/target_config/brandy/config.py @@ -537,10 +537,10 @@ target = { '-:ROTARYENCODER_HX3507', '-:BOARD_FD230', 'BOARD_W9', - 'SUPPORT_GNSS', - 'DISABLE_UART_LOG', - 'CONFIG_GNSS_UART_WITH_FLOWCTRL', - 'DOWNLOAD_GNSS_SWITCH', + # 'SUPPORT_GNSS', + # 'DISABLE_UART_LOG', + # 'CONFIG_GNSS_UART_WITH_FLOWCTRL', + # 'DOWNLOAD_GNSS_SWITCH', 'TPTYPE_CST86XX', 'NANDFLASH_F35UQA', #'PPG_GH3X2X', @@ -557,7 +557,7 @@ target = { 'ppg_hal', ], 'image_analysis': False, - 'fs_image_path':'fd230', + 'fs_image_path':'n9',#暂时用n9 'fs_image': True }, 'brandy-native-js-w9-r': { diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/file.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/file.bin index 731a007c0..71c2ea686 100644 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/file.bin +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/file.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:509537af5b5d769dd05eb3444da9b451cb3c60412773e734aa1b6c4af3219cbd -size 49302528 +oid sha256:ccaf8aeb2a73734a10631405e462da7529ef592dc1f81403d60c1c5ebc373f4f +size 43967616 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/file_tmp.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/file_tmp.bin index 69ba5a37b..e31ef773a 100644 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/file_tmp.bin +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/file_tmp.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d64335e72ea6b13963d4e94f3fddef4765735980f1cc4b34c7e3631acca9040 -size 49302528 +oid sha256:534b215d45d9485abe3a0307c18fb36e299383d8dedc8956d59587c02b8cdcac +size 43967616 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/dial/res_dial/birdie.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/dial/res_dial/birdie.bin deleted file mode 100644 index 0f982297f..000000000 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/dial/res_dial/birdie.bin +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d956d730f94e57213326f1836e5ceb5385ea8724e8030b2637f3cdaf4003fa33 -size 1523474 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/dial/res_dial/dawninsight.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/dial/res_dial/dawninsight.bin deleted file mode 100644 index 51617aec0..000000000 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/dial/res_dial/dawninsight.bin +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c76295dc5d427e6efc18f8ce80dbe851dedb947256db7c716167aabe088918e -size 330175 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/dial/res_dial/mirrorvoyager.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/dial/res_dial/mirrorvoyager.bin deleted file mode 100644 index 2c3608967..000000000 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/dial/res_dial/mirrorvoyager.bin +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fb6fc01acc29125afff3f0c48228caaa5ef2ab9902330ce8e54f71079a3cec53 -size 300109 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/dial/res_dial/obsidianrhythm.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/dial/res_dial/obsidianrhythm.bin deleted file mode 100644 index b822117aa..000000000 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/dial/res_dial/obsidianrhythm.bin +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4cf7aae5f3b90b23d3c63e854995bca5a7bb492ffde0bc58138f873990ee43bf -size 1688324 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/dial/res_dial/satellite.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/dial/res_dial/satellite.bin deleted file mode 100644 index 4378db30b..000000000 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/dial/res_dial/satellite.bin +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a62dfc0af30a3ec696b947ba19f3ba5d14c8f86b8acd8d544d1ba937ca555d8 -size 1316038 diff --git a/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp b/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp index f736298ee..8024e6377 100755 --- a/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp +++ b/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp @@ -58,7 +58,7 @@ static OHOS::UIImageAnimatorView* ReBootImageAnimatorView=nullptr; #ifdef CUSTOM_Z1 static constexpr char *ReBootPaths = "/user/res/RebootAndShutDown/ReBoot/"; //开机图片路径 static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 30; // 图片帧数 -#elseif +#elif BOARD_W9 static constexpr char *ReBootPaths = "/user/res/RebootAndShutDown/ReBoot/"; //开机图片路径 static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 30; // 图片帧数 #else @@ -99,7 +99,7 @@ static app_task_definition_t taskcfg={0}; #endif #endif -#ifdef BOARD_N9 +#ifdef BOARD_W9 #ifdef IMAGE_OPEN_LOGO_PATH #undef IMAGE_OPEN_LOGO_PATH #endif @@ -198,7 +198,7 @@ bool ShowReBootAnimatorView() WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "new ReBootImageAnimatorView fail"); return false; } -#ifdef BOARD_N9 +#ifdef BOARD_W9 for (int j = 0, i = REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES - 1; i > 0 && j < REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES; i--, j++) @@ -211,7 +211,7 @@ bool ShowReBootAnimatorView() ReBootImageInfo[j].height = REBOOT_IMAGE_ANIMATOR_VIEW_H; } #else - for (uint8_t i = REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES -1; i > 0 ; i--) + for (uint8_t i = 0; i < REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES; i++) { ReBootImageInfo[i].imageInfo = (ReBootPathsArray[i]); ReBootImageInfo[i].imageType = OHOS::IMG_SRC_IMAGE_INFO; -- 2.17.1