优化

app/src/main/java/io/legado/app/base/BaseViewModel.kt

@@ -13,11 +13,11 @@ open class BaseViewModel(application: Application) : AndroidViewModel(applicatio
     AnkoLogger {
 
     fun <T> execute(block: suspend CoroutineScope.() -> T): Coroutine<T> {
-        return Coroutine.with(this) { block() }
+        return Coroutine.launch(this) { block() }
     }
 
     fun <T> submit(block: suspend CoroutineScope.() -> Deferred<T>): Coroutine<T> {
-        return Coroutine.with(this) { block().await() }
+        return Coroutine.launch(this) { block().await() }
     }
 
 

app/src/main/java/io/legado/app/help/coroutine/Coroutine.kt

@@ -2,11 +2,13 @@ package io.legado.app.help.coroutine
 
 import kotlinx.coroutines.*
 
-class Coroutine<T>(scope: CoroutineScope, private val block: suspend CoroutineScope.() -> T) {
+class Coroutine<T>(private val scope: CoroutineScope, private val block: suspend CoroutineScope.() -> T) {
 
     companion object {
 
-        fun <T> with(scope: CoroutineScope, block: suspend CoroutineScope.() -> T): Coroutine<T> {
+        private val DEFAULT = MainScope()
+
+        fun <T> launch(scope: CoroutineScope = DEFAULT, block: suspend CoroutineScope.() -> T): Coroutine<T> {
             return Coroutine(scope, block)
         }
     }
@@ -56,6 +58,10 @@ class Coroutine<T>(scope: CoroutineScope, private val block: suspend CoroutineSc
         return this@Coroutine
     }
 
+    fun cancel(cause: CancellationException? = null) {
+        scope.cancel(cause)
+    }
+
     private suspend fun executeInternal(block: suspend CoroutineScope.() -> T) {
         tryCatch(
             {

app/src/main/java/io/legado/app/model/WebBook.kt

@@ -8,13 +8,11 @@ import io.legado.app.help.coroutine.Coroutine
 import io.legado.app.help.http.HttpHelper
 import io.legado.app.model.analyzeRule.AnalyzeUrl
 import io.legado.app.model.webbook.BookList
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.MainScope
 
-class WebBook(private val bookSource: BookSource) : CoroutineScope by MainScope() {
+class WebBook(private val bookSource: BookSource) {
 
     fun searchBook(key: String, page: Int?): Coroutine<List<SearchBook>> {
-        return Coroutine.with(this) {
+        return Coroutine.launch {
             bookSource.getSearchRule().searchUrl?.let { searchUrl ->
                 val analyzeUrl = AnalyzeUrl(searchUrl)
                 val response = when {
@@ -31,9 +29,9 @@ class WebBook(private val bookSource: BookSource) : CoroutineScope by MainScope(
                     else -> HttpHelper.getApiService<IHttpGetApi>(analyzeUrl.baseUrl)
                         .getMap(analyzeUrl.url, analyzeUrl.fieldMap, analyzeUrl.headerMap).await()
                 }
-                return@with BookList().analyzeBookList(response, bookSource, analyzeUrl)
+                return@launch BookList.analyzeBookList(response, bookSource, analyzeUrl)
             }
-            return@with ArrayList<SearchBook>()
+            return@launch mutableListOf()
         }
     }
 

app/src/main/java/io/legado/app/model/webbook/BookChapterList.kt

@@ -1,5 +1,5 @@
 package io.legado.app.model.webbook
 
-class BookChapterList {
+object BookChapterList {
 
 }

app/src/main/java/io/legado/app/model/webbook/BookContent.kt

@@ -1,5 +1,5 @@
 package io.legado.app.model.webbook
 
-class BookContent {
+object BookContent {
 
 }

app/src/main/java/io/legado/app/model/webbook/BookInfo.kt

@@ -1,5 +1,5 @@
 package io.legado.app.model.webbook
 
-class BookInfo {
+object BookInfo {
 
 }

app/src/main/java/io/legado/app/model/webbook/BookList.kt

@@ -11,7 +11,7 @@ import io.legado.app.utils.NetworkUtils
 import org.mozilla.javascript.NativeObject
 import retrofit2.Response
 
-class BookList {
+object BookList {
 
     @Throws(Exception::class)
     fun analyzeBookList(