From 47739422f36afec778a5f53c0bc186bb90526751 Mon Sep 17 00:00:00 2001
From: luozheng <1732036298@qq.com>
Date: Sat, 7 Sep 2024 15:19:41 +0800
Subject: [PATCH] =?utf8?q?=E9=9F=B3=E4=B9=90=E7=95=8C=E9=9D=A2=E4=BC=98?=
 =?utf8?q?=E5=8C=96=EF=BC=9A=E5=BD=93=E6=AD=8C=E6=9B=B2=E6=95=B0=E9=87=8F?=
 =?utf8?q?=E4=B8=BA0=E7=9A=84=E6=97=B6=E5=80=99=E7=82=B9=E5=87=BB=E6=92=AD?=
 =?utf8?q?=E6=94=BE=E6=8C=89=E9=92=AE=E4=BC=9A=E8=BF=9B=E5=85=A5=E5=88=B0?=
 =?utf8?q?=E6=AD=8C=E6=9B=B2=E5=88=97=E8=A1=A8=E4=B8=AD=EF=BC=8C=E8=BF=99?=
 =?utf8?q?=E6=97=B6=E4=BC=9A=E6=8F=90=E7=A4=BA=E6=AD=8C=E6=9B=B2=E4=B8=BA?=
 =?utf8?q?=E7=A9=BA=E8=A6=81=E5=8E=BBAPP=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../fd230app/nativeui/player/src/PlayersModel.cpp         | 6 +++---
 .../fd230app/nativeui/player/src/PlayersPresenter.cpp     | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

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;
-- 
2.17.1