Added empty state, fixed bugs

Coneys · Apr 30, 2018 · cda61f1 · cda61f1
1 parent 0543bb0
commit cda61f1
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 10 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Mon Apr 30 12:56:36 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/rxaudiomanager/src/main/java/github/com/coneey/rxaudiomanager/mediaListener/MediaState.kt b/rxaudiomanager/src/main/java/github/com/coneey/rxaudiomanager/mediaListener/MediaState.kt
@@ -1,5 +1,5 @@
 package git.luolix.top.coneey.rxaudiomanager.mediaListener
 
 enum class MediaState {
-    PREPARING, RUNNING, STOPPED, PAUSED, ERROR, COMPLETED
+    EMPTY, PREPARING, RUNNING, STOPPED, PAUSED, ERROR, COMPLETED
 }
diff --git a/...anager/src/main/java/github/com/coneey/rxaudiomanager/mediaListener/MediaStateResolver.kt b/...anager/src/main/java/github/com/coneey/rxaudiomanager/mediaListener/MediaStateResolver.kt
@@ -33,7 +33,7 @@ class MediaStateResolver(private val player: MediaPlayer) : MediaPlayer.OnPrepar
 
     private val infoFunction4 = Function4 { t1: MediaState, t2: Percent, t3: Second, t4: Second -> MediaInfo(t1, t2, t3, t3 / 1000, t4) }
     val infoSubject: Observable<MediaInfo> = Observable.combineLatest(
-            stateSubject.startWith(MediaState.PREPARING), bufferSubject.startWith(0),
+            stateSubject.startWith(MediaState.EMPTY), bufferSubject.startWith(0),
             positionSubject.startWith(0), durationSubject.startWith(0), infoFunction4)
 
     fun initialize(): Observable<MediaInfo> {
@@ -56,6 +56,7 @@ class MediaStateResolver(private val player: MediaPlayer) : MediaPlayer.OnPrepar
 
 
     override fun onPrepared(mp: MediaPlayer) {
+        preapred = true
         onPreparedRunnables.forEach { it.invoke(mp) }
         onPreparedRunnables.clear()
     }
@@ -141,6 +142,7 @@ class MediaStateResolver(private val player: MediaPlayer) : MediaPlayer.OnPrepar
             stateSubject.onNext(MediaState.STOPPED)
         }
     }
+
     fun start() {
         if (!player.isPlaying) {
             postWhenPrepared {
@@ -159,7 +161,9 @@ class MediaStateResolver(private val player: MediaPlayer) : MediaPlayer.OnPrepar
         stateSubject.onNext(preparing)
     }
 
-
-
+    fun reset() {
+        player.reset()
+        preapred = false
+    }
 
 }
diff --git a/...nager/src/main/java/github/com/coneey/rxaudiomanager/serviceMediaManager/PlayerService.kt b/...nager/src/main/java/github/com/coneey/rxaudiomanager/serviceMediaManager/PlayerService.kt
@@ -35,7 +35,7 @@ class PlayerService : LifecycleService() {
                     is ServiceCommand.Pause -> mediaManager.pause()
                     is ServiceCommand.Resume -> mediaManager.resume()
                     is ServiceCommand.SeekTo -> mediaManager.seekTo(it.millisecond)
-                    is ServiceCommand.Restart -> mediaManager.restart()
+                    is ServiceCommand.Restart -> mediaManager.reset()
                     is ServiceCommand.Start -> mediaManager.start()
 
                 }

diff --git a/.../src/main/java/github/com/coneey/rxaudiomanager/simpleMediaManager/InternalMediaPlayer.kt b/.../src/main/java/github/com/coneey/rxaudiomanager/simpleMediaManager/InternalMediaPlayer.kt
@@ -105,7 +105,8 @@ open class InternalMediaPlayer(val player: MediaPlayer, val context: Context,
         mediaDisposable?.dispose()
     }
 
-    override fun restart() {
+    override fun reset() {
+        resolver.reset()
         val audioAttr = currentAudioAttributes
         val datasource = currentDataSource
         if (datasource != null && audioAttr != null) {

diff --git a/...manager/src/main/java/github/com/coneey/rxaudiomanager/simpleMediaManager/MediaManager.kt b/...manager/src/main/java/github/com/coneey/rxaudiomanager/simpleMediaManager/MediaManager.kt
@@ -17,7 +17,7 @@ interface MediaManager {
     fun start()
     fun resume()
     fun stop()
-    fun restart()
+    fun reset()
     fun getMediaInfoObservable(): Observable<MediaInfo>
 
 }
diff --git a/...in/java/github/com/coneey/rxaudiomanager/simpleMediaManager/MediaServiceCommandEmitter.kt b/...in/java/github/com/coneey/rxaudiomanager/simpleMediaManager/MediaServiceCommandEmitter.kt
@@ -8,7 +8,7 @@ import io.reactivex.Observable
 import io.reactivex.subjects.BehaviorSubject
 import io.reactivex.subjects.Subject
 
-object MediaServiceCommandEmitter : MediaManager {
+internal object MediaServiceCommandEmitter : MediaManager {
 
     val mediaInfoSubject: Subject<MediaInfo> = BehaviorSubject.create()
     val commandSubject: Subject<ServiceCommand> = BehaviorSubject.create()
@@ -53,7 +53,7 @@ object MediaServiceCommandEmitter : MediaManager {
         commandSubject.onNext(ServiceCommand.Stop)
     }
 
-    override fun restart() {
+    override fun reset() {
         commandSubject.onNext(ServiceCommand.Restart)
     }