From df422bcb1165ef38716adc00ea6e0a7b333bb0de Mon Sep 17 00:00:00 2001
From: Administrator <1760316362@qq.com>
Date: Tue, 6 Aug 2019 18:47:26 +0800
Subject: [PATCH] update

---
 .../io/legado/app/help/coroutine/Coroutine.kt     | 15 ++++++++++-----
 .../io/legado/app/ui/search/SearchActivity.kt     |  5 +++--
 .../io/legado/app/ui/search/SearchViewModel.kt    |  5 +++++
 3 files changed, 18 insertions(+), 7 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 9013fc266..af62ac20e 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
@@ -19,7 +19,7 @@ class Coroutine<T>() {
     }
 
     private var interceptor: Coroutine<T>? = null
-    private var job: Job? = null
+    private lateinit var job: Job
 
     private var start: (suspend CoroutineScope.() -> Unit)? = null
     private var execute: (suspend CoroutineScope.(T?) -> Unit)? = null
@@ -32,13 +32,13 @@ class Coroutine<T>() {
     private var errorReturn: Result<T>? = null
 
     val isCancelled: Boolean
-        get() = job?.isCancelled ?: false
+        get() = job.isCancelled
 
     val isActive: Boolean
-        get() = job?.isActive ?: true
+        get() = job.isActive
 
     val isCompleted: Boolean
-        get() = job?.isCompleted ?: false
+        get() = job.isCompleted
 
     private constructor(
         scope: CoroutineScope,
@@ -119,7 +119,11 @@ class Coroutine<T>() {
 
     //取消当前任务
     fun cancel(cause: CancellationException? = null) {
-        job?.cancel(cause)
+        job.cancel(cause)
+    }
+
+    fun invokeOnCompletion(handler: CompletionHandler): DisposableHandle{
+        return job.invokeOnCompletion(handler)
     }
 
     private suspend fun executeInternal(scope: CoroutineScope, block: suspend CoroutineScope.() -> T) {
@@ -134,6 +138,7 @@ class Coroutine<T>() {
                     success?.invoke(scope, value)
                     true
                 } ?: false
+
                 if (!consume) {
                     error?.invoke(scope, e)
                 }
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 52222d541..74a51d172 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,7 +11,6 @@ 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
@@ -45,13 +44,15 @@ class SearchActivity : VMBaseActivity<SearchViewModel>(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()
+                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 12f331fc4..096d8643e 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
@@ -1,6 +1,7 @@
 package io.legado.app.ui.search
 
 import android.app.Application
+import android.util.Log
 import io.legado.app.App
 import io.legado.app.base.BaseViewModel
 import io.legado.app.help.coroutine.Coroutine
@@ -36,6 +37,10 @@ class SearchViewModel(application: Application) : BaseViewModel(application) {
         }.onError {
             it.printStackTrace()
         }
+
+        task?.invokeOnCompletion {
+            Log.e("TAG", "complete")
+        }
     }
 
     fun stop() {