add support for disable volume ease effect

jrfeng · Jul 30, 2023 · dba1676 · dba1676
1 parent 6e18399
commit dba1676
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 0 deletions.
diff --git a/player/src/main/java/snow/player/audio/AbstractMusicPlayer.java b/player/src/main/java/snow/player/audio/AbstractMusicPlayer.java
@@ -80,4 +80,12 @@ public void dismissQuiet() {
     public void setVolume(float volume) {
         mVolumeEaseHelper.setPlayerVolume(volume);
     }
+
+    public void setVolumeEaseEnabled(boolean enabled) {
+        mVolumeEaseHelper.setEnabled(enabled);
+    }
+
+    public boolean isVolumeEaseEnabled() {
+        return mVolumeEaseHelper.isEnabled();
+    }
 }
diff --git a/player/src/main/java/snow/player/helper/VolumeEaseHelper.java b/player/src/main/java/snow/player/helper/VolumeEaseHelper.java
@@ -108,6 +108,7 @@ public class VolumeEaseHelper {
 
     private boolean mQuiet;
     private float mPlayerVolume = 1.0F;
+    private boolean mEnabled = true;
 
     /**
      * 创建一个 {@link VolumeEaseHelper} 对象。
@@ -126,6 +127,12 @@ public VolumeEaseHelper(@NonNull MusicPlayer musicPlayer, @NonNull Callback call
     public void start() {
         cancel();
 
+        if (!mEnabled) {
+            restoreVolume();
+            mCallback.start();
+            return;
+        }
+
         final int count = 20;
         final float step = mPlayerVolume / count;
 
@@ -137,9 +144,23 @@ public void start() {
                 .subscribe(aLong -> setVolume(aLong * step));
     }
 
+    private void restoreVolume() {
+        int volume = Math.round(mMusicPlayer.getVolume() * 10);
+        int playerVolume = Math.round(mPlayerVolume * 10);
+
+        if (volume != playerVolume) {
+            mMusicPlayer.setVolume(mPlayerVolume);
+        }
+    }
+
     public void pause() {
         cancel();
 
+        if (!mEnabled) {
+            mCallback.pause();
+            return;
+        }
+
         if (mQuiet) {
             mCallback.pause();
             return;
@@ -210,6 +231,14 @@ public void setPlayerVolume(float volume) {
         mPlayerVolume = volume;
     }
 
+    public void setEnabled(boolean enabled) {
+        mEnabled = enabled;
+    }
+
+    public boolean isEnabled() {
+        return mEnabled;
+    }
+
     /**
      * 回调接口，请在该接口中实现真正的 start 与 pause 逻辑。
      */