From 8b1785a60a3bb3057748f01da10eedb0ea10f6c0 Mon Sep 17 00:00:00 2001 From: kunfei Date: Sat, 30 Nov 2019 11:19:29 +0800 Subject: [PATCH] up --- .../java/io/legado/app/service/BaseReadAloudService.kt | 1 + .../java/io/legado/app/ui/book/read/ReadBookViewModel.kt | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/app/src/main/java/io/legado/app/service/BaseReadAloudService.kt b/app/src/main/java/io/legado/app/service/BaseReadAloudService.kt index a7fdf2e2d..314d9d2d5 100644 --- a/app/src/main/java/io/legado/app/service/BaseReadAloudService.kt +++ b/app/src/main/java/io/legado/app/service/BaseReadAloudService.kt @@ -67,6 +67,7 @@ abstract class BaseReadAloudService : BaseService(), override fun onDestroy() { super.onDestroy() isRun = false + pause = true unregisterReceiver(broadcastReceiver) postEvent(Bus.ALOUD_STATE, Status.STOP) upMediaSessionPlaybackState(PlaybackStateCompat.STATE_STOPPED) diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt index 823c74b82..9fb18014c 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt @@ -10,6 +10,8 @@ import io.legado.app.data.entities.BookChapter import io.legado.app.help.BookHelp import io.legado.app.help.IntentDataHelp import io.legado.app.model.WebBook +import io.legado.app.service.BaseReadAloudService +import io.legado.app.service.help.ReadAloud import io.legado.app.service.help.ReadBook import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Dispatchers.Main @@ -191,6 +193,13 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) { } } + override fun onCleared() { + super.onCleared() + if (BaseReadAloudService.pause) { + ReadAloud.stop(context) + } + } + interface CallBack { fun loadContent() fun contentLoadFinish(bookChapter: BookChapter, content: String)