优化fd230项目耦合

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/UiConfig.h
index 456ba70..43322d3 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/UiConfig.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/UiConfig.h
@@ -15,46 +15,7 @@
 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 +30,6 @@ namespace OHOS
         SETCARD,
         MAX_CARD,
     } CardId;
-#endif
     /*自定义表盘最多5个*/
     typedef enum
     {
@@ -143,16 +103,8 @@ namespace OHOS
     static constexpr const char *CARD_CONFIG_PATH = "/user/cardconfig.bin";
 
     /* --------------------------------- 自定义表盘配置 -------------------------------- */
-#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";
-#elif defined(BOARD_W9) || defined(BOARD_N9)
-    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
     static constexpr const char *DEFAULT_DIALBACK_PATH = APP_RES_PATH "/dial_soures/MAIN_FACE_IMAGE.bin";
     static constexpr const char *DEFAULT_DIALPER_PATH = APP_RES_PATH "/dial_soures/KUMIVIEW.bin";
-#endif
     static constexpr const char *CUSTOM_CLOCK1_DIALBACK_PATH = APP_CUSTOM_DIAL_PATH "/1/main_bg.bin";
     static constexpr const char *CUSTOM_CLOCK1_DIALPER_PATH = APP_CUSTOM_DIAL_PATH "/1/thumbnail.bin";
     static constexpr const char *CUSTOM_CLOCK2_DIALBACK_PATH = APP_CUSTOM_DIAL_PATH "/2/main_bg.bin";

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/include/AiVoiceModel.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/include/AiVoiceModel.h
index 6f619a1..b22b641 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/include/AiVoiceModel.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/include/AiVoiceModel.h
@@ -32,8 +32,6 @@
 
 #if defined(SUPPORT_CHINA_MOBILE_DMP) || defined(SUPPORT_CHINA_MOBILE_AI_REGULATION)
     #define AI_VOICE_FD230  // 九天版本
-#elif defined(BOARD_N9)
-    #define AI_VOICE_N9 //N9 星辰Ai
 #else
     #define AI_VOICE_FD230   
 #endif

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainModel.cpp
index 3d79a04..ac02ffe 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainModel.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainModel.cpp
@@ -31,38 +31,7 @@ namespace OHOS
     static const int CARD_SETTING_VALUE_LEN = 32;\r
     static const int DIAL_SETTING_VALUE_LEN = 64;\r
     /*默认卡片：心率，睡眠，快速训练*/\r
-    // 更新主界面卡片需要更新Map\r
-#if defined(BOARD_N9)\r
-    const CardInfo cardInfoMap[] = {\r
-        /*\r
-            N9主界面卡片排序: \r
-           心率，血氧，运动，睡眠，音乐，指南针，天气，活动\r
-        */\r
-       {HEART_RATE, PNG_SET_CARD_HEART, true,STR_HEART_RATE},\r
-       {BLOODOXGEN, PNG_SET_CARD_BLOOD, true,STR_BLOOD_OXYGEN},\r
-       {TRAINING, PNG_SET_CARD_TRAIN, true,STR_TRAINING},\r
-       {SLEEP, PNG_SET_CARD_SLEEP, true,STR_SLEEP},\r
-       {MUSIC_PLAYER, PNG_SET_CARD_PLAYER, true,STR_MUSIC},\r
-       {COMPASS, PNG_SET_CARD_COMPASS, true,STR_COMPASS},\r
-       {WEATHER, PNG_SET_CARD_WEATHER,true,STR_WEATHER},\r
-       {GOAL, PNG_SET_CARD_ACTIVITY, true,STR_ACTIVITY},\r
-    };\r
-#elif defined(BOARD_W9)\r
-        /*\r
-            W9主界面卡片：\r
-            心率,血氧，血压，心电，情绪，运动，睡眠，音乐\r
-        */\r
-       const CardInfo cardInfoMap[] = {\r
-       {HEART_RATE, PNG_SET_CARD_HEART, true,STR_HEART_RATE},\r
-       {BLOODOXGEN, PNG_SET_CARD_BLOOD, true,STR_BLOOD_OXYGEN},\r
-    //    {BLOODPRESSURE, PNG_SET_CARD_BLOOD, true,STR_BLOOD_PRESSURE},\r
-    //    {ECG, PNG_SET_CARD_ECG, true,STR_ECG},\r
-    //    {EMO, PNG_SET_CARD_EMO, true,STR_EMO},\r
-       {TRAINING, PNG_SET_CARD_TRAIN, true,STR_TRAINING},\r
-       {SLEEP, PNG_SET_CARD_SLEEP, true,STR_SLEEP},\r
-       {MUSIC_PLAYER, PNG_SET_CARD_PLAYER, true,STR_MUSIC},\r
-    };\r
-#else    \r
+    // 更新主界面卡片需要更新Map \r
     const CardInfo cardInfoMap[] = {\r
         {HEART_RATE, PNG_SET_CARD_HEART, true,STR_HEART_RATE},\r
         {TRAINING, PNG_SET_CARD_TRAIN, true,STR_TRAINING},\r
@@ -73,65 +42,25 @@ namespace OHOS
         {WEATHER, PNG_SET_CARD_WEATHER, false,STR_WEATHER},\r
         {MUSIC_PLAYER, PNG_SET_CARD_PLAYER, false,STR_MUSIC},\r
     };\r
-#endif\r
     /*维护卡片*/\r
-#if defined(BOARD_N9)\r
+    /*\r
+        fd230 排序\r
+        心率 运动 指南针 睡眠 血氧 每日目标 天气 音乐\r
+    */\r
     CardInfoSet cardInfoSet[] = {\r
-        /*\r
-            N9主界面卡片排序: \r
-           心率，血氧，运动，睡眠，音乐，指南针，天气，活动\r
-        */\r
-        {HEART_RATE, true},\r
-        {BLOODOXGEN, true},\r
-        {TRAINING, true},\r
-        {SLEEP, true},\r
-        {MUSIC_PLAYER, true},\r
-        {COMPASS, true},\r
-        {WEATHER, true},\r
-        {GOAL, true},\r
-    };\r
-#elif defined(BOARD_W9)\r
-        CardInfoSet cardInfoSet[] = {\r
-        /*\r
-            W9主界面卡片：\r
-            心率,血氧，血压，心电，情绪，运动，睡眠，音乐\r
-        */\r
-        {HEART_RATE, true},\r
-        {BLOODOXGEN, true},\r
-        // {BLOODPRESSURE, true},\r
-        // {ECG, true},\r
-        // {EMO, true},\r
-        {TRAINING, true},\r
-        {SLEEP, true},\r
-        {MUSIC_PLAYER, true},\r
+    {HEART_RATE, true},\r
+    {TRAINING, true},\r
+    {COMPASS, false},\r
+    {SLEEP, true},\r
+    {BLOODOXGEN, false},\r
+    {GOAL, false},\r
+    {WEATHER, false},\r
+    {MUSIC_PLAYER, false},\r
     };\r
-#else\r
-        /*\r
-            fd230 排序\r
-            心率 运动 指南针 睡眠 血氧 每日目标 天气 音乐\r
-        */\r
-        CardInfoSet cardInfoSet[] = {\r
-        {HEART_RATE, true},\r
-        {TRAINING, true},\r
-        {COMPASS, false},\r
-        {SLEEP, true},\r
-        {BLOODOXGEN, false},\r
-        {GOAL, false},\r
-        {WEATHER, false},\r
-        {MUSIC_PLAYER, false},\r
-        };\r
-#endif\r
+\r
     /*自定义map配置*/\r
     const DialInfo dialInfoMap[] = {\r
-#ifdef CUSTOM_Z1\r
-        {DIAL_CLOCK, "Z1", DEFAULT_DIALPER_PATH, DEFAULT_TASK_PERIOD},\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
         {DIAL_CLOCK_1, "Custom_1", CUSTOM_CLOCK1_DIALPER_PATH, DEFAULT_TASK_PERIOD}, // 表盘 Id 1\r
         {DIAL_CLOCK_2, "Custom_2", CUSTOM_CLOCK2_DIALPER_PATH, DEFAULT_TASK_PERIOD}, // 表盘 Id 2\r
         {DIAL_CLOCK_3, "Custom_3", CUSTOM_CLOCK3_DIALPER_PATH, DEFAULT_TASK_PERIOD}, // 表盘 Id 3\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainViewSample.cpp
index 1416f14..343a1e6 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainViewSample.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainViewSample.cpp
@@ -33,39 +33,6 @@ namespace OHOS
         UICardPage *(MainViewSample::*func)(void);
     };
     // 严格按照Id对应
-    #if defined(BOARD_N9)
-     /*
-         N9主界面卡片排序: 
-        心率，血氧，运动，睡眠，音乐，指南针，天气，活动
-    */
-    static const MainViewMapper CardMapper[] = {
-        {WATCH_FACE, &MainViewSample::InitWatchFacePage},
-        {HEART_RATE, &MainViewSample::InitHeartRatePage},
-        {BLOODOXGEN, &MainViewSample::InitBloodOxygenPage},
-        {TRAINING, &MainViewSample::InitTrainingPage},
-        {SLEEP, &MainViewSample::InitSleepPage},
-        {MUSIC_PLAYER, &MainViewSample::InitMusicPlayerPage},
-        {COMPASS, &MainViewSample::InitCompassPage},
-        {WEATHER, &MainViewSample::InitWeatherPage},
-        {GOAL, &MainViewSample::InitGoalPage},
-        {SETCARD, &MainViewSample::InitSetMainPage},
-    };
-    #elif defined(BOARD_W9)
-    /*
-        W9主界面卡片：
-        心率,血氧，血压，心电，情绪，运动，睡眠，音乐
-    */
-    static const MainViewMapper CardMapper[] = {
-        {WATCH_FACE, &MainViewSample::InitWatchFacePage},
-        {HEART_RATE, &MainViewSample::InitHeartRatePage},
-        {BLOODOXGEN, &MainViewSample::InitBloodOxygenPage},
-        // TODO: card 血压，心电，情绪
-        {TRAINING, &MainViewSample::InitTrainingPage},
-        {SLEEP, &MainViewSample::InitSleepPage},
-        {MUSIC_PLAYER, &MainViewSample::InitMusicPlayerPage},
-        {SETCARD, &MainViewSample::InitSetMainPage},
-    };
-    #else
     static const MainViewMapper CardMapper[] = {
         {WATCH_FACE, &MainViewSample::InitWatchFacePage},
         {HEART_RATE, &MainViewSample::InitHeartRatePage},
@@ -78,7 +45,6 @@ namespace OHOS
         {MUSIC_PLAYER, &MainViewSample::InitMusicPlayerPage},
         {SETCARD, &MainViewSample::InitSetMainPage},
     };
-    #endif
     MainViewSample::MainViewSample()
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::MainViewSample");

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessageView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessageView.cpp
index a165078..2ce9f5f 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessageView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessageView.cpp
@@ -221,7 +221,7 @@ UIList *MessageView::GetList() { return MessageList; }
 
 
 void MessageView::RefreshMessageList(const MessageListItem *itemInfo) {
-  for (uint8_t i = 0; i < MessageModel::GetInstance().GetMessageListNum();
+  for (uint8_t i = 0; i < MessageModel::GetInstance().GetMessageCount();
        i++) {
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,
                   "SettingPresenter::OnStart itemInfo[i].itemName:%d", i);

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/include/SetDialModel.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/include/SetDialModel.h
index 3df08cf..e0b18c7 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/include/SetDialModel.h
+++ b/code/sdk/application/wearable/fd230/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;

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialModel.cpp
index 72acaf6..4c924ba 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialModel.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialModel.cpp
@@ -36,22 +36,12 @@ namespace OHOS {
 
 // 表盘map[Id--dialname] 前5个ID固定
 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, "lake"},
-    {DEFAULT_DIAL_ID_1, "eagle"},      {DEFAULT_DIAL_ID_2, "vibrantnumber"},
-    {DEFAULT_DIAL_ID_3, "distortion"}, {MAX_DEFAULT_DIAL_ID, "science"},
-#elif BOARD_W9
-    {DEFAULT_DIAL_ID_0, "W9"},
-#else
     {DEFAULT_DIAL_ID_0, "KUMI"},
     {DEFAULT_DIAL_ID, "obsidianrhythm"}, // 默认表盘修改为 黑耀律动
     {DEFAULT_DIAL_ID_1, "satellite"},    // 卫星表盘
     {DEFAULT_DIAL_ID_2, "birdie"},       // 飞鸟表盘
     {DEFAULT_DIAL_ID_3, "dawninsight"},  // 晨曦智影
     {MAX_DEFAULT_DIAL_ID, "mirrorvoyager"}, // 镜影行者
-#endif
 };
 // 表盘市场UID 对应表盘name
 // 存储表盘到文件
@@ -485,18 +475,11 @@ void SetDialModel::LoadAllDialFromFs() {
   加载默认表盘
 */
 const std::vector<std::string> defaultDials = {
-#ifdef BOARD_N9
-    "lake", "eagle", "vibrantnumber", "distortion", "science",
-#else
     "obsidianrhythm", "mirrorvoyager", "satellite", "dawninsight", "birdie",
-#endif
 };
 
 void SetDialModel::LoadAllDialFromDefult(void) {
 
-#ifdef BOARD_W9
-  return; // w9暂时没有默认表盘
-#endif
 
   DIR *dirp = opendir(APP_DEFAULT_DIAL_PATH);
   if (dirp == nullptr) {

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingEnddataView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingEnddataView.cpp
index 45874c0..39ec86d 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingEnddataView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingEnddataView.cpp
@@ -722,7 +722,7 @@ void TraingEnddataView::InitData() {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "该运动项不需要GPS");
         return;
     }
-#if defined(BOARD_W9) || defined(BOARD_N9)
+  #if defined(SUPPORT_GNSS)
     //读取一下gps文件
     std::string gpsFilePath =
         TraingModel::GetInstance()->GetCanvasDataPath(enddata->starttime);
@@ -762,7 +762,7 @@ void TraingEnddataView::OnStart() {
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "该运动项不需要GPS");
     return;
   }
-#if defined(BOARD_W9) || defined(BOARD_N9)
+#if defined(SUPPORT_GNSS)
   ///////////////////////////gps轨迹测试//////////////////////
   // 检查是否有足够的GPS数据来绘制轨迹
   std::vector<Point> canvasData = TraingModel::GetInstance()->GetCanvasData();

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp
index 15446fa..318c353 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp
@@ -119,7 +119,7 @@ namespace OHOS
             /*判断是否需要GPS*/\r
             if(TraingModel::GetInstance()->IsNeedGPS(TraingModel::GetInstance()->GetSportEvent()) == true)\r
             {\r
-            #if defined(BOARD_W9) || defined(BOARD_N9)\r
+            #if defined(SUPPORT_GNSS)\r
                 bool gps_status = TraingModel::GetInstance()->GetGPSConnectState();\r
                 if (!gps_status)\r
                 {\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalView.cpp
index 01540a6..3f8ca1e 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalView.cpp
@@ -69,7 +69,7 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "该运动项不需要GPS");
             return;
         }
-#if defined(BOARD_W9) || defined(BOARD_N9)
+#if defined(SUPPORT_GNSS)
         InitUILabel(heartrate_label_, -32, 230, 200, 60, "heartrate_label_", "--", DEFAULT_VECTOR_FONT_FILENAME, 30);
         AddViewToRootContainer(heartrate_label_);
         InitUILabel(gps_label_, 295, 230, 200, 60, "label_time", "GPS", DEFAULT_VECTOR_FONT_FILENAME, 30);
@@ -114,7 +114,7 @@ namespace OHOS
             delete buttonSet_;
             buttonSet_ = nullptr;
         }
-#if defined(BOARD_W9) || defined(BOARD_N9)
+#if defined(SUPPORT_GNSS)
         if (heartrate_label_ != nullptr)
         {
             delete heartrate_label_;