From 7a72da2d64d69f42f247dc5eb77bd814c0e57b48 Mon Sep 17 00:00:00 2001
From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com>
Date: Mon, 24 Jul 2023 22:56:52 +0800
Subject: [PATCH] =?UTF-8?q?pref:=20=E7=BC=A9=E7=95=A5=E5=9B=BE=E7=94=BB?=
 =?UTF-8?q?=E8=B4=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../huanchengfly/tieba/post/ui/widgets/compose/FeedCard.kt  | 2 +-
 .../java/com/huanchengfly/tieba/post/utils/ImageUtil.kt     | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

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<Media>.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
     }