区分w9与n9UI的体现

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 35f7edd..5bc5ce5 100644 (file)
--- 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[] = {\r
 #ifdef CUSTOM_Z1\r
         {DIAL_CLOCK, "Z1", DEFAULT_DIALPER_PATH, DEFAULT_TASK_PERIOD},\r
-#elif defined(BOARD_W9) || defined(BOARD_N9)\r
+#elif defined(BOARD_N9)\r
         {DIAL_CLOCK, "N9", DEFAULT_DIALPER_PATH, DEFAULT_TASK_PERIOD}, \r
+#elif defined(BOARD_W9)\r
+        {DIAL_CLOCK, "W9", DEFAULT_DIALPER_PATH, DEFAULT_TASK_PERIOD}, \r
 #else\r
         {DIAL_CLOCK, "KUMI", DEFAULT_DIALPER_PATH, DEFAULT_TASK_PERIOD},\r
 #endif\r

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 9ddd3d8..8b9850a 100644 (file)
--- 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<uint16_t, std::string> 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 779c63a..1ba6c4a 100644 (file)
--- 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,\r
         #ifdef CUSTOM_Z1\r
             .text = "Z1",\r
-        #elif defined(BOARD_W9) || defined(BOARD_N9)\r
+        #elif defined(BOARD_N9)\r
             .text = "Watch N9",\r
+        #elif defined(BOARD_W9)\r
+            .text = "Watch W9",\r
         #else\r
             .text = "Watch Soar",\r
         #endif\r
@@ -313,8 +315,10 @@ namespace OHOS
             .fontSize = LABEL_FONTSIZE,\r
             .lineHeigh = LABEL_LINEHEIGHT,\r
             #if defined(SUPPORT_CHINA_MOBILE_DMP) || defined(SUPPORT_TELECOM_DMP)\r
-                #if defined(BOARD_W9) || defined(BOARD_N9)\r
+                #if defined(BOARD_N9)\r
                 .text = "Watch N9 V1.0",\r
+                #elif defined(BOARD_W9)\r
+                .text = "Watch W9 V1.0",\r
                 #else\r
                 .text = "Watch Soar V1.0",\r
                 #endif\r

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 7c067c5..5afc541 100644 (file)
--- 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);                // 字体行高\r
         #ifdef CUSTOM_Z1\r
         ProductModelName->SetText("Z1");                          // 内容\r
-        #elif defined(BOARD_W9) || defined(BOARD_N9)\r
+        #elif defined(BOARD_N9)\r
         ProductModelName->SetText("Watch N9");                          // 内容\r
+        #elif defined(BOARD_W9)\r
+        ProductModelName->SetText("Watch W9");                          // 内容\r
         #else\r
         ProductModelName->SetText("Watch Soar");                          // 内容\r
         #endif\r