From 3b4e6f85e4b5ddb4a237fd6598d893bd55c068d5 Mon Sep 17 00:00:00 2001 From: GKF Date: Wed, 19 Jun 2019 10:25:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/legado/app/base/BaseActivity.kt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/io/legado/app/base/BaseActivity.kt b/app/src/main/java/io/legado/app/base/BaseActivity.kt index 3f45f019b..aa4f49d99 100644 --- a/app/src/main/java/io/legado/app/base/BaseActivity.kt +++ b/app/src/main/java/io/legado/app/base/BaseActivity.kt @@ -16,14 +16,11 @@ import io.legado.app.utils.getCompatColor import io.legado.app.utils.getPrefBoolean import io.legado.app.utils.setIconColor import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlin.coroutines.CoroutineContext +import kotlinx.coroutines.MainScope +import kotlinx.coroutines.cancel -abstract class BaseActivity : AppCompatActivity(), CoroutineScope { - - override val coroutineContext: CoroutineContext - get() = Dispatchers.IO +abstract class BaseActivity : AppCompatActivity(), CoroutineScope by MainScope() { protected abstract val viewModel: VM @@ -39,6 +36,11 @@ abstract class BaseActivity : AppCompatActivity(), CoroutineScop observeLiveBus() } + override fun onDestroy() { + super.onDestroy() + cancel() + } + abstract fun onViewModelCreated(viewModel: VM, savedInstanceState: Bundle?) final override fun onCreateOptionsMenu(menu: Menu?): Boolean {