From 189ed326dc58d6511a7fa5a137bafe1f37e0ede7 Mon Sep 17 00:00:00 2001 From: Administrator <1760316362@qq.com> Date: Tue, 6 Aug 2019 14:46:13 +0800 Subject: [PATCH 1/2] update --- .../app/help/coroutine/CompositeCoroutine.kt | 11 +++-- .../io/legado/app/help/coroutine/Coroutine.kt | 44 +++++++++---------- .../app/help/coroutine/CoroutineContainer.kt | 2 +- .../io/legado/app/ui/search/SearchActivity.kt | 4 +- .../legado/app/ui/search/SearchViewModel.kt | 28 +++++++++--- app/src/main/res/layout/activity_search.xml | 1 + 6 files changed, 52 insertions(+), 38 deletions(-) diff --git a/app/src/main/java/io/legado/app/help/coroutine/CompositeCoroutine.kt b/app/src/main/java/io/legado/app/help/coroutine/CompositeCoroutine.kt index 99c2df223..c832b475d 100644 --- a/app/src/main/java/io/legado/app/help/coroutine/CompositeCoroutine.kt +++ b/app/src/main/java/io/legado/app/help/coroutine/CompositeCoroutine.kt @@ -1,5 +1,7 @@ package io.legado.app.help.coroutine +import android.util.Log + class CompositeCoroutine : CoroutineContainer { private var resources: HashSet>? = null @@ -76,10 +78,11 @@ class CompositeCoroutine : CoroutineContainer { resources = null } - set?.forEach { - runCatching { - it.cancel() - } + Log.e("TAG", "size: ${set?.size}") + + set?.forEachIndexed { index, coroutine -> + Log.e("TAG", "index: $index") + coroutine.cancel() } } } \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/help/coroutine/Coroutine.kt b/app/src/main/java/io/legado/app/help/coroutine/Coroutine.kt index 087107d4a..f74d880b3 100644 --- a/app/src/main/java/io/legado/app/help/coroutine/Coroutine.kt +++ b/app/src/main/java/io/legado/app/help/coroutine/Coroutine.kt @@ -44,8 +44,8 @@ class Coroutine() { scope: CoroutineScope, block: suspend CoroutineScope.() -> T ) : this() { - this.job = scope.launch { - executeInternal(block) + this.job = scope.plus(Dispatchers.Main).launch { + executeInternal(this@launch, block) } } @@ -119,55 +119,51 @@ class Coroutine() { //取消当前任务 fun cancel(cause: CancellationException? = null) { + job?.cancelChildren(cause) job?.cancel(cause) } - private suspend fun executeInternal(block: suspend CoroutineScope.() -> T) { + private suspend fun executeInternal(scope: CoroutineScope, block: suspend CoroutineScope.() -> T) { tryCatch( { - start?.invoke(this) - + start?.invoke(scope) val result = executeBlockIO(block, timeMillis ?: 0L) - - success?.invoke(this, result) + success?.invoke(scope, result) }, { e -> val consume: Boolean = errorReturn?.value?.let { value -> - success?.invoke(this, value) + success?.invoke(scope, value) true } ?: false - if (!consume) { - error?.invoke(this, e) + error?.invoke(scope, e) } }, { - finally?.invoke(this) + finally?.invoke(scope) }) } private suspend fun executeBlockIO(block: suspend CoroutineScope.() -> T, timeMillis: Long): T? { - val result: T = withContext(Dispatchers.IO) { - val b = block() - - execute?.invoke(this, b) - - b + val execution = withContext(Dispatchers.IO) { + val result = block() + execute?.invoke(this, result) + result } - return if (timeMillis > 0L) withTimeout(timeMillis) { result } else result + return if (timeMillis > 0L) withTimeout(timeMillis) { execution } else execution } private suspend fun tryCatch( - tryBlock: suspend CoroutineScope.() -> Unit, - errorBlock: (suspend CoroutineScope.(Throwable) -> Unit)? = null, - finallyBlock: (suspend CoroutineScope.() -> Unit)? = null + tryBlock: suspend () -> Unit, + errorBlock: (suspend (Throwable) -> Unit)? = null, + finallyBlock: (suspend () -> Unit)? = null ) { try { - coroutineScope { tryBlock() } + tryBlock() } catch (e: Throwable) { - coroutineScope { errorBlock?.invoke(this, e) } + errorBlock?.invoke(e) } finally { - coroutineScope { finallyBlock?.invoke(this) } + finallyBlock?.invoke() } } diff --git a/app/src/main/java/io/legado/app/help/coroutine/CoroutineContainer.kt b/app/src/main/java/io/legado/app/help/coroutine/CoroutineContainer.kt index d98a2b8da..8ef02af1f 100644 --- a/app/src/main/java/io/legado/app/help/coroutine/CoroutineContainer.kt +++ b/app/src/main/java/io/legado/app/help/coroutine/CoroutineContainer.kt @@ -1,6 +1,6 @@ package io.legado.app.help.coroutine -interface CoroutineContainer { +internal interface CoroutineContainer { fun add(coroutine: Coroutine<*>): Boolean diff --git a/app/src/main/java/io/legado/app/ui/search/SearchActivity.kt b/app/src/main/java/io/legado/app/ui/search/SearchActivity.kt index 25a47169b..52222d541 100644 --- a/app/src/main/java/io/legado/app/ui/search/SearchActivity.kt +++ b/app/src/main/java/io/legado/app/ui/search/SearchActivity.kt @@ -11,6 +11,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import io.legado.app.App import io.legado.app.R import io.legado.app.base.VMBaseActivity +import io.legado.app.data.entities.SearchBook import io.legado.app.data.entities.SearchShow import io.legado.app.lib.theme.ATH import io.legado.app.utils.getViewModel @@ -44,14 +45,13 @@ class SearchActivity : VMBaseActivity(R.layout.activity_search) viewModel.search(it, { startTime -> content_view.showContentView() initData(startTime) - }, { - }) } return true } override fun onQueryTextChange(newText: String?): Boolean { + if(newText.isNullOrBlank()) viewModel.stop() return false } diff --git a/app/src/main/java/io/legado/app/ui/search/SearchViewModel.kt b/app/src/main/java/io/legado/app/ui/search/SearchViewModel.kt index ca48a9312..12f331fc4 100644 --- a/app/src/main/java/io/legado/app/ui/search/SearchViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/search/SearchViewModel.kt @@ -3,7 +3,6 @@ package io.legado.app.ui.search import android.app.Application import io.legado.app.App import io.legado.app.base.BaseViewModel -import io.legado.app.help.coroutine.CompositeCoroutine import io.legado.app.help.coroutine.Coroutine import io.legado.app.model.WebBook @@ -12,18 +11,24 @@ class SearchViewModel(application: Application) : BaseViewModel(application) { var searchPage = 0 - fun search(key: String, start: ((startTime: Long) -> Unit)? = null, finally: (() -> Unit)? = null) { + fun search( + key: String, + start: ((startTime: Long) -> Unit)? = null, + finally: (() -> Unit)? = null + ) { if (key.isEmpty()) return task?.cancel() start?.invoke(System.currentTimeMillis()) - task = execute {//onCleared时自动取消 + task = execute { + //onCleared时自动取消 val bookSourceList = App.db.bookSourceDao().allEnabled for (item in bookSourceList) { //task取消时自动取消 by （scope = this@execute） - WebBook(item).searchBook(key, searchPage, scope = this) - .onExecute { searchBookS -> - searchBookS?.let { - App.db.searchBookDao().insert(*it.toTypedArray()) + WebBook(item).searchBook(key, searchPage, scope = this@execute) + .timeout { 30000L } + .onExecute { + it?.let { list -> + App.db.searchBookDao().insert(*list.toTypedArray()) } } } @@ -32,4 +37,13 @@ class SearchViewModel(application: Application) : BaseViewModel(application) { it.printStackTrace() } } + + fun stop() { + task?.cancel() + } + + override fun onCleared() { + super.onCleared() + task?.cancel() + } } diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index 3837883c7..e330e1565 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -11,6 +11,7 @@ android:id="@+id/title_bar" android:layout_width="match_parent" android:layout_height="wrap_content" + app:contentInsetStartWithNavigation="0dp" app:layout_constraintTop_toTopOf="parent" app:title="搜索"/> From a4d60b4abe50da635266a77ab2522742ac0e1847 Mon Sep 17 00:00:00 2001 From: Administrator <1760316362@qq.com> Date: Tue, 6 Aug 2019 16:06:39 +0800 Subject: [PATCH 2/2] update --- .../main/java/io/legado/app/help/coroutine/Coroutine.kt | 3 +-- app/src/main/res/layout/activity_read.xml | 8 +------- app/src/main/res/layout/page_view.xml | 1 + 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/io/legado/app/help/coroutine/Coroutine.kt b/app/src/main/java/io/legado/app/help/coroutine/Coroutine.kt index f74d880b3..9013fc266 100644 --- a/app/src/main/java/io/legado/app/help/coroutine/Coroutine.kt +++ b/app/src/main/java/io/legado/app/help/coroutine/Coroutine.kt @@ -35,7 +35,7 @@ class Coroutine() { get() = job?.isCancelled ?: false val isActive: Boolean - get() = job?.isActive ?: false + get() = job?.isActive ?: true val isCompleted: Boolean get() = job?.isCompleted ?: false @@ -119,7 +119,6 @@ class Coroutine() { //取消当前任务 fun cancel(cause: CancellationException? = null) { - job?.cancelChildren(cause) job?.cancel(cause) } diff --git a/app/src/main/res/layout/activity_read.xml b/app/src/main/res/layout/activity_read.xml index 72ce083ea..1a16d9005 100644 --- a/app/src/main/res/layout/activity_read.xml +++ b/app/src/main/res/layout/activity_read.xml @@ -6,12 +6,6 @@ + android:layout_height="match_parent"/> \ No newline at end of file diff --git a/app/src/main/res/layout/page_view.xml b/app/src/main/res/layout/page_view.xml index d0c97cfce..fa67d4f81 100644 --- a/app/src/main/res/layout/page_view.xml +++ b/app/src/main/res/layout/page_view.xml @@ -16,6 +16,7 @@