From a9a5a4c2e08bb5a5127110d96047560fe2d64d74 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Fri, 17 Dec 2021 16:50:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9A=84=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md           | 4 ++++
 src/plugins/player/playList.js | 7 ++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index c86f41a..bdb5f74 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -1,3 +1,7 @@
+### 优化
+
+- 修改对播放模块的调用，杜绝应用显示正在播放的歌曲与实际播放歌曲不一致的问题（这是播放模块歌曲队列与应用内歌曲队列在某些情况下出现不一致时导致的）
+
 ### 修复
 
 - 修复kw源某些歌曲的歌词提取异常的问题
diff --git a/src/plugins/player/playList.js b/src/plugins/player/playList.js
index 5388cae..3894522 100644
--- a/src/plugins/player/playList.js
+++ b/src/plugins/player/playList.js
@@ -85,7 +85,8 @@ export const playMusic = async(tracks, time) => {
   // await updateMusicInfo(track)
   const currentTrackIndex = await TrackPlayer.getCurrentTrack()
   await TrackPlayer.add(tracks).then(() => list.push(...tracks))
-  await TrackPlayer.skip(list.indexOf(track))
+  const queue = await TrackPlayer.getQueue()
+  await TrackPlayer.skip(queue.findIndex(t => t.id == track.id))
 
   if (currentTrackIndex == null) {
     if (!isTempTrack(track.id)) {
@@ -105,8 +106,8 @@ export const playMusic = async(tracks, time) => {
     }
   }
 
-  if (list.length > 2) {
-    TrackPlayer.remove(Array(list.length - 2).fill(null).map((_, i) => i)).then(() => list.splice(0, list.length - 2))
+  if (queue.length > 2) {
+    TrackPlayer.remove(Array(queue.length - 2).fill(null).map((_, i) => i)).then(() => list.splice(0, list.length - 2))
   }
 }