From: Caisking Date: Wed, 15 Oct 2025 10:36:51 +0000 (+0800) Subject: 优化FD272项目耦合 X-Git-Tag: V1.0.9_20251128_194606_LN~212^2~13 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=95d14dbadf8f8bd80478a4a0537a070956d1fdc1;p=mirrors%2FFD230.git 优化FD272项目耦合 --- 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 456ba70d9..5f7355c34 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/UiConfig.h +++ b/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/UiConfig.h @@ -143,16 +143,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/fd272/nativeapp/nativeui/main/src/MainModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainModel.cpp index 3d79a040a..a976e7281 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainModel.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainModel.cpp @@ -32,37 +32,7 @@ namespace OHOS static const int DIAL_SETTING_VALUE_LEN = 64; /*默认卡片：心率，睡眠，快速训练*/ // 更新主界面卡片需要更新Map -#if defined(BOARD_N9) - const CardInfo cardInfoMap[] = { - /* -  N9主界面卡片排序: - 心率，血氧，运动，睡眠，音乐，指南针，天气，活动 - */ - {HEART_RATE, PNG_SET_CARD_HEART, true,STR_HEART_RATE}, - {BLOODOXGEN, PNG_SET_CARD_BLOOD, true,STR_BLOOD_OXYGEN}, - {TRAINING, PNG_SET_CARD_TRAIN, true,STR_TRAINING}, - {SLEEP, PNG_SET_CARD_SLEEP, true,STR_SLEEP}, - {MUSIC_PLAYER, PNG_SET_CARD_PLAYER, true,STR_MUSIC}, - {COMPASS, PNG_SET_CARD_COMPASS, true,STR_COMPASS}, - {WEATHER, PNG_SET_CARD_WEATHER,true,STR_WEATHER}, - {GOAL, PNG_SET_CARD_ACTIVITY, true,STR_ACTIVITY}, - }; -#elif defined(BOARD_W9) - /* - W9主界面卡片： - 心率,血氧，血压，心电，情绪，运动，睡眠，音乐 - */ - const CardInfo cardInfoMap[] = { - {HEART_RATE, PNG_SET_CARD_HEART, true,STR_HEART_RATE}, - {BLOODOXGEN, PNG_SET_CARD_BLOOD, true,STR_BLOOD_OXYGEN}, - // {BLOODPRESSURE, PNG_SET_CARD_BLOOD, true,STR_BLOOD_PRESSURE}, - // {ECG, PNG_SET_CARD_ECG, true,STR_ECG}, - // {EMO, PNG_SET_CARD_EMO, true,STR_EMO}, - {TRAINING, PNG_SET_CARD_TRAIN, true,STR_TRAINING}, - {SLEEP, PNG_SET_CARD_SLEEP, true,STR_SLEEP}, - {MUSIC_PLAYER, PNG_SET_CARD_PLAYER, true,STR_MUSIC}, - }; -#else + const CardInfo cardInfoMap[] = { {HEART_RATE, PNG_SET_CARD_HEART, true,STR_HEART_RATE}, {TRAINING, PNG_SET_CARD_TRAIN, true,STR_TRAINING}, @@ -73,65 +43,25 @@ namespace OHOS {WEATHER, PNG_SET_CARD_WEATHER, false,STR_WEATHER}, {MUSIC_PLAYER, PNG_SET_CARD_PLAYER, false,STR_MUSIC}, }; -#endif /*维护卡片*/ -#if defined(BOARD_N9) + /* + fd272 排序 + 心率 运动 指南针 睡眠 血氧 每日目标 天气 音乐 + */ CardInfoSet cardInfoSet[] = { - /* -  N9主界面卡片排序: - 心率，血氧，运动，睡眠，音乐，指南针，天气，活动 - */ - {HEART_RATE, true}, - {BLOODOXGEN, true}, - {TRAINING, true}, - {SLEEP, true}, - {MUSIC_PLAYER, true}, - {COMPASS, true}, - {WEATHER, true}, - {GOAL, true}, - }; -#elif defined(BOARD_W9) - CardInfoSet cardInfoSet[] = { - /* - W9主界面卡片： - 心率,血氧，血压，心电，情绪，运动，睡眠，音乐 - */ - {HEART_RATE, true}, - {BLOODOXGEN, true}, - // {BLOODPRESSURE, true}, - // {ECG, true}, - // {EMO, true}, - {TRAINING, true}, - {SLEEP, true}, - {MUSIC_PLAYER, true}, + {HEART_RATE, true}, + {TRAINING, true}, + {COMPASS, false}, + {SLEEP, true}, + {BLOODOXGEN, false}, + {GOAL, false}, + {WEATHER, false}, + {MUSIC_PLAYER, false}, }; -#else - /* - fd230 排序 - 心率 运动 指南针 睡眠 血氧 每日目标 天气 音乐 - */ - CardInfoSet cardInfoSet[] = { - {HEART_RATE, true}, - {TRAINING, true}, - {COMPASS, false}, - {SLEEP, true}, - {BLOODOXGEN, false}, - {GOAL, false}, - {WEATHER, false}, - {MUSIC_PLAYER, false}, - }; -#endif + /*自定义map配置*/ const DialInfo dialInfoMap[] = { -#ifdef CUSTOM_Z1 - {DIAL_CLOCK, "Z1", DEFAULT_DIALPER_PATH, DEFAULT_TASK_PERIOD}, -#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 {DIAL_CLOCK_1, "Custom_1", CUSTOM_CLOCK1_DIALPER_PATH, DEFAULT_TASK_PERIOD}, // 表盘 Id 1 {DIAL_CLOCK_2, "Custom_2", CUSTOM_CLOCK2_DIALPER_PATH, DEFAULT_TASK_PERIOD}, // 表盘 Id 2 {DIAL_CLOCK_3, "Custom_3", CUSTOM_CLOCK3_DIALPER_PATH, DEFAULT_TASK_PERIOD}, // 表盘 Id 3 diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainViewSample.cpp index 1416f14a4..343a1e639 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainViewSample.cpp +++ b/code/sdk/application/wearable/fd272/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/fd272/nativeapp/nativeui/set_dial/src/SetDialModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/set_dial/src/SetDialModel.cpp index 72acaf6b5..fe1d5312e 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/set_dial/src/SetDialModel.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/set_dial/src/SetDialModel.cpp @@ -36,22 +36,7 @@ namespace OHOS { // 表盘map[Id--dialname] 前5个ID固定 std::unordered_map 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 + {DEFAULT_DIAL_ID_0, "FD272"}, }; // 表盘市场UID 对应表盘name // 存储表盘到文件 @@ -485,18 +470,14 @@ void SetDialModel::LoadAllDialFromFs() { 加载默认表盘 */ const std::vector 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 + + return; // 暂时没有默认表盘 + DIR *dirp = opendir(APP_DEFAULT_DIAL_PATH); if (dirp == nullptr) { diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingEnddataView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingEnddataView.cpp index 45874c056..39ec86d17 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingEnddataView.cpp +++ b/code/sdk/application/wearable/fd272/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 canvasData = TraingModel::GetInstance()->GetCanvasData(); diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp index 15446fa1e..318c353b6 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp @@ -119,7 +119,7 @@ namespace OHOS /*判断是否需要GPS*/ if(TraingModel::GetInstance()->IsNeedGPS(TraingModel::GetInstance()->GetSportEvent()) == true) { - #if defined(BOARD_W9) || defined(BOARD_N9) + #if defined(SUPPORT_GNSS) bool gps_status = TraingModel::GetInstance()->GetGPSConnectState(); if (!gps_status) { diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalView.cpp index 01540a6fb..f541b6f68 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalView.cpp +++ b/code/sdk/application/wearable/fd272/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_;