删除其他项目的耦合

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/UiConfig.h
index 49c38d2..6c9ae69 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/UiConfig.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/UiConfig.h
@@ -15,46 +15,6 @@
 namespace OHOS
 {
     static const int CARD_SETTING_COUNT_MAX = 10;
-    //卡片排序
-#if(defined(BOARD_W9))
-    /*
-        W9主界面卡片：
-        心率,血氧，血压，心电，情绪，运动，睡眠，音乐
-    */
-    typedef enum
-    {
-        WATCH_FACE = 0, /* 主表盘枚举值不能修改 */
-        HEART_RATE,
-        BLOODOXGEN,
-        // BLOODPRESSURE,
-        // ECG,
-        // EMO,
-        TRAINING,
-        SLEEP,
-        MUSIC_PLAYER,
-        SETCARD,
-        MAX_CARD,
-    } CardId;
-#elif(defined(BOARD_N9))
-    /*
-         N9主界面卡片排序: 
-        心率，血氧，运动，睡眠，音乐，指南针，天气，活动
-    */
-    typedef enum
-    {
-        WATCH_FACE = 0, /* 主表盘枚举值不能修改 */
-        HEART_RATE,
-        BLOODOXGEN,
-        TRAINING,
-        SLEEP,
-        MUSIC_PLAYER,
-        COMPASS,
-        WEATHER,
-        GOAL,
-        SETCARD,
-        MAX_CARD,
-    } CardId;
-#else
     typedef enum
     {
         WATCH_FACE = 0, /* 主表盘枚举值不能修改 */
@@ -69,7 +29,6 @@ namespace OHOS
         SETCARD,
         MAX_CARD,
     } CardId;
-#endif
     /*自定义表盘最多5个*/
     typedef enum
     {

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/set_dial/include/SetDialModel.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/set_dial/include/SetDialModel.h
index 3df08cf..e0b18c7 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/set_dial/include/SetDialModel.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/set_dial/include/SetDialModel.h
@@ -34,21 +34,12 @@ namespace OHOS
     }DialLayout;
 
     // 定义特殊Id
-    #ifdef BOARD_N9
-    constexpr uint16_t DEFAULT_DIAL_ID = 167;
-    constexpr uint16_t DEFAULT_DIAL_ID_0 = 1028;
-    constexpr uint16_t DEFAULT_DIAL_ID_1 = 137;
-    constexpr uint16_t DEFAULT_DIAL_ID_2 = 128;
-    constexpr uint16_t DEFAULT_DIAL_ID_3 = 185;
-    constexpr uint16_t MAX_DEFAULT_DIAL_ID = 190;
-    #else
     constexpr uint16_t DEFAULT_DIAL_ID = 114;
     constexpr uint16_t DEFAULT_DIAL_ID_0 = 1028;
     constexpr uint16_t DEFAULT_DIAL_ID_1 = 111;
     constexpr uint16_t DEFAULT_DIAL_ID_2 = 112;
     constexpr uint16_t DEFAULT_DIAL_ID_3 = 113;
     constexpr uint16_t MAX_DEFAULT_DIAL_ID = 115;
-    #endif
     // 定义自定义表盘
     constexpr uint16_t CUSTOM_DIAL_ID_1 = 1;
     constexpr uint16_t CUSTOM_DIAL_ID_2 = 2;