修改朗读定时计时方法,handler.removeCallbacks有时候会失效

pull/1275/head
gedoor 3 years ago
parent 4a67405303
commit 84fa663f7b
  1. 36
      app/src/main/java/io/legado/app/service/BaseReadAloudService.kt

@ -29,6 +29,10 @@ import io.legado.app.ui.book.read.page.entities.TextChapter
import io.legado.app.utils.getPrefBoolean import io.legado.app.utils.getPrefBoolean
import io.legado.app.utils.postEvent import io.legado.app.utils.postEvent
import io.legado.app.utils.toastOnUi import io.legado.app.utils.toastOnUi
import kotlinx.coroutines.Job
import kotlinx.coroutines.delay
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch
import splitties.init.appCtx import splitties.init.appCtx
abstract class BaseReadAloudService : BaseService(), abstract class BaseReadAloudService : BaseService(),
@ -56,7 +60,7 @@ abstract class BaseReadAloudService : BaseService(),
internal var readAloudNumber: Int = 0 internal var readAloudNumber: Int = 0
internal var textChapter: TextChapter? = null internal var textChapter: TextChapter? = null
internal var pageIndex = 0 internal var pageIndex = 0
private val dsRunnable: Runnable = Runnable { doDs() } private var dsJob: Job? = null
override fun onCreate() { override fun onCreate() {
super.onCreate() super.onCreate()
@ -69,7 +73,7 @@ abstract class BaseReadAloudService : BaseService(),
initBroadcastReceiver() initBroadcastReceiver()
upNotification() upNotification()
upMediaSessionPlaybackState(PlaybackStateCompat.STATE_PLAYING) upMediaSessionPlaybackState(PlaybackStateCompat.STATE_PLAYING)
startDs() doDs()
} }
override fun onDestroy() { override fun onDestroy() {
@ -149,7 +153,7 @@ abstract class BaseReadAloudService : BaseService(),
upMediaSessionPlaybackState(PlaybackStateCompat.STATE_PAUSED) upMediaSessionPlaybackState(PlaybackStateCompat.STATE_PAUSED)
postEvent(EventBus.ALOUD_STATE, Status.PAUSE) postEvent(EventBus.ALOUD_STATE, Status.PAUSE)
ReadBook.uploadProgress() ReadBook.uploadProgress()
startDs() doDs()
} }
@CallSuper @CallSuper
@ -184,7 +188,7 @@ abstract class BaseReadAloudService : BaseService(),
private fun setTimer(minute: Int) { private fun setTimer(minute: Int) {
timeMinute = minute timeMinute = minute
startDs() doDs()
} }
private fun addTimer() { private fun addTimer() {
@ -194,32 +198,34 @@ abstract class BaseReadAloudService : BaseService(),
timeMinute += 10 timeMinute += 10
if (timeMinute > 180) timeMinute = 180 if (timeMinute > 180) timeMinute = 180
} }
startDs() doDs()
}
private fun startDs() {
postEvent(EventBus.TTS_DS, timeMinute)
upNotification()
handler.removeCallbacks(dsRunnable)
handler.postDelayed(dsRunnable, 60000)
} }
/** /**
* 定时 * 定时
*/ */
@Synchronized
private fun doDs() { private fun doDs() {
handler.removeCallbacks(dsRunnable) postEvent(EventBus.TTS_DS, timeMinute)
upNotification()
dsJob?.cancel()
dsJob = launch {
while (isActive) {
delay(60000)
if (isActive) {
if (!pause) { if (!pause) {
if (timeMinute >= 0) { if (timeMinute >= 0) {
timeMinute-- timeMinute--
} }
if (timeMinute == 0) { if (timeMinute == 0) {
ReadAloud.stop(this) ReadAloud.stop(this@BaseReadAloudService)
} }
} }
postEvent(EventBus.TTS_DS, timeMinute) postEvent(EventBus.TTS_DS, timeMinute)
upNotification() upNotification()
handler.postDelayed(dsRunnable, 60000) }
}
}
} }
/** /**

Loading…
Cancel
Save