From 7e2c8583262c24d0781a743fcdd20542e1f7e717 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E7=BD=97=E6=AD=A3?= <1732036298@qq.com> Date: Sat, 18 Jan 2025 09:32:04 +0000 Subject: [PATCH] Merge #1638 into sdk602patch0911 from refs/changes/1638/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 罗正 * refs/changes/1638/head: (2 commits squashed) - 解决音乐播放器播放模式为顺序播放时，在播放完所有歌曲后，这时点击播放按钮需要点击两次bug - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 Signed-off-by: 罗正 <1732036298@qq.com> Reviewed-by: Caisking <3449750381@qq.com> Reviewed-by: 罗正 <1732036298@qq.com> Reviewed-by: aliyun8003852482 <1224667075@qq.com> Reviewed-by: snickersun@163.com Reviewed-by: aliyun6865282430 <1624952103@qq.com> Merged-by: Caisking <3449750381@qq.com> CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1638 --- .../wearable/fd230app/nativeui/player/src/PlayersModel.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp index b48d4ded1..705c51694 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp @@ -387,7 +387,10 @@ void PlayersModel::SequencePlayout() SetPlayButtonState(false); } SetCircleProgress(100); // 100:进度100% - index = playersCaseList.Size() - 1; + // index = playersCaseList.Size() - 1; + index = 0;// 所有歌曲播放完，重置索引从头开始播放 + AudioManager::GetInstance().DeactivateAudioInterrupt(interrupt); + ClearActivateAudioInterrupt(); } NextSong(index); } -- 2.17.1