1.屏蔽applist中雷鸟slice

2.久坐提醒添加n9宏

diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistConfigModel.h b/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistConfigModel.h
index 5e5200e..b61e82e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistConfigModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistConfigModel.h
@@ -54,7 +54,7 @@ namespace OHOS
 #if defined(CM_IOT)
             {VIEW_CHINA_MOBILEL_IOT, PNG_APPLIST_CHINAMOBIELIOT_IMAGE_BIG, PNG_APPLIST_WORKWYNC_IMAGE, PNG_APPLIST_DEFAULT_IMG, "中移物联", STR_WORKSYNC, nullptr, "C", "China_Mobilel_IOT"},
 #endif
-            {VIEW_THUNDER_BIRD, PNG_APPLIST_MESSAGE_IMAGE_BIG, PNG_APPLIST_MESSAGE_IMAGE, PNG_APPLIST_DEFAULT_IMG, "雷鸟", STR_MESSAGE_NOTIFICATION, nullptr, "T", "THUNDERBIRD"},
+        //     {VIEW_THUNDER_BIRD, PNG_APPLIST_MESSAGE_IMAGE_BIG, PNG_APPLIST_MESSAGE_IMAGE, PNG_APPLIST_DEFAULT_IMG, "雷鸟", STR_MESSAGE_NOTIFICATION, nullptr, "T", "THUNDERBIRD"},
             {VIEW_MESSAGE, PNG_APPLIST_MESSAGE_IMAGE_BIG, PNG_APPLIST_MESSAGE_IMAGE, PNG_APPLIST_DEFAULT_IMG, "消息通知", STR_MESSAGE_NOTIFICATION, nullptr, "X", "MESSAGE_NOTIFICATION"},
             {VIEW_COMPASS, PNG_APPLIST_COMPASS_IMAGE_BIG, PNG_APPLIST_COMPASS_IMAGE, PNG_APPLIST_DEFAULT_IMG, "指南针", STR_COMPASS, nullptr, "Z", "COMPASS"},
             {VIEW_CALCULATOR, PNG_APPLIST_INFORMATION_IMAGE_BIG, PNG_APPLIST_INFORMATION_IMAGE, PNG_APPLIST_DEFAULT_IMG, "计算器", STR_CALCULATOR, nullptr, "J", "CALCULATOR"},

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp
index 079f000..022c9dd 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp
@@ -172,7 +172,9 @@ namespace OHOS
         LabelSetup labelSetups[] = {\r
             {153, STR_ABOUT_WATCH},\r
             // {273, STR_SYSTEM_UPDATE},\r
+            #ifdef BOARD_N9\r
             {273, STR_SEDENTARY_REMINDER},\r
+            #endif\r
             {393, STR_TIME_FORMAT_SET},\r
             {513, STR_WATCH_QR_CODE},\r
             {633, STR_SYSTEM_LANGUAGE},\r
@@ -220,7 +222,9 @@ namespace OHOS
         ButtonSetup buttonSetups[] = {\r
             {120, ABOUT_THE_WATCH},\r
             // {240, SYSTEM_UPGRADE},\r
+            #ifdef BOARD_N9\r
             {240, SET_SEDENTARY},\r
+            #endif\r
             {300, SET_TIME_FORMAT},\r
             {360, WATCH_QR_CODE},\r
             {480, SYSTEM_LANGUAGE},\r