From 1d23acf6b44da6da1b728f614484e978d71fba7d Mon Sep 17 00:00:00 2001
From: Horis <821938089@qq.com>
Date: Sun, 10 Sep 2023 18:01:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/io/legado/app/model/ReadBook.kt            | 4 ++--
 .../java/io/legado/app/receiver/NetworkChangedListener.kt    | 2 +-
 .../java/io/legado/app/receiver/SharedReceiverActivity.kt    | 2 ++
 .../java/io/legado/app/ui/book/info/BookInfoViewModel.kt     | 2 +-
 .../main/java/io/legado/app/ui/book/read/ReadBookActivity.kt | 5 +++--
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/io/legado/app/model/ReadBook.kt b/app/src/main/java/io/legado/app/model/ReadBook.kt
index 0b756b4b4..8eda351a9 100644
--- a/app/src/main/java/io/legado/app/model/ReadBook.kt
+++ b/app/src/main/java/io/legado/app/model/ReadBook.kt
@@ -146,7 +146,7 @@ object ReadBook : CoroutineScope by MainScope() {
     }
 
     fun upReadTime() {
-        Coroutine.async {
+        Coroutine.async(executeContext = IO) {
             readRecord.readTime = readRecord.readTime + System.currentTimeMillis() - readStartTime
             readStartTime = System.currentTimeMillis()
             readRecord.lastRead = System.currentTimeMillis()
@@ -537,7 +537,7 @@ object ReadBook : CoroutineScope by MainScope() {
             return
         }
         preDownloadTask?.cancel()
-        preDownloadTask = Coroutine.async {
+        preDownloadTask = Coroutine.async(executeContext = IO) {
             //预下载
             launch {
                 val maxChapterIndex = min(durChapterIndex + AppConfig.preDownloadNum, chapterSize)
diff --git a/app/src/main/java/io/legado/app/receiver/NetworkChangedListener.kt b/app/src/main/java/io/legado/app/receiver/NetworkChangedListener.kt
index 159d902ac..a81ca2471 100644
--- a/app/src/main/java/io/legado/app/receiver/NetworkChangedListener.kt
+++ b/app/src/main/java/io/legado/app/receiver/NetworkChangedListener.kt
@@ -36,7 +36,7 @@ class NetworkChangedListener(private val context: Context) {
         return@lazy null
     }
 
-    @SuppressLint("MissingPermission")
+    @SuppressLint("MissingPermission", "UnspecifiedRegisterReceiverFlag")
     fun register() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             networkCallback?.let {
diff --git a/app/src/main/java/io/legado/app/receiver/SharedReceiverActivity.kt b/app/src/main/java/io/legado/app/receiver/SharedReceiverActivity.kt
index c5867c899..b21bb7658 100644
--- a/app/src/main/java/io/legado/app/receiver/SharedReceiverActivity.kt
+++ b/app/src/main/java/io/legado/app/receiver/SharedReceiverActivity.kt
@@ -1,5 +1,6 @@
 package io.legado.app.receiver
 
+import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
@@ -19,6 +20,7 @@ class SharedReceiverActivity : AppCompatActivity() {
         finish()
     }
 
+    @SuppressLint("ObsoleteSdkInt")
     private fun initIntent() {
         when {
             intent.action == Intent.ACTION_SEND && intent.type == receivingType -> {
diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt
index 50ed3ad32..cb92a8332 100644
--- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt
@@ -99,7 +99,7 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
 
     private fun upCoverByRule(book: Book) {
         execute {
-            if (book.customCoverUrl.isNullOrBlank()) {
+            if (book.coverUrl.isNullOrBlank() && book.customCoverUrl.isNullOrBlank()) {
                 BookCover.searchCover(book)?.let { coverUrl ->
                     book.customCoverUrl = coverUrl
                     bookData.postValue(book)
diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
index 5ad24d29e..5057da78b 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
@@ -237,6 +237,7 @@ class ReadBookActivity : BaseReadBookActivity(),
         binding.readView.upStatusBar()
     }
 
+    @SuppressLint("UnspecifiedRegisterReceiverFlag")
     override fun onResume() {
         super.onResume()
         ReadBook.readStartTime = System.currentTimeMillis()
@@ -1118,8 +1119,7 @@ class ReadBookActivity : BaseReadBookActivity(),
                             }
                         }
                     }.onError {
-                        AppLog.putDebug(it.localizedMessage)
-                        toastOnUi(it.localizedMessage)
+                        AppLog.put("执行购买操作出错\n${it.localizedMessage}", it, true)
                     }
                 }
                 noButton()
@@ -1153,6 +1153,7 @@ class ReadBookActivity : BaseReadBookActivity(),
                     ReadAloud.resume(this)
                 }
             }
+
             else -> ReadAloud.pause(this)
         }
     }