From: luozheng <1732036298@qq.com> Date: Sat, 7 Sep 2024 07:19:41 +0000 (+0800) Subject: 音乐界面优化:当歌曲数量为0的时候点击播放按钮会进入到歌曲列表中,这时会提示歌曲为空要去APP同步 X-Git-Tag: release_V1.2.70_20241020_135402~524^2~7 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F903%2F2;p=mirrors%2FFD230.git 音乐界面优化:当歌曲数量为0的时候点击播放按钮会进入到歌曲列表中,这时会提示歌曲为空要去APP同步 --- 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 00c775092..47e648ab5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp @@ -128,11 +128,11 @@ int PlayersModel::PlayerStat() PlayersPresenter *playersPresenter = PlayersPresenter::GetInstance(); if (playersPresenter != nullptr) { playersPresenter->PlayerbackReset(); - SetCircleProgress(100); // 100:进度100% + SetCircleProgress(0); // 100:进度100% playersPresenter->SetPlaybackProgress(circleProgress); } else { SetPlayButtonState(false); - SetCircleProgress(100); // 100:进度100% + SetCircleProgress(0); // 100:进度100% } AudioManager::GetInstance().DeactivateAudioInterrupt(interrupt); isActivateAudioInterrupt = false; @@ -945,7 +945,7 @@ bool PlayersModel::GetCurrentMusicIsPlaying(void) } else { - playerProgressValue_ = 100; // 100: max progress value + playerProgressValue_ = 0; // 100: max progress value } PlayersModel::GetInstance()->SetCircleProgress(playerProgressValue_); PlayersPresenter::GetInstance()->SetPlaybackProgress(playerProgressValue_); 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 dcc61f563..3d5c1cb4d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp @@ -580,6 +580,14 @@ void ButtonOnClickListener::PlayerButtonOnClick() return; } + if(PlayersListGroup::GetInstance()->GetCase().IsEmpty()) //若当前歌曲列表为空他跳转到音乐列表进行提示 + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "current playersCaseList_ is empty!!"); + playersView->SetPlayerButtonState(UICheckBox::UICheckBoxState::UNSELECTED); + playersView->ChangeView(PlayersView::MAIN_MUSICPLAYER_VIEW,PlayersView::MUSIC_LIST_VIEW); + return; + } + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "play_or_pause_Button OnClick"); uint8_t state = UICheckBox::UICheckBoxState::MAX_STATUS_NUM; int32_t playerState;