diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/FeedCard.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/FeedCard.kt index 9c4e2bd9..cb6b1596 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/FeedCard.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/FeedCard.kt @@ -92,8 +92,8 @@ private val ImmutableHolder.url: String App.INSTANCE, true, get { originPic }, - get { dynamicPic }, get { bigPic }, + get { dynamicPic }, get { srcPic } ) diff --git a/app/src/main/java/com/huanchengfly/tieba/post/utils/ImageUtil.kt b/app/src/main/java/com/huanchengfly/tieba/post/utils/ImageUtil.kt index 9d5813bf..16f9530e 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/utils/ImageUtil.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/utils/ImageUtil.kt @@ -641,11 +641,7 @@ object ImageUtil { if (needReverse(context)) { urls.reverse() } - for (url in urls) { - if (!url.isNullOrEmpty()) { - return url - } - } + return urls.firstOrNull { !it.isNullOrEmpty() } ?: originUrl } return originUrl }