add warning feedback: no song

Author: jonashao

app/src/main/java/com/junnanhao/next/common/App.kt

@@ -1,7 +1,6 @@
 package com.junnanhao.next.common
 
 import android.app.Application
-import com.junnanhao.next.BuildConfig
 import com.junnanhao.next.data.DaggerSongsRepositoryComponent
 import com.junnanhao.next.data.SongsRepositoryComponent
 import com.junnanhao.next.common.di.ApplicationModule

app/src/main/java/com/junnanhao/next/player/Player.kt

@@ -35,6 +35,10 @@ class Player private constructor() : IPlayer {
                     playbackCallback?.onPrepared(currentSong)
                     player.start()
                 }
+                player.setOnErrorListener { mp, what, extra ->
+                    playbackCallback?.onComplete()
+                    false
+                }
                 player.prepareAsync()
                 player.setOnCompletionListener({ playbackCallback?.onComplete() })
                 // todo: notify playing status changed

app/src/main/java/com/junnanhao/next/ui/player/PlayerContract.kt

@@ -11,7 +11,7 @@ import com.junnanhao.next.data.model.Song
 @Suppress("UNUSED")
 interface PlayerContract {
     interface View : BaseView<Presenter> {
-        fun showError()
+        fun showError(error:String)
         fun showSongInfo(song: Song?)
         fun showPermissionNotGranted()
         fun showLoading()

app/src/main/java/com/junnanhao/next/ui/player/PlayerFragment.kt

@@ -43,6 +43,7 @@ class PlayerFragment : Fragment(), PlayerContract.View {
         fun instance(): PlayerFragment {
             return PlayerFragment()
         }
+
         private val SWIPE_MIN_DISTANCE = 120
         private val SWIPE_MAX_OFF_PATH = 250
         private val SWIPE_THRESHOLD_VELOCITY = 200
@@ -115,8 +116,9 @@ class PlayerFragment : Fragment(), PlayerContract.View {
         return mDetector.onTouchEvent(m)
     }
 
-    override fun showError() {
-        Toast.makeText(context, "Error", Toast.LENGTH_SHORT).show()
+    override fun showError(error: String) {
+        title.text = error
+        Toast.makeText(context, error, Toast.LENGTH_SHORT).show()
     }
 
     private var DarkVibrantColor: Int = 0

app/src/main/java/com/junnanhao/next/ui/player/PlayerPresenter.kt

@@ -6,6 +6,7 @@ import com.junnanhao.next.player.PlaybackCallback
 import com.junnanhao.next.player.Player
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.realm.Realm
+import timber.log.Timber
 import java.util.*
 import javax.inject.Inject
 
@@ -21,9 +22,11 @@ class PlayerPresenter @Inject constructor(
 
     val player: Player = Player.instance
     val realm: Realm = Realm.getDefaultInstance()
+    var scanned: Boolean = false
 
     init {
         player.playbackCallback = object : PlaybackCallback {
+
             override fun onPrepared(song: Song?) {
                 mView.showSongInfo(song)
             }
@@ -37,7 +40,10 @@ class PlayerPresenter @Inject constructor(
     override fun scan() {
         mSongsRepository.scanMusic()
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ next() })
+                .subscribe({ next() },
+                        { throwable: Throwable? -> Timber.wtf(throwable) },
+                        { scanned = true })
+
     }
 
     @Inject
@@ -65,8 +71,10 @@ class PlayerPresenter @Inject constructor(
             val random = Random()
             val song = list.get(random.nextInt(list.size))
             player.play(song)
-        } else {
+        } else if (!scanned) {
             scan()
+        } else {
+            mView.showError("没有歌曲")
         }
     }
 

build.gradle

@@ -8,7 +8,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha2'
+        classpath 'com.android.tools.build:gradle:3.0.0-alpha3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "io.realm:realm-gradle-plugin:$realm_version"
         // NOTE: Do not place your application dependencies here; they belong