解决：手表音乐，播放中，点击音量再退出和点击音乐模式按钮，播放中的音乐会被暂停，播放进度会重新开始bug #590

diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp
index 7db9e4e..f713060 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp
@@ -855,13 +855,16 @@ namespace OHOS
             soundButton->SetTouchable(touchableState);\r
             playerModelButton->SetTouchable(touchableState); // 如果音乐来源为手机音乐,播放顺序按钮就不可用\r
             /* -------------------------------------------------------------------------- */\r
-            /*暂停音乐*/\r
-            uint8_t state = GetPlayerButtonState();\r
-            int32_t playerState; /*获取Player的状态*/\r
-            if (state == UICheckBox::UICheckBoxState::SELECTED)\r
+            if (musicSourceType) //如果切換到手机音乐，且当前在放歌，就停止音乐\r
             {\r
-                PlayersModel::GetInstance()->PlayerStop();\r
-                PlayersModel::GetInstance()->ClearActivateAudioInterrupt();\r
+                /*暂停音乐*/\r
+                uint8_t state = GetPlayerButtonState();\r
+                int32_t playerState; /*获取Player的状态*/\r
+                if (state == UICheckBox::UICheckBoxState::SELECTED)\r
+                {\r
+                    PlayersModel::GetInstance()->PlayerStop();\r
+                    PlayersModel::GetInstance()->ClearActivateAudioInterrupt();\r
+                }\r
             }\r
             /* -------------------------------------------------------------------------- */\r
             PreLoadPlayerModeImageRes();\r
@@ -967,7 +970,7 @@ namespace OHOS
                 MusicSourceLabelSetText(STR_MOBILE_MUSIC);             // 手机音乐\r
                 PhoneMusicConnectStatusLabelColor(false);\r
             }\r
-            SetMusicPlayerButtonIsTouchable(musicSourceType);\r
+            SetMusicPlayerButtonIsTouchable(true);\r
         }\r
         else\r
         {\r
@@ -982,7 +985,7 @@ namespace OHOS
             MusicListButtonIsSetVisible(true);\r
 \r
             MusicSourceLabelSetText(STR_WATCH_MUSIC); /*手表音乐*/\r
-            SetMusicPlayerButtonIsTouchable(musicSourceType);\r
+            SetMusicPlayerButtonIsTouchable(false);\r
         }\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UpdatePlayerView over!!");\r
     }\r