From: 罗正 <1732036298@qq.com>
Date: Thu, 5 Sep 2024 11:06:51 +0000 (+0000)
Subject: Merge #882 into sdk602patch0626 from refs/changes/882/head
X-Git-Tag: release_V1.2.70_20241020_135402~518^2~18^2^2
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=88658def7a91c42ab6900554a945e587add85338;p=mirrors%2FFD230.git

Merge #882 into sdk602patch0626 from refs/changes/882/head

Code review from 罗正

* refs/changes/882/head: (2 commits squashed)

  - 关闭a2dp连接的时候强制改变音乐播放器的音源，音乐来源只能通过用户设置才能切换

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>

CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/882
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp
index 1154f2cbc..077cc4152 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-02-18 09:09:13
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-09-03 11:31:33
+ * @LastEditTime: 2024-09-05 18:32:45
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp
  */
 #include "settings/include/SettingModel.h"
@@ -105,7 +105,6 @@ namespace OHOS
         {
             BluetoothServiceOptionsView::GetInstance()->Button_UPdata();
         }
-        PlayersModel::GetInstance()->SetMusicSource(btConnectStatus);
         if (PlayersView::GetInstance())
         {
             PlayersView::GetInstance()->UpdatePlayerView();