From: luozheng <1732036298@qq.com>
Date: Tue, 5 Nov 2024 08:51:17 +0000 (+0800)
Subject: 优化手机与手表a2dp连接下，若在音乐播放器界面，手机控制播放暂停，只有在手机音乐才能更新显示
X-Git-Tag: fd230_release_V1.3.102~29^2~50
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F1342%2F2;p=mirrors%2FFD230.git

优化手机与手表a2dp连接下，若在音乐播放器界面，手机控制播放暂停，只有在手机音乐才能更新显示
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothHeadsetEvent.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothHeadsetEvent.cpp
index b5e923687..6702977f9 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothHeadsetEvent.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothHeadsetEvent.cpp
@@ -375,14 +375,14 @@ static void BtAvrcpCtSupportEventCallback(const bd_addr_t *bd_addr, avrcp_ct_sup
     for (uint8_t i = 0; i < event->event_num; i++) {
         if (event->event_id[i] == AVRCP_NOTIFY_EVENT_VOLUME_CHANGED) {
             int ret = avrcp_ct_register_notification(bd_addr, event->event_id[i], 0);
-            WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "register event_id: 0x%x, ret = 0x%x", event->event_id[i], ret);
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "register event_id: 0x%x, ret = 0x%x", event->event_id[i], ret);
         }
     }
 
     for (uint8_t i = 0; i < event->event_num; i++) {
         if (event->event_id[i] != AVRCP_NOTIFY_EVENT_VOLUME_CHANGED) {
             int ret = avrcp_ct_register_notification(bd_addr, event->event_id[i], 0);
-            WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "register event_id: 0x%x, ret = 0x%x", event->event_id[i], ret);
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "register event_id: 0x%x, ret = 0x%x", event->event_id[i], ret);
         }
     }
 }
diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp
index 372226898..ac80b05da 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp
@@ -1504,7 +1504,8 @@ static void BtA2dpSnkStartStreamReqCb(bd_addr_t *bd_addr)
     WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "addr: ****%02x%02x%02x%02x \n",
         bd_addr->addr[3], bd_addr->addr[2], bd_addr->addr[1], bd_addr->addr[0]); /* 3 2 1 0 idx */
     BtA2dpSnkAudioCreate();
-    GraphicService::GetInstance()->PostGraphicEvent(std::bind(&OHOS::PlayersModel::set_player_state, OHOS::PlayersModel::GetInstance(),true));
+    if(PlayersModel::GetInstance()->GetMusicSource())//如果是手机音乐才更新显示
+        GraphicService::GetInstance()->PostGraphicEvent(std::bind(&OHOS::PlayersModel::set_player_state, OHOS::PlayersModel::GetInstance(),true));
     // PlayersModel::GetInstance()->get_avrcp_ct_get_element_attributes();
 }
 
@@ -1513,7 +1514,8 @@ static void BtA2dpSnkPlayingStateChangedCb(bd_addr_t *bd_addr, int playing_state
     WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "addr: ****%02x%02x%02x%02x playing_state: %x\n",
         bd_addr->addr[3], bd_addr->addr[2], bd_addr->addr[1], bd_addr->addr[0], playing_state); /* 3 2 1 0 idx */
     if (playing_state == A2DP_NOT_PLAYING) {
-        GraphicService::GetInstance()->PostGraphicEvent(std::bind(&OHOS::PlayersModel::set_player_state, OHOS::PlayersModel::GetInstance(),false));
+        if(PlayersModel::GetInstance()->GetMusicSource())//如果是手机音乐才更新显示
+            GraphicService::GetInstance()->PostGraphicEvent(std::bind(&OHOS::PlayersModel::set_player_state, OHOS::PlayersModel::GetInstance(),false));
         BtA2dpSnkAudioDestroy();
     }
 }