From 8dfc8904b1b3577f80e065ae5a405c208b59afe8 Mon Sep 17 00:00:00 2001 From: Horis <821938089@qq.com> Date: Sun, 9 Jul 2023 14:25:49 +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 --- .../main/java/io/legado/app/service/AudioPlayService.kt | 4 +--- .../java/io/legado/app/ui/rss/read/ReadRssViewModel.kt | 7 ++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/io/legado/app/service/AudioPlayService.kt b/app/src/main/java/io/legado/app/service/AudioPlayService.kt index 14c2cb6f5..221d0b08d 100644 --- a/app/src/main/java/io/legado/app/service/AudioPlayService.kt +++ b/app/src/main/java/io/legado/app/service/AudioPlayService.kt @@ -389,9 +389,7 @@ class AudioPlayService : BaseService(), WebBook.getContent(this@AudioPlayService, bookSource, book, chapter) .onSuccess { content -> if (content.isEmpty()) { - withContext(Main) { - toastOnUi("未获取到资源链接") - } + toastOnUi("未获取到资源链接") } else { contentLoadFinish(chapter, content) } diff --git a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt index 5470f92ce..072e11e1f 100644 --- a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt @@ -5,7 +5,6 @@ import android.content.Intent import android.net.Uri import android.util.Base64 import android.webkit.URLUtil -import androidx.documentfile.provider.DocumentFile import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope import io.legado.app.base.BaseViewModel @@ -20,14 +19,10 @@ import io.legado.app.help.http.newCallResponseBody import io.legado.app.help.http.okHttpClient import io.legado.app.model.analyzeRule.AnalyzeUrl import io.legado.app.model.rss.Rss -import io.legado.app.utils.DocumentUtils -import io.legado.app.utils.FileUtils -import io.legado.app.utils.isContentScheme import io.legado.app.utils.toastOnUi import io.legado.app.utils.writeBytes import kotlinx.coroutines.Dispatchers.IO import splitties.init.appCtx -import java.io.File import java.util.Date @@ -99,6 +94,8 @@ class ReadRssViewModel(application: Application) : BaseViewModel(application) { appDb.rssStarDao.insert(it) } contentLiveData.postValue(body) + }.onError { + contentLiveData.postValue("加载正文失败\n${it.stackTraceToString()}") } }