From 64f7761c2de016d6cf90f78aa7c3dd70e297f4d4 Mon Sep 17 00:00:00 2001 From: Sun-QAQ <75133710+Sun-QAQ@users.noreply.github.com> Date: Tue, 14 Jan 2025 12:16:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=A0getImageStyle?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=B8=AD=E9=BB=98=E8=AE=A4=E4=B9=A6=E6=BA=90?= =?UTF-8?q?=E4=B8=BA=E5=9B=BE=E7=89=87=E6=A0=BC=E5=BC=8F=E8=BF=94=E5=9B=9E?= =?UTF-8?q?imgStyleFull=E5=AF=BC=E8=87=B4=E4=B9=A6=E6=BA=90imgstyle?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20(#4530)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: SunQAQ --- app/src/main/java/io/legado/app/model/ReadBook.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 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 c778fd242..35c3c9c8e 100644 --- a/app/src/main/java/io/legado/app/model/ReadBook.kt +++ b/app/src/main/java/io/legado/app/model/ReadBook.kt @@ -14,6 +14,7 @@ import io.legado.app.help.book.BookHelp import io.legado.app.help.book.ContentProcessor import io.legado.app.help.book.isImage import io.legado.app.help.book.isLocal +import io.legado.app.help.book.isPdf import io.legado.app.help.book.readSimulating import io.legado.app.help.book.simulatedTotalChapterNum import io.legado.app.help.book.update @@ -169,8 +170,12 @@ object ReadBook : CoroutineScope by MainScope() { } else { appDb.bookSourceDao.getBookSource(book.origin)?.let { bookSource = it - if (book.getImageStyle().isNullOrBlank()) { - val imageStyle = it.getContentRule().imageStyle + val readConfig = book.readConfig ?: return@let + if (readConfig.imageStyle.isNullOrBlank()) { + var imageStyle = it.getContentRule().imageStyle + if (imageStyle.isNullOrBlank() && (book.isImage || book.isPdf)) { + imageStyle = Book.imgStyleFull + } book.setImageStyle(imageStyle) if (imageStyle.equals(Book.imgStyleSingle, true)) { book.setPageAnim(0)