From 18ec2feebcc7cf7ab85899aefb24bf11d4450ddd Mon Sep 17 00:00:00 2001
From: luozheng <1732036298@qq.com>
Date: Wed, 15 Jan 2025 15:37:02 +0800
Subject: [PATCH] =?utf8?q?=E8=A7=A3=E5=86=B3#1268,=E6=89=8B=E8=A1=A8?=
 =?utf8?q?=EF=BC=8C=E4=BD=BF=E7=94=A8=E6=89=8B=E6=9C=BA=E9=9F=B3=E4=B9=90?=
 =?utf8?q?=E6=92=AD=E5=8F=91=E6=AD=8C=E6=9B=B2=EF=BC=8C=E5=85=88=E6=9A=82?=
 =?utf8?q?=E5=81=9C=E9=9F=B3=E4=B9=90=E5=90=8E=E5=88=87=E6=8D=A2=E6=AD=8C?=
 =?utf8?q?=E6=9B=B2=EF=BC=8C=E6=89=8B=E8=A1=A8=E4=B8=8A=E7=9A=84=E6=9A=82?=
 =?utf8?q?=E5=81=9C=E7=8A=B6=E6=80=81=E4=B8=8D=E4=BC=9A=E6=9B=B4=E9=9A=8F?=
 =?utf8?q?=E5=8F=98=E5=8A=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../nativeui/player/src/PlayersPresenter.cpp  | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 deletions(-)

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 70c45b43f..2bfc060c3 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp
@@ -683,19 +683,25 @@ void ButtonOnClickListener::PlayerButtonOnClick()
 /*下一首按钮被点击时调用*/
 void ButtonOnClickListener::NextButtonOnClick()
 {
+    PlayersView *playersView = PlayersView::GetInstance();
+    if (playersView == nullptr) {
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::GetInstance");
+        return;
+    }
     /* -------------------------- 若ct或tg端是已连接状态且当前为手机音乐 ------------------------- */
     if(PlayersModel::GetInstance()->get_avrcp_ct_or_tg_is_connected() && PlayersModel::GetInstance()->GetMusicSource())
     {
         PlayersModel::GetInstance()->set_phone_music_play_state(AVRCP_KEY_FORWARD); //控制手机音乐下一首
+        uint8_t state = UICheckBox::UICheckBoxState::MAX_STATUS_NUM;
+        state = playersView->GetPlayerButtonState();
+        if (PlayersModel::GetInstance()->get_a2dp_sink_playing_state() && state == UICheckBox::UICheckBoxState::UNSELECTED) 
+        {
+            playersView->SetPlayerButtonState(UICheckBox::UICheckBoxState::SELECTED);
+        }
         return;
     }
     else
     {
-        PlayersView *playersView = PlayersView::GetInstance();
-        if (playersView == nullptr) {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::GetInstance");
-            return;
-        }
         if (PlayersModel::GetInstance()->get_avrcp_ct_or_tg_is_connected() && 
                 PlayersModel::GetInstance()->get_a2dp_sink_playing_state()) //若ct或tg端是已连接状态且当前a2dp_sink是已播放状态
         {
@@ -712,19 +718,25 @@ void ButtonOnClickListener::NextButtonOnClick()
 /*上一首按钮被点击时调用*/
 void ButtonOnClickListener::PreButtonOnClick()
 {
+    PlayersView *playersView = PlayersView::GetInstance();
+    if (playersView == nullptr) {
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::GetInstance");
+        return;
+    }
     /* -------------------------- 若ct或tg端是已连接状态且当前为手机音乐 ------------------------- */
     if(PlayersModel::GetInstance()->get_avrcp_ct_or_tg_is_connected() && PlayersModel::GetInstance()->GetMusicSource())
     {
         PlayersModel::GetInstance()->set_phone_music_play_state(AVRCP_KEY_BACKWARD); //控制手机音乐上一首
+        uint8_t state = UICheckBox::UICheckBoxState::MAX_STATUS_NUM;
+        state = playersView->GetPlayerButtonState();
+        if (PlayersModel::GetInstance()->get_a2dp_sink_playing_state() && state == UICheckBox::UICheckBoxState::UNSELECTED) 
+        {
+            playersView->SetPlayerButtonState(UICheckBox::UICheckBoxState::SELECTED);
+        }
         return;
     }
     else
     {
-        PlayersView *playersView = PlayersView::GetInstance();
-        if (playersView == nullptr) {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::GetInstance");
-            return;
-        }
         if (PlayersModel::GetInstance()->get_avrcp_ct_or_tg_is_connected() && 
                 PlayersModel::GetInstance()->get_a2dp_sink_playing_state()) //若ct或tg端是已连接状态且当前a2dp_sink是已播放状态
         {
-- 
2.17.1