From: luozheng <1732036298@qq.com> Date: Tue, 13 Aug 2024 11:03:15 +0000 (+0800) Subject: 1. 修复删除音乐歌单不同步问题 X-Git-Tag: release_V1.2.70_20241020_135402~671^2~1 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=acf9a94c58a489518f360e6c2a4c0444d800fa78;p=mirrors%2FFD230.git 1. 修复删除音乐歌单不同步问题 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersModel.h b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersModel.h index f4ba5bb87..37be7a259 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersModel.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-08-05 15:20:03 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-13 11:11:47 + * @LastEditTime: 2024-08-13 17:11:32 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersModel.h */ @@ -100,6 +100,7 @@ public: bool GetMusicSource(); void SetMusicSource(bool value); void UpdateMusicPlayerList(void); + bool GetCurrentMusicIsPlaying(void); private: bool musicSourceFlag{false};//音乐来源标志:false:默认为手表音乐,true:手机音乐 private: diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersPresenter.h index ff9fc97bf..519943b3e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersPresenter.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-08-05 15:20:03 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-13 14:26:21 + * @LastEditTime: 2024-08-13 16:10:15 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersPresenter.h */ @@ -111,6 +111,7 @@ private: void PlayerModelButtonOnClick(); void OptionsButtonOnClick(); void MusicListButtonOnClick(); + void MusicDeleteButtonOnClick(); }; // 播放器回调 diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersView.h b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersView.h index 0a7806d75..28bf93cf8 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersView.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-08-05 15:20:03 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-13 15:07:08 + * @LastEditTime: 2024-08-13 16:11:48 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersView.h */ @@ -99,6 +99,7 @@ namespace OHOS UICheckBox::UICheckBoxState GetPlayerButtonState(void); void UpdatePlayerView(bool musicSourceType, bool phoneMusicConnectStatus); + void UpdateMusicListStatus(void); VolumeSettingView *GetVolumeSettingView(); PlayerListDelSongView *GetPlayerListDelSongView(); @@ -141,7 +142,6 @@ namespace OHOS void PhoneMusicConnectStatusLabelColor(bool state); void OptionsButtonSetImageStyle(ImageInfo *image); void SetMusicPlayerButtonIsTouchable(bool musicSourceType); - void UpdateMusicListStatus(void); private: VolumeSettingView *volumeSettingView{nullptr}; // 声音设置 diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListDelSongView.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListDelSongView.cpp index 352c669f3..14ed7b85d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListDelSongView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListDelSongView.cpp @@ -98,8 +98,8 @@ namespace OHOS // 删除歌曲文件 void PlayerListDelSongView::DeleteSongNameFile(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " whill Deleted file:", delSongName.c_str()); - std::string path = PlayersModel::GetInstance()->GetMusicPlayPath() + delSongName; + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, " whill Deleted file:%s", delSongName.c_str()); + std::string path = PlayersModel::GetInstance()->GetMusicPlayPath() + "/" + delSongName; if (uapi_delete_files(path.c_str())) { @@ -187,15 +187,23 @@ namespace OHOS deleteNotelabel->SetTextId(STR_DELETE_PERMANENTLY); deleteNotelabel->SetTextColor(Color::GetColorFromRGBA(0x66, 0x66, 0x66, 0xff)); /* -------------------------------------------------------------------------- */ - labelConfig.top = 220; - songNameLabel = PlayerListDelSongViewLabelInit(labelConfig); if (songNameLabel == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "songNameLabel new fail!"); - return false; + songNameLabel = new UILabelExt(); + if (songNameLabel == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "songNameLabel new fail!"); + return false; + } } + songNameLabel->SetPosition(53, 220, 360, 35); + songNameLabel->SetStyle(STYLE_TEXT_FONT, 30); + songNameLabel->SetStyle(STYLE_LINE_HEIGHT, 35); songNameLabel->SetText(""); + songNameLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + songNameLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); songNameLabel->SetTextColor(Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff)); + songNameLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); return true; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersCaseListAdapter.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersCaseListAdapter.cpp index 4351a5d22..d18815c8b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersCaseListAdapter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersCaseListAdapter.cpp @@ -162,7 +162,7 @@ namespace OHOS { item = static_cast(inView); } - if (PlayersModel::GetInstance()->GetCurrentIndex() == index) + if (PlayersModel::GetInstance()->GetCurrentIndex() == index && PlayersModel::GetInstance()->GetCurrentMusicIsPlaying()) { item->UpdateItemViewStyle(true); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp index f8a9d0da0..ade1d8112 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp @@ -781,5 +781,27 @@ void PlayersModel::SetMusicSource(bool value) void PlayersModel::UpdateMusicPlayerList(void) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersModel::UpdateMusicPlayerList"); + PlayersView *playersView = PlayersView::GetInstance(); + if (playersView == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OptionsButtonOnClick playersView nullptr err"); + return; + } + PlayersListGroup::GetInstance()->SetUpListCase(); + if(playersView->GetMusicListList()) + { + playersView->GetMusicListList()->RefreshList(); + playersView->UpdateMusicListStatus(); + } +} + +/*获取当前音乐是否是在播放中*/ +bool PlayersModel::GetCurrentMusicIsPlaying(void) +{ + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersModel::GetMusicIsPlaying"); + int state = PlayersModel::GetInstance()->GetPlayerState(); + if (state == PlayerStates::PLAYER_STARTED || state == PlayerStates::PLAYER_PAUSED || state == PlayerStates::PLAYER_PLAYBACK_COMPLETE){ + return true; + } + return false; } } \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp index 98215365e..b6ddbeae1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp @@ -417,6 +417,7 @@ void PlayersListGroup::AddCase(PlayerCaseInfo testCaseInfo) void PlayersListGroup::SetUpListCase() { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersListGroup::SetUpListCase"); int16_t ret; if (playersCaseList_ == nullptr) { playersCaseList_ = new List(); @@ -561,7 +562,7 @@ int PlayersListGroup::GetAllFiles(std::list &playersList) } // 关闭目录 closedir(dirp); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView::GetAllFiles end!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::GetAllFiles end!"); return OHOS_SUCCESS; } @@ -612,6 +613,7 @@ void ButtonOnClickListener::PlayerButtonOnClick() PlayersModel::GetInstance()->ConnectBtAndLocalPause(connCtState, connTgState); } /* -------------------------------------------------------------------------- */ + PlayersModel::GetInstance()->SetCurrentIndex(PlayersModel::GetInstance()->GetCurrentIndex()); } /*当声音按钮被点击时候调用*/ @@ -661,7 +663,23 @@ void ButtonOnClickListener::MusicListButtonOnClick() playersView->ChangeView(PlayersView::MAIN_MUSICPLAYER_VIEW,PlayersView::MUSIC_LIST_VIEW); return; } - +//当音乐删除按钮被点击时候调用 +void ButtonOnClickListener::MusicDeleteButtonOnClick() +{ + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ButtonOnClickListener::MusicDeleteButtonOnClick"); + PlayersView *playersView = PlayersView::GetInstance(); + if (playersView == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OptionsButtonOnClick playersView nullptr err"); + return; + } + PlayersListGroup::GetInstance()->SetUpListCase(); + if(playersView->GetMusicListList()) { + playersView->GetMusicListList()->RefreshList(); + playersView->UpdateMusicListStatus(); + } + + return; +} void ButtonOnClickListener::PlayerModelButtonOnClick() { PlayersView *playersView = PlayersView::GetInstance(); @@ -728,7 +746,7 @@ bool ButtonOnClickListener::OnClick(UIView& view, const ClickEvent& event) { //删除音乐回到音乐列表 playersView->GetPlayerListDelSongView()->DeleteSongNameFile(); - // PlayersListGroup::GetInstance()->SetUpListCase(); + MusicDeleteButtonOnClick(); playersView->ChangeView(PlayersView::MUSIC_DELETE_VIEW,PlayersView::MUSIC_LIST_VIEW); } else if(playersView->GetPlayerListDelSongView()!=nullptr && &view == playersView->GetPlayerListDelSongView()->GetCancelDeleteButton()) diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp index 7dfc12499..443ba94d3 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp @@ -863,7 +863,7 @@ namespace OHOS void PlayersView::UpdateMusicListStatus(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::UpdateMusicListStatus"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView::UpdateMusicListStatus"); if (musicAdapter && musicListIsEmptyImage && musicListIsEmptyLabel && musicList) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "musicNum = %d", musicAdapter->GetCount()); diff --git a/code/sdk/application/wearable/fd230app/nativeui/uiservice/src/ui_service.cpp b/code/sdk/application/wearable/fd230app/nativeui/uiservice/src/ui_service.cpp index 2144a5064..d3f7eee0c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/uiservice/src/ui_service.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/uiservice/src/ui_service.cpp @@ -581,7 +581,7 @@ void HandleUpdateAIAnswerStr(Request *request) //处理手表第一次启动用来跳转主界面的 void HandleWatchFirstPaired(Request *request) { - WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "HandleUpdateAIAnswerStr"); + WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "HandleWatchFirstPaired"); GraphicService::GetInstance()->PostGraphicEvent( std::bind(&OHOS::RebootAndShutdownModel::HandFirstTimeStartJumpToMainView, &OHOS::RebootAndShutdownModel::GetInstance())); } @@ -589,7 +589,7 @@ void HandleWatchFirstPaired(Request *request) //处理更新OBU Message void HandleUpdateOBUMessage(Request *request) { - WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "HandleUpdateAIAnswerStr"); + WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "HandleUpdateOBUMessage"); GraphicService::GetInstance()->PostGraphicEvent( std::bind(&OHOS::OBUMessageModel::UpdateOBUMessageViewData, &OHOS::OBUMessageModel::GetInstance())); }