Merge pull request #541 from lovegaoshi/dev

fix: last played duration
lovegaoshi · Aug 29, 2024 · c036ab5 · c036ab5
2 parents a111a1f + 64cd5ac
commit c036ab5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/hooks/useSetupPlayer.ts b/src/hooks/useSetupPlayer.ts
@@ -45,6 +45,7 @@ export default ({ intentData }: NoxComponent.AppProps) => {
         noInterruption: storedPlayerSetting.noInterruption,
         keepForeground: storedPlayerSetting.keepForeground,
         lastPlayDuration,
+        currentPlayingID,
       };
       await SetupService(serviceOptions);
       initializePlaybackMode(playbackMode);

diff --git a/src/services/PlaybackService.ts b/src/services/PlaybackService.ts
@@ -30,6 +30,7 @@ const lastPlayedDuration: { val?: number } = { val: 0 };
 export async function AdditionalPlaybackService({
   noInterruption = false,
   lastPlayDuration,
+  currentPlayingID,
 }: Partial<NoxStorage.PlayerSettingDict>) {
   TrackPlayer.addEventListener(Event.RemoteDuck, async event => {
     console.log('Event.RemoteDuck', event);
@@ -39,12 +40,14 @@ export async function AdditionalPlaybackService({
   });
 
   lastPlayedDuration.val = lastPlayDuration;
-  TrackPlayer.addEventListener(Event.PlaybackState, event => {
+  TrackPlayer.addEventListener(Event.PlaybackState, async event => {
     if (lastPlayedDuration.val && event.state === State.Ready) {
-      logger.debug(
-        `[Playback] initalized last played duration to ${lastPlayDuration}`
-      );
-      TrackPlayer.seekTo(lastPlayedDuration.val);
+      if ((await TrackPlayer.getActiveTrack())?.song?.id === currentPlayingID) {
+        logger.debug(
+          `[Playback] initalized last played duration to ${lastPlayDuration}`
+        );
+        TrackPlayer.seekTo(lastPlayedDuration.val);
+      }
       lastPlayedDuration.val = undefined;
     }
   });