diff --git a/app/src/main/java/io/legado/app/data/entities/BaseSource.kt b/app/src/main/java/io/legado/app/data/entities/BaseSource.kt index 275835fae..22f8c86d5 100644 --- a/app/src/main/java/io/legado/app/data/entities/BaseSource.kt +++ b/app/src/main/java/io/legado/app/data/entities/BaseSource.kt @@ -116,7 +116,7 @@ interface BaseSource : JsExtensions { putAll(map) } } catch (e: Exception) { - AppLog.put("getHeaderMap 出错\n$e", e) + AppLog.put("执行请求头规则出错\n$e", e) } } if (!has(AppConst.UA_NAME, true)) { diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/delegate/PageDelegate.kt b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/PageDelegate.kt index 7ff252eb3..374622a1b 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/page/delegate/PageDelegate.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/PageDelegate.kt @@ -191,9 +191,9 @@ abstract class PageDelegate(protected val readView: ReadView) { } fun postInvalidate() { - if (isRunning && this is HorizontalPageDelegate) { + if (isStarted && isRunning && this is HorizontalPageDelegate) { readView.post { - if (isRunning) { + if (isStarted && isRunning) { setBitmap() readView.invalidate() } diff --git a/app/src/main/java/io/legado/app/utils/GsonExtensions.kt b/app/src/main/java/io/legado/app/utils/GsonExtensions.kt index a7b03ec85..4d818eb0a 100644 --- a/app/src/main/java/io/legado/app/utils/GsonExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/GsonExtensions.kt @@ -68,7 +68,9 @@ inline fun Gson.fromJsonArray(json: String?): Result> { val type = TypeToken.getParameterized(List::class.java, T::class.java).type val list = fromJson(json, type) as List if (list.contains(null)) { - throw JsonSyntaxException("存在null") + throw JsonSyntaxException( + "列表不能存在null元素,可能是json格式错误,通常为列表存在多余的逗号所致" + ) } @Suppress("UNCHECKED_CAST") list as List @@ -94,7 +96,9 @@ inline fun Gson.fromJsonArray(inputStream: InputStream?): Result if (list.contains(null)) { - throw JsonSyntaxException("存在null") + throw JsonSyntaxException( + "列表不能存在null元素,可能是json格式错误,通常为列表存在多余的逗号所致" + ) } @Suppress("UNCHECKED_CAST") list as List