chore(book/read): BitmapLruCache store key change to filePath
This commit is contained in:
@@ -394,9 +394,10 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
|
|||||||
|
|
||||||
fun refreshImage(src: String) {
|
fun refreshImage(src: String) {
|
||||||
execute {
|
execute {
|
||||||
ImageProvider.bitmapLruCache.remove(src)
|
|
||||||
ReadBook.book?.let { book ->
|
ReadBook.book?.let { book ->
|
||||||
BookHelp.getImage(book, src).delete()
|
val vFile = BookHelp.getImage(book, src)
|
||||||
|
ImageProvider.bitmapLruCache.remove(vFile.absolutePath)
|
||||||
|
vFile.delete()
|
||||||
}
|
}
|
||||||
}.onFinally {
|
}.onFinally {
|
||||||
ReadBook.loadContent(false)
|
ReadBook.loadContent(false)
|
||||||
|
|||||||
@@ -28,26 +28,27 @@ object ImageProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*缓存bitmap LruCache实现
|
* 缓存bitmap LruCache实现
|
||||||
|
* filePath bitmap
|
||||||
*/
|
*/
|
||||||
private const val M = 1024 * 1024
|
private const val M = 1024 * 1024
|
||||||
val cacheSize get() = AppConfig.bitmapCacheSize * M
|
val cacheSize get() = AppConfig.bitmapCacheSize * M
|
||||||
val bitmapLruCache = object : LruCache<String, Bitmap>(cacheSize) {
|
val bitmapLruCache = object : LruCache<String, Bitmap>(cacheSize) {
|
||||||
|
|
||||||
override fun sizeOf(key: String, bitmap: Bitmap): Int {
|
override fun sizeOf(filePath: String, bitmap: Bitmap): Int {
|
||||||
return bitmap.byteCount
|
return bitmap.byteCount
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun entryRemoved(
|
override fun entryRemoved(
|
||||||
evicted: Boolean,
|
evicted: Boolean,
|
||||||
key: String,
|
filePath: String,
|
||||||
oldBitmap: Bitmap,
|
oldBitmap: Bitmap,
|
||||||
newBitmap: Bitmap?
|
newBitmap: Bitmap?
|
||||||
) {
|
) {
|
||||||
//错误图片不能释放,占位用,防止一直重复获取图片
|
//错误图片不能释放,占位用,防止一直重复获取图片
|
||||||
if (oldBitmap != errorBitmap) {
|
if (oldBitmap != errorBitmap) {
|
||||||
oldBitmap.recycle()
|
oldBitmap.recycle()
|
||||||
putDebug("ImageProvider: trigger bitmap recycle. URI: $key")
|
putDebug("ImageProvider: trigger bitmap recycle. URI: $filePath")
|
||||||
putDebug("ImageProvider : cacheUsage ${size()}bytes / ${maxSize()}bytes")
|
putDebug("ImageProvider : cacheUsage ${size()}bytes / ${maxSize()}bytes")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -112,19 +113,21 @@ object ImageProvider {
|
|||||||
width: Int,
|
width: Int,
|
||||||
height: Int? = null
|
height: Int? = null
|
||||||
): Bitmap {
|
): Bitmap {
|
||||||
val cacheBitmap = bitmapLruCache.get(src)
|
|
||||||
if (cacheBitmap != null) return cacheBitmap
|
|
||||||
val vFile = BookHelp.getImage(book, src)
|
val vFile = BookHelp.getImage(book, src)
|
||||||
if (!vFile.exists()) return errorBitmap
|
if (!vFile.exists()) return errorBitmap
|
||||||
|
//epub文件提供图片链接是相对链接,同时阅读多个epub文件,缓存命中错误
|
||||||
|
//bitmapLruCache的key同一改成缓存文件的路径
|
||||||
|
val cacheBitmap = bitmapLruCache.get(vFile.absolutePath)
|
||||||
|
if (cacheBitmap != null) return cacheBitmap
|
||||||
@Suppress("BlockingMethodInNonBlockingContext")
|
@Suppress("BlockingMethodInNonBlockingContext")
|
||||||
return kotlin.runCatching {
|
return kotlin.runCatching {
|
||||||
val bitmap = BitmapUtils.decodeBitmap(vFile.absolutePath, width, height)
|
val bitmap = BitmapUtils.decodeBitmap(vFile.absolutePath, width, height)
|
||||||
?: throw NoStackTraceException("解析图片失败")
|
?: throw NoStackTraceException("解析图片失败")
|
||||||
bitmapLruCache.put(src, bitmap)
|
bitmapLruCache.put(vFile.absolutePath, bitmap)
|
||||||
bitmap
|
bitmap
|
||||||
}.onFailure {
|
}.onFailure {
|
||||||
//错误图片占位,防止重复获取
|
//错误图片占位,防止重复获取
|
||||||
bitmapLruCache.put(src, errorBitmap)
|
bitmapLruCache.put(vFile.absolutePath, errorBitmap)
|
||||||
putDebug(
|
putDebug(
|
||||||
"ImageProvider: decode bitmap failed. path: ${vFile.absolutePath}\n$it",
|
"ImageProvider: decode bitmap failed. path: ${vFile.absolutePath}\n$it",
|
||||||
it
|
it
|
||||||
|
|||||||
Reference in New Issue
Block a user