From 11f9214ea62e7f09f9c24ce8d6a2a51bcd3e2250 Mon Sep 17 00:00:00 2001 From: Caisking <3449750381@qq.com> Date: Sat, 15 Jun 2024 18:52:15 +0800 Subject: [PATCH] =?utf8?q?=E6=9B=B4=E6=96=B0=E4=B8=BB=E7=95=8C=E9=9D=A2?= =?utf8?q?=E5=8D=A1=E7=89=87=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../fd230app/nativelauncher/include/UiConfig.h | 11 ++++++----- .../fd230app/nativeui/main/src/MainModel.cpp | 7 ++++--- .../nativeui/main/src/MainViewSample.cpp | 18 +++++++++--------- .../fd230/fs/user/res/MainCard/SetMainCard.bin | 3 +++ .../fd230/fs/user/res/MainCard/disturbicon.bin | 3 +++ .../fd230/fs/user/res/message/Icon.bin | 3 +++ 6 files changed, 28 insertions(+), 17 deletions(-) create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/SetMainCard.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/disturbicon.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/message/Icon.bin diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h index 073804def..637ca8c61 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h +++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h @@ -24,9 +24,9 @@ namespace OHOS BLOODOXGEN, WEATHER, TRAINING, - ACTIVITY, - SETCARD, - GOAL, + // ACTIVITY, + SETCARD, + GOAL, MAX_CARD, } CardId; @@ -77,6 +77,7 @@ namespace OHOS static constexpr const char *PNG_SET_CARD_PLAYER = APP_RES_PATH "/MainCard/MusicCard.bin"; static constexpr const char *PNG_SET_CARD_WEATHER = APP_RES_PATH "/MainCard/WeatherCard.bin"; static constexpr const char *PNG_SET_CARD_ACTIVITY = APP_RES_PATH "/MainCard/SportCard.bin"; + static constexpr const char *PNG_SET_CARD_MAIN = APP_RES_PATH "/MainCard/SetMainCard.bin"; static constexpr const char *DROPDOWN_IAMGES = APP_RES_PATH "/MainCard/dropdown.bin"; static constexpr const char *CLOCK_IAMGES = APP_RES_PATH "/MainCard/clock.bin"; static constexpr const char *PLAYER_IAMGES = APP_RES_PATH "/MainCard/player.bin"; @@ -269,8 +270,8 @@ namespace OHOS static constexpr const char *PNG_APPLIST_TACKEPHOTOS_IMAGE = APP_LIST_PATH "/assistant.bin"; // 遥控拍照 static constexpr const char *PNG_APPLIST_BLUETOOTH_IMAGE = APP_LIST_PATH "/Bluetooth.bin"; // 蓝牙 static constexpr const char *PNG_APPLIST_BREATHE_IMAGE = APP_LIST_PATH "/breathe.bin"; // 呼吸训练 - static constexpr const char *PNG_APPLIST_GOAL_IMAGE = APP_LIST_PATH "/sport.bin"; // 每日目标 - + static constexpr const char *PNG_APPLIST_GOAL_IMAGE = APP_LIST_PATH "/sport.bin"; // 每日目标 + /* ---------------------------------- 快速训练 ---------------------------------- */ static constexpr const char *PNG_TRAING_BOUTTONMORE_IMAGE = APP_RES_PATH "/Training/More.bin"; static constexpr const char *PNG_TRAING_BUTTONGRONG_IMAGE = APP_RES_PATH "/Training/Bouttonground.bin"; 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 9d0e6f17e..e9f13f7a1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp @@ -23,9 +23,10 @@ namespace OHOS {BLOODOXGEN, PNG_SET_CARD_BLOOD}, {WEATHER, PNG_SET_CARD_WEATHER}, {TRAINING, PNG_SET_CARD_TRAIN}, - {ACTIVITY, PNG_SET_CARD_ACTIVITY}, - {SETCARD, PNG_SET_CARD_ACTIVITY}, + {SETCARD, PNG_SET_CARD_MAIN}, {GOAL, PNG_SET_CARD_TRAIN}, + + // {ACTIVITY, PNG_SET_CARD_ACTIVITY}, }; /*自定义map？*/ const DialInfo dialInfoMap[] = { @@ -96,7 +97,7 @@ namespace OHOS cardSettings[index++] = WATCH_FACE; cardSettings[index++] = HEART_RATE; cardSettings[index++] = COMPASS; - cardSettings[index++] = ACTIVITY; + // cardSettings[index++] = ACTIVITY; cardSettings[index++] = MUSIC_PLAYER; cardSettings[index++] = SETCARD; // 默认卡片增加设置卡片 cardSettingCount = index; diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp index cb289a8cf..a3c85cbef 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp @@ -36,8 +36,8 @@ namespace OHOS {BLOODOXGEN, &MainViewSample::InitBloodOxygenPage}, {WEATHER, &MainViewSample::InitWeatherPage}, {TRAINING, &MainViewSample::InitTrainingPage}, - {ACTIVITY, &MainViewSample::InitActivityPage}, - {SETCARD, &MainViewSample::InitSetMainPage}, + //{ACTIVITY, &MainViewSample::InitActivityPage}, + {SETCARD, &MainViewSample::InitSetMainPage}, {GOAL, &MainViewSample::InitGoalPage}, }; MainViewSample::MainViewSample() @@ -127,17 +127,17 @@ namespace OHOS delete bloodView; bloodView = nullptr; } - + if (traingView != nullptr) { traingView->RemoveAll(); - delete traingView; + delete traingView; traingView = nullptr; } - if (GoalControlView != nullptr) + if (GoalControlView != nullptr) { GoalControlView->RemoveAll(); - delete GoalControlView; + delete GoalControlView; GoalControlView = nullptr; } // if (applistCardView != nullptr) @@ -434,7 +434,7 @@ namespace OHOS } return traingView; } - + // 主界面天气卡片 UICardPage *MainViewSample::InitWeatherPage(void) { @@ -445,7 +445,7 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "mainweatherView new fail"); return nullptr; } - return weatherControlView; + return weatherControlView; } UICardPage *MainViewSample::InitGoalPage(void) @@ -457,7 +457,7 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "mainweatherView new fail"); return nullptr; } - return GoalControlView; + return GoalControlView; } // 主界面心率卡片 UICardPage *MainViewSample::InitHeartRatePage(void) diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/SetMainCard.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/SetMainCard.bin new file mode 100644 index 000000000..1ca063463 --- /dev/null +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/SetMainCard.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:264fd338ce4a5bcd3b86b2a2b208eaea5e599fd4bfb5b432e7162a281b4a07ca +size 52664 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/disturbicon.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/disturbicon.bin new file mode 100644 index 000000000..09c8a7f4a --- /dev/null +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/disturbicon.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52af627cc6aecf638d5f6fd301ce6cfd551f0696fa831ccf79eb055cbd7742a6 +size 1144 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/message/Icon.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/message/Icon.bin new file mode 100644 index 000000000..0def979dc --- /dev/null +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/message/Icon.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6ceacc15222442e90e00d0a7225016a5cbda01a78dc61e8f23fb01d70236af8 +size 120 -- 2.17.1