From ae5096758cfe9ee5a25e6d9a3716ba43e8723f04 Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Tue, 3 May 2022 12:48:20 +0800 Subject: [PATCH] refactor:remove ConcurrentException --- .../java/io/legado/app/exception/ConcurrentException.kt | 8 -------- app/src/main/java/io/legado/app/model/CacheBook.kt | 5 +---- .../java/io/legado/app/service/HttpReadAloudService.kt | 5 ----- 3 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 app/src/main/java/io/legado/app/exception/ConcurrentException.kt diff --git a/app/src/main/java/io/legado/app/exception/ConcurrentException.kt b/app/src/main/java/io/legado/app/exception/ConcurrentException.kt deleted file mode 100644 index 0ec3d6cca..000000000 --- a/app/src/main/java/io/legado/app/exception/ConcurrentException.kt +++ /dev/null @@ -1,8 +0,0 @@ -@file:Suppress("unused") - -package io.legado.app.exception - -/** - * 并发限制 - */ -class ConcurrentException(msg: String, val waitTime: Int) : NoStackTraceException(msg) \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/model/CacheBook.kt b/app/src/main/java/io/legado/app/model/CacheBook.kt index 92f61b1a5..26bb09d5c 100644 --- a/app/src/main/java/io/legado/app/model/CacheBook.kt +++ b/app/src/main/java/io/legado/app/model/CacheBook.kt @@ -8,7 +8,6 @@ import io.legado.app.data.appDb import io.legado.app.data.entities.Book import io.legado.app.data.entities.BookChapter import io.legado.app.data.entities.BookSource -import io.legado.app.exception.ConcurrentException import io.legado.app.help.BookHelp import io.legado.app.model.webBook.WebBook import io.legado.app.service.CacheBookService @@ -169,9 +168,7 @@ object CacheBook { @Synchronized private fun onError(index: Int, error: Throwable, chapterTitle: String) { - if (error !is ConcurrentException) { - errorDownloadMap[index] = (errorDownloadMap[index] ?: 0) + 1 - } + errorDownloadMap[index] = (errorDownloadMap[index] ?: 0) + 1 onDownloadSet.remove(index) //重试3次 if (errorDownloadMap[index] ?: 0 < 3) { diff --git a/app/src/main/java/io/legado/app/service/HttpReadAloudService.kt b/app/src/main/java/io/legado/app/service/HttpReadAloudService.kt index b49c2ee82..2ca2b76ae 100644 --- a/app/src/main/java/io/legado/app/service/HttpReadAloudService.kt +++ b/app/src/main/java/io/legado/app/service/HttpReadAloudService.kt @@ -11,7 +11,6 @@ import io.legado.app.R import io.legado.app.constant.AppLog import io.legado.app.constant.AppPattern import io.legado.app.constant.EventBus -import io.legado.app.exception.ConcurrentException import io.legado.app.exception.NoStackTraceException import io.legado.app.help.config.AppConfig import io.legado.app.help.coroutine.Coroutine @@ -154,10 +153,6 @@ class HttpReadAloudService : BaseReadAloudService(), }.onFailure { when (it) { is CancellationException -> Unit - is ConcurrentException -> { - delay(it.waitTime.toLong()) - downloadAudio() - } is ScriptException, is WrappedException -> { AppLog.put("js错误\n${it.localizedMessage}", it) toastOnUi("js错误\n${it.localizedMessage}")