feat(ImageProvider): toast when image url is empty

pull/1937/head
Xwite 3 years ago
parent 99835dfc17
commit 2f4f7f46b7
  1. 9
      app/src/main/java/io/legado/app/ui/book/read/page/provider/ImageProvider.kt
  2. 2
      app/src/main/res/values-es-rES/strings.xml
  3. 2
      app/src/main/res/values-ja-rJP/strings.xml
  4. 2
      app/src/main/res/values-pt-rBR/strings.xml
  5. 2
      app/src/main/res/values-zh-rHK/strings.xml
  6. 2
      app/src/main/res/values-zh-rTW/strings.xml
  7. 2
      app/src/main/res/values-zh/strings.xml
  8. 2
      app/src/main/res/values/strings.xml

@ -13,8 +13,7 @@ import io.legado.app.help.BookHelp
import io.legado.app.help.config.AppConfig import io.legado.app.help.config.AppConfig
import io.legado.app.help.coroutine.Coroutine import io.legado.app.help.coroutine.Coroutine
import io.legado.app.model.localBook.EpubFile import io.legado.app.model.localBook.EpubFile
import io.legado.app.utils.BitmapUtils import io.legado.app.utils.*
import io.legado.app.utils.FileUtils
import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Dispatchers.IO
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import splitties.init.appCtx import splitties.init.appCtx
@ -113,6 +112,10 @@ object ImageProvider {
width: Int, width: Int,
height: Int? = null height: Int? = null
): Bitmap { ): Bitmap {
//src为空白时 可能被净化替换掉了 或者规则失效
if (book.getUseReplaceRule() && src.isBlank()) {
appCtx.toastOnUi(R.string.error_image_url_empty)
}
val vFile = BookHelp.getImage(book, src) val vFile = BookHelp.getImage(book, src)
if (!vFile.exists()) return errorBitmap if (!vFile.exists()) return errorBitmap
//epub文件提供图片链接是相对链接,同时阅读多个epub文件,缓存命中错误 //epub文件提供图片链接是相对链接,同时阅读多个epub文件,缓存命中错误
@ -122,7 +125,7 @@ object ImageProvider {
@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(appCtx.getString(R.string.error_decode_bitmap))
bitmapLruCache.put(vFile.absolutePath, bitmap) bitmapLruCache.put(vFile.absolutePath, bitmap)
bitmap bitmap
}.onFailure { }.onFailure {

@ -993,4 +993,6 @@
<string name="bitmap_cache_size">bitmap cache size</string> <string name="bitmap_cache_size">bitmap cache size</string>
<string name="export_pics_file">Export Picture Files</string> <string name="export_pics_file">Export Picture Files</string>
<!-- string end --> <!-- string end -->
<string name="error_decode_bitmap">Fail to decode bitmap</string>
<string name="error_image_url_empty">Image url is empty, check replacement rules</string>
</resources> </resources>

@ -996,4 +996,6 @@
<string name="bitmap_cache_size">bitmap cache size</string> <string name="bitmap_cache_size">bitmap cache size</string>
<string name="export_pics_file">Export Picture Files</string> <string name="export_pics_file">Export Picture Files</string>
<!-- string end --> <!-- string end -->
<string name="error_decode_bitmap">Fail to decode bitmap</string>
<string name="error_image_url_empty">Image url is empty, check replacement rules</string>
</resources> </resources>

@ -996,4 +996,6 @@
<string name="bitmap_cache_size">bitmap cache size</string> <string name="bitmap_cache_size">bitmap cache size</string>
<string name="export_pics_file">Export Picture Files</string> <string name="export_pics_file">Export Picture Files</string>
<!-- string end --> <!-- string end -->
<string name="error_decode_bitmap">Fail to decode bitmap</string>
<string name="error_image_url_empty">Image url is empty, check replacement rules</string>
</resources> </resources>

@ -993,4 +993,6 @@
<string name="bitmap_cache_size">图片绘制缓存</string> <string name="bitmap_cache_size">图片绘制缓存</string>
<string name="export_pics_file">TXT导出图片</string> <string name="export_pics_file">TXT导出图片</string>
<!-- string end --> <!-- string end -->
<string name="error_decode_bitmap">图片解码失败</string>
<string name="error_image_url_empty">图片链接为空,检查替换净化规则</string>
</resources> </resources>

@ -995,4 +995,6 @@
<string name="bitmap_cache_size">圖片繪製快取</string> <string name="bitmap_cache_size">圖片繪製快取</string>
<string name="export_pics_file">TXT匯出圖片</string> <string name="export_pics_file">TXT匯出圖片</string>
<!-- string end --> <!-- string end -->
<string name="error_decode_bitmap">图片解码失败</string>
<string name="error_image_url_empty">图片链接为空,检查替换净化规则</string>
</resources> </resources>

@ -995,4 +995,6 @@
<string name="bitmap_cache_size">图片绘制缓存</string> <string name="bitmap_cache_size">图片绘制缓存</string>
<string name="export_pics_file">TXT导出图片</string> <string name="export_pics_file">TXT导出图片</string>
<!-- string end --> <!-- string end -->
<string name="error_decode_bitmap">图片解码失败</string>
<string name="error_image_url_empty">图片链接为空,检查替换净化规则</string>
</resources> </resources>

@ -996,4 +996,6 @@
<string name="bitmap_cache_size">bitmap cache size</string> <string name="bitmap_cache_size">bitmap cache size</string>
<string name="export_pics_file">Export Picture Files</string> <string name="export_pics_file">Export Picture Files</string>
<!-- string end --> <!-- string end -->
<string name="error_decode_bitmap">Fail to decode bitmap</string>
<string name="error_image_url_empty">Image url is empty, check replacement rules</string>
</resources> </resources>

Loading…
Cancel
Save