修复开启淡入淡出后切歌没有声音的问题

Author: rRemix

app/src/main/java/remix/myplayer/service/MusicService.kt

@@ -791,19 +791,15 @@ class MusicService : BaseService(),
    */
   private fun skipToNext() {
     playback.skipToNext()
-    if (!playback.isPlaying) {
-      playback.start()
-    }
+    start(true)
   }
 
   /**
    * 播放上一首
    */
   private fun skipToPrevious() {
     playback.skipToPrevious()
-    if (!playback.isPlaying) {
-      playback.start()
-    }
+    start(true)
   }
 
   /**
@@ -904,9 +900,7 @@ class MusicService : BaseService(),
     }
 
     playback.skipTo(position)
-    if (!playback.isPlaying) {
-      playback.start()
-    }
+    start(true)
   }
 
   override fun onMediaStoreChanged() {

app/src/main/java/remix/myplayer/service/VolumeController.kt

@@ -1,6 +1,7 @@
 package remix.myplayer.service
 
 import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
 import android.animation.ValueAnimator
 import android.os.Handler
 import android.os.Looper
@@ -58,14 +59,22 @@ class VolumeController(private val service: MusicService) {
           service.playback.setVolume(volume)
           lastVolume = volume
         }
-        if (onEnd != null) {
-          addListener(object : Animator.AnimatorListener {
-            override fun onAnimationStart(animation: Animator) = Unit
-            override fun onAnimationEnd(animation: Animator) = onEnd()
-            override fun onAnimationCancel(animation: Animator) = Unit
-            override fun onAnimationRepeat(animation: Animator) = Unit
-          })
-        }
+        addListener(object : AnimatorListenerAdapter() {
+          private var canceled = false
+
+          override fun onAnimationCancel(animation: Animator) {
+            canceled = true
+          }
+
+          override fun onAnimationEnd(animation: Animator) {
+            if (animator === animation) {
+              animator = null
+            }
+            if (!canceled) {
+              onEnd?.invoke()
+            }
+          }
+        })
       }
       animator?.start()
     }
@@ -80,4 +89,4 @@ class VolumeController(private val service: MusicService) {
 
     private const val DURATION_IN_MS = 400L
   }
-}
+}