fix:订阅源封面,icon的缺省headers的优先级:书源>全局

3 years ago · 6ecb62177b
parent 3f49ef95ff
commit 6ecb62177b
6 changed files with 8 additions and 6 deletions
--- a/app/src/main/java/io/legado/app/help/glide/ImageLoader.kt
+++ b/app/src/main/java/io/legado/app/help/glide/ImageLoader.kt
@ -28,7 +28,9 @@ object ImageLoader {
            }
            path.isAbsUrl() -> {
                kotlin.runCatching {
-                    val source = sourceOrigin?.let { appDb.bookSourceDao.getBookSource(it) }
+                    val source = sourceOrigin?.let {
+                        appDb.bookSourceDao.getBookSource(it) ?: appDb.rssSourceDao.getByKey(it)
+                    }
                    val url = AnalyzeUrl(path, source = source).getGlideUrl()
                    GlideApp.with(context).load(url)
                }.getOrDefault(
--- a/app/src/main/java/io/legado/app/ui/main/rss/RssAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/main/rss/RssAdapter.kt
@ -27,7 +27,7 @@ class RssAdapter(context: Context, val callBack: CallBack) :
    ) {
        binding.apply {
            tvName.text = item.sourceName
-            ImageLoader.load(context, item.sourceIcon)
+            ImageLoader.load(context, item.sourceIcon, item.sourceUrl)
                .centerCrop()
                .placeholder(R.drawable.image_rss)
                .error(R.drawable.image_rss)
--- a/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesAdapter.kt
@ -38,7 +38,7 @@ class RssArticlesAdapter(context: Context, callBack: CallBack) :
            if (item.image.isNullOrBlank() && !callBack.isGridLayout) {
                imageView.gone()
            } else {
-                ImageLoader.load(context, item.image).apply {
+                ImageLoader.load(context, item.image, item.origin).apply {
                    if (callBack.isGridLayout) {
                        placeholder(R.drawable.image_rss_article)
                    } else {
--- a/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesAdapter1.kt
+++ b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesAdapter1.kt
@ -36,7 +36,7 @@ class RssArticlesAdapter1(context: Context, callBack: CallBack) :
            if (item.image.isNullOrBlank() && !callBack.isGridLayout) {
                imageView.gone()
            } else {
-                ImageLoader.load(context, item.image).apply {
+                ImageLoader.load(context, item.image, item.origin).apply {
                    if (callBack.isGridLayout) {
                        placeholder(R.drawable.image_rss_article)
                    } else {
--- a/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesAdapter2.kt
+++ b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesAdapter2.kt
@ -36,7 +36,7 @@ class RssArticlesAdapter2(context: Context, callBack: CallBack) :
            if (item.image.isNullOrBlank() && !callBack.isGridLayout) {
                imageView.gone()
            } else {
-                ImageLoader.load(context, item.image).apply {
+                ImageLoader.load(context, item.image, item.origin).apply {
                    if (callBack.isGridLayout) {
                        placeholder(R.drawable.image_rss_article)
                    } else {
--- a/app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesAdapter.kt
@ -35,7 +35,7 @@ class RssFavoritesAdapter(context: Context, val callBack: CallBack) :
            if (item.image.isNullOrBlank()) {
                imageView.gone()
            } else {
-                ImageLoader.load(context, item.image)
+                ImageLoader.load(context, item.image, item.origin)
                    .addListener(object : RequestListener<Drawable> {
                        override fun onLoadFailed(
                            e: GlideException?,