From c8a22a360d8d0b1301b30e86db80747f6ffd7a84 Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Wed, 12 Nov 2025 12:10:24 +0800 Subject: [PATCH] =?utf8?q?fd272=EF=BC=9A=E5=B1=8F=E8=94=BD=E6=8E=89?= =?utf8?q?=E9=9F=B3=E4=B9=90=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeapp/nativelauncher/include/UiConfig.h | 2 +- .../nativeapp/nativeui/main/src/MainModel.cpp | 6 +++--- .../nativeui/main/src/MainPresenterSample.cpp | 16 +++++++++------- .../nativeui/main/src/MainViewSample.cpp | 2 +- .../musicplayer/src/MusicPlayerPresenter.cpp | 4 ++-- .../player/src/MusicPlayerSourceView.cpp | 4 ++-- .../traing/training_card/src/TraingCardView.cpp | 4 ++-- 7 files changed, 20 insertions(+), 18 deletions(-) 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 ba41e664d..95640a208 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/UiConfig.h +++ b/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/UiConfig.h @@ -25,7 +25,7 @@ namespace OHOS BLOODOXGEN, GOAL, WEATHER, - MUSIC_PLAYER, + // MUSIC_PLAYER, SETCARD, MAX_CARD, } CardId; 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 d979f5cd0..10cfe5866 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 @@ -41,7 +41,7 @@ namespace OHOS {BLOODOXGEN, PNG_SET_CARD_BLOOD, false,STR_BLOOD_OXYGEN}, {GOAL, PNG_SET_CARD_ACTIVITY, false,STR_ACTIVITY}, {WEATHER, PNG_SET_CARD_WEATHER, false,STR_WEATHER}, - {MUSIC_PLAYER, PNG_SET_CARD_PLAYER, false,STR_MUSIC}, + // {MUSIC_PLAYER, PNG_SET_CARD_PLAYER, false,STR_MUSIC}, }; /*维护卡片*/ /* @@ -56,7 +56,7 @@ namespace OHOS {BLOODOXGEN, false}, {GOAL, false}, {WEATHER, false}, - {MUSIC_PLAYER, false}, + // {MUSIC_PLAYER, false}, }; /*自定义map配置*/ @@ -72,7 +72,7 @@ namespace OHOS const CardInfo printfMap[] = { {HEART_RATE, "心率卡片"}, // {COMPASS, "指南针"}, - {MUSIC_PLAYER, "音乐"}, + // {MUSIC_PLAYER, "音乐"}, {BLOODOXGEN, "血氧"}, {WEATHER, "天气"}, {TRAINING, "训练"}, diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainPresenterSample.cpp index fcb57c11d..714dacec8 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainPresenterSample.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainPresenterSample.cpp @@ -289,9 +289,11 @@ time = DEFAULT_TASK_PERIOD; } SetPeriod(time); - } else if (cardId == MUSIC_PLAYER) { - SetPeriod(PLAYER_PERIOD); - } else { + } + // else if (cardId == MUSIC_PLAYER) { + // SetPeriod(PLAYER_PERIOD); + // } + else { SetPeriod(MAX_PERIOD); } } @@ -348,7 +350,7 @@ void MainPresenterSample::SetCircleProgress() { - #if 1 + #if 0 PlayersView *playersView = dynamic_cast(view_->GetViewById(MUSIC_PLAYER)); if (playersView == nullptr) { @@ -473,9 +475,9 @@ // SetCompassRotate(); // break; - case MUSIC_PLAYER: - PlayersModel::GetInstance()->SetCircleProgress(); - break; + // case MUSIC_PLAYER: + // PlayersModel::GetInstance()->SetCircleProgress(); + // break; case WATCH_FACE: UpdateWatchFace(); 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 668f74910..266042f2f 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 @@ -42,7 +42,7 @@ namespace OHOS {BLOODOXGEN, &MainViewSample::InitBloodOxygenPage}, {GOAL, &MainViewSample::InitGoalPage}, {WEATHER, &MainViewSample::InitWeatherPage}, - {MUSIC_PLAYER, &MainViewSample::InitMusicPlayerPage}, + // {MUSIC_PLAYER, &MainViewSample::InitMusicPlayerPage}, {SETCARD, &MainViewSample::InitSetMainPage}, }; MainViewSample::MainViewSample() diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/musicplayer/src/MusicPlayerPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/musicplayer/src/MusicPlayerPresenter.cpp index fb7eabc3c..caed17c59 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/musicplayer/src/MusicPlayerPresenter.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/musicplayer/src/MusicPlayerPresenter.cpp @@ -20,8 +20,8 @@ namespace OHOS { - REGIST_MENU_PRO(VIEW_MUSIC_PLAYER, MusicPlayerView, MusicPlayerPresenter, - PNG_APPLIST_MUSIC_IMAGE_BIG, PNG_APPLIST_MUSIC_IMAGE,PNG_APPLIST_MUSIC_IMAGE, "音乐", STR_MUSIC); + // REGIST_MENU_PRO(VIEW_MUSIC_PLAYER, MusicPlayerView, MusicPlayerPresenter, + // PNG_APPLIST_MUSIC_IMAGE_BIG, PNG_APPLIST_MUSIC_IMAGE,PNG_APPLIST_MUSIC_IMAGE, "音乐", STR_MUSIC); static MusicPlayerPresenter *g_pMusicPlayerPresenter = nullptr; diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/player/src/MusicPlayerSourceView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/player/src/MusicPlayerSourceView.cpp index 65f47c18c..e4d902a4d 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/player/src/MusicPlayerSourceView.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/player/src/MusicPlayerSourceView.cpp @@ -120,8 +120,8 @@ namespace OHOS WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OnClick bluetoothHeadsetLableButton"); NativeAbility::GetInstance().EnterSlice(VIEW_BLUETOOTH_EARPHONE); // 配置主界面回退界面 - MainModel::GetInstance().SetFromSetCardView(true); - MainModel::GetInstance().SetFromCardId(MUSIC_PLAYER); + // MainModel::GetInstance().SetFromSetCardView(true); + // MainModel::GetInstance().SetFromCardId(MUSIC_PLAYER); } return true; diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp index 30a9397ad..109edee56 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp @@ -598,12 +598,12 @@ void TraingCardView ::InitView() { InitControlPage(); InitDataPage(); - InitMusicPage(); + // InitMusicPage(); // InitDetailPage(); swipe_->HorAdd(controlview_); swipe_->HorAdd(dataallview_); - swipe_->HorAdd(musicview_); + // swipe_->HorAdd(musicview_); ShowEndView(); ShowGetTagView(); -- 2.17.1