yusheng/QieKan-3.0
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 2 Wiki Activity

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

Browse Source
This commit is contained in:
Xwite
2022-04-10 20:59:46 +08:00
parent 37a56dad31
commit e08395d753
6 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/help/glide/ImageLoader.kt
+3 -1
View File
@@ -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(
app/src/main/java/io/legado/app/ui/main/rss/RssAdapter.kt
+1 -1
View File
@@ -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)
app/src/main/java/io/legado/app/ui/rss/article/RssArticlesAdapter.kt
+1 -1
View File
@@ -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 {
app/src/main/java/io/legado/app/ui/rss/article/RssArticlesAdapter1.kt
+1 -1
View File
@@ -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 {
app/src/main/java/io/legado/app/ui/rss/article/RssArticlesAdapter2.kt
+1 -1
View File
@@ -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 {
app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesAdapter.kt
+1 -1
View File
@@ -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?,