From 88658def7a91c42ab6900554a945e587add85338 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E7=BD=97=E6=AD=A3?= <1732036298@qq.com> Date: Thu, 5 Sep 2024 11:06:51 +0000 Subject: [PATCH] Merge #882 into sdk602patch0626 from refs/changes/882/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 罗正 * refs/changes/882/head: (2 commits squashed) - 关闭a2dp连接的时候强制改变音乐播放器的音源，音乐来源只能通过用户设置才能切换 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 Signed-off-by: 罗正 <1732036298@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/882 --- .../wearable/fd230app/nativeui/settings/src/SettingModel.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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(); -- 2.17.1