From: 罗正 <1732036298@qq.com>
Date: Sat, 18 Jan 2025 09:32:04 +0000 (+0000)
Subject: Merge #1638 into sdk602patch0911 from refs/changes/1638/head
X-Git-Tag: v1.3.113-repair_tp~18^2~3^2~1
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=7e2c8583262c24d0781a743fcdd20542e1f7e717;p=mirrors%2FFD230.git

Merge #1638 into sdk602patch0911 from refs/changes/1638/head

Code review from 罗正

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

  - 解决音乐播放器播放模式为顺序播放时，在播放完所有歌曲后，这时点击播放按钮需要点击两次bug

  - Merge branch &#39;sdk602patch0911&#39; 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 <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>

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

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);
 }