From b44243128945fc4cf50209a2a38e08db96cbef73 Mon Sep 17 00:00:00 2001 From: Caisking Date: Thu, 26 Jun 2025 11:18:52 +0800 Subject: [PATCH] =?utf8?q?=E5=8C=BA=E5=88=86w9=E4=B8=8En9UI=E7=9A=84?= =?utf8?q?=E4=BD=93=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../wearable/fd230app/nativeui/main/src/MainModel.cpp | 4 +++- .../fd230app/nativeui/set_dial/src/SetDialModel.cpp | 4 +++- .../nativeui/system/src/SystemAboutTheWatchView.cpp | 8 ++++++-- .../fd230app/nativeui/system/src/SystemSuperviseView.cpp | 4 +++- 4 files changed, 15 insertions(+), 5 deletions(-) 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 35f7edd67..5bc5ce5d4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp @@ -53,8 +53,10 @@ namespace OHOS const DialInfo dialInfoMap[] = { #ifdef CUSTOM_Z1 {DIAL_CLOCK, "Z1", DEFAULT_DIALPER_PATH, DEFAULT_TASK_PERIOD}, -#elif defined(BOARD_W9) || defined(BOARD_N9) +#elif defined(BOARD_N9) {DIAL_CLOCK, "N9", DEFAULT_DIALPER_PATH, DEFAULT_TASK_PERIOD}, +#elif defined(BOARD_W9) + {DIAL_CLOCK, "W9", DEFAULT_DIALPER_PATH, DEFAULT_TASK_PERIOD}, #else {DIAL_CLOCK, "KUMI", DEFAULT_DIALPER_PATH, DEFAULT_TASK_PERIOD}, #endif 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 9ddd3d886..8b9850aa3 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 @@ -35,7 +35,9 @@ std::unordered_map registeredDials{ #ifdef CUSTOM_Z1 {DEFAULT_DIAL_ID_0, "Z1"}, #elif BOARD_N9 - {DEFAULT_DIAL_ID_0, "N9"}, + {DEFAULT_DIAL_ID_0, "N9"}, +#elif BOARD_W9 + {DEFAULT_DIAL_ID_0, "W9"}, #else {DEFAULT_DIAL_ID_0, "KUMI"}, {DEFAULT_DIAL_ID, "obsidianrhythm"}, // 默认表盘修改为 黑耀律动 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 779c63a63..1ba6c4a03 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp @@ -267,8 +267,10 @@ namespace OHOS .lineHeigh = LABEL_LINEHEIGHT, #ifdef CUSTOM_Z1 .text = "Z1", - #elif defined(BOARD_W9) || defined(BOARD_N9) + #elif defined(BOARD_N9) .text = "Watch N9", + #elif defined(BOARD_W9) + .text = "Watch W9", #else .text = "Watch Soar", #endif @@ -313,8 +315,10 @@ namespace OHOS .fontSize = LABEL_FONTSIZE, .lineHeigh = LABEL_LINEHEIGHT, #if defined(SUPPORT_CHINA_MOBILE_DMP) || defined(SUPPORT_TELECOM_DMP) - #if defined(BOARD_W9) || defined(BOARD_N9) + #if defined(BOARD_N9) .text = "Watch N9 V1.0", + #elif defined(BOARD_W9) + .text = "Watch W9 V1.0", #else .text = "Watch Soar V1.0", #endif 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 7c067c5a7..5afc54161 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemSuperviseView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemSuperviseView.cpp @@ -101,8 +101,10 @@ namespace OHOS ProductModelName->SetStyle(STYLE_LINE_HEIGHT, 30); // 字体行高 #ifdef CUSTOM_Z1 ProductModelName->SetText("Z1"); // 内容 - #elif defined(BOARD_W9) || defined(BOARD_N9) + #elif defined(BOARD_N9) ProductModelName->SetText("Watch N9"); // 内容 + #elif defined(BOARD_W9) + ProductModelName->SetText("Watch W9"); // 内容 #else ProductModelName->SetText("Watch Soar"); // 内容 #endif -- 2.17.1