This commit is contained in:
kunfei
2022-05-01 00:41:08 +08:00
parent 11be085d26
commit 2cd4ed61c7
3 changed files with 4 additions and 9 deletions

View File

@@ -89,7 +89,7 @@ object BookController {
this.bookUrl = bookUrl
val bitmap = runBlocking {
ImageProvider.cacheImage(book, src, bookSource)
ImageProvider.getImage(book, src, width, bookSource = bookSource)
ImageProvider.getImage(book, src, width)
}
return returnData.setData(bitmap)
}

View File

@@ -170,8 +170,7 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
book,
textChar.charData,
(textChar.end - textChar.start).toInt(),
(lineBottom - lineTop).toInt(),
ReadBook.bookSource
(lineBottom - lineTop).toInt()
)
val rectF = if (textLine.isImage) {
RectF(textChar.start, lineTop, textChar.end, lineBottom)

View File

@@ -16,7 +16,6 @@ import io.legado.app.utils.BitmapUtils
import io.legado.app.utils.FileUtils
import io.legado.app.utils.isXml
import kotlinx.coroutines.Dispatchers.IO
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext
import splitties.init.appCtx
import java.io.File
@@ -108,14 +107,11 @@ object ImageProvider {
book: Book,
src: String,
width: Int,
height: Int? = null,
bookSource: BookSource? = null
height: Int? = null
): Bitmap {
val cacheBitmap = bitmapLruCache.get(src)
if (cacheBitmap != null) return cacheBitmap
val vFile = runBlocking {
cacheImage(book, src, bookSource)
}
val vFile = BookHelp.getImage(book, src)
@Suppress("BlockingMethodInNonBlockingContext")
return kotlin.runCatching {
val bitmap = BitmapUtils.decodeBitmap(vFile.absolutePath, width, height)