perf: 优化图片显示

badest192 · Dec 31, 2023 · bb8fbac · bb8fbac
1 parent 6039f8c
commit bb8fbac
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 13 deletions.
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/GroupItemPage.kt b/app/src/main/kotlin/li/songe/gkd/ui/GroupItemPage.kt
@@ -31,15 +31,17 @@ import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.annotation.RootNavGraph
 import li.songe.gkd.data.RawSubscription
 import li.songe.gkd.util.LocalNavController
+import li.songe.gkd.util.ProfileTransitions
 import li.songe.gkd.util.appInfoCacheFlow
 import li.songe.gkd.util.imageLoader
 import li.songe.gkd.util.subsIdToRawFlow
 
 
 @RootNavGraph
-@Destination
+@Destination(style = ProfileTransitions::class)
 @Composable
 fun GroupItemPage(subsInt: Long, groupKey: Int, appId: String? = null) {
+    val context = LocalContext.current
     val navController = LocalNavController.current
     val subsIdToRaw by subsIdToRawFlow.collectAsState()
     val rawSubs = subsIdToRaw[subsInt]
@@ -72,8 +74,9 @@ fun GroupItemPage(subsInt: Long, groupKey: Int, appId: String? = null) {
                     is RawSubscription.RawAppGroup -> {
                         Text(
                             text = ((rawSubs?.name
-                                ?: subsInt.toString()) + (appInfoCache[appId]?.name ?: rawApp?.name
-                            ?: appId) + "/" + (group.name))
+                                ?: subsInt.toString()) + "/" + (appInfoCache[appId]?.name
+                                ?: rawApp?.name
+                                ?: appId) + "/" + (group.name))
                         )
                     }
 
@@ -103,7 +106,7 @@ fun GroupItemPage(subsInt: Long, groupKey: Int, appId: String? = null) {
                 val url = allExampleUrls.getOrNull(p)
                 if (url != null) {
                     SubcomposeAsyncImage(
-                        model = ImageRequest.Builder(LocalContext.current).data(url)
+                        model = ImageRequest.Builder(context).data(url)
                             .crossfade(DefaultDurationMillis).build(),
                         contentDescription = null,
                         modifier = Modifier.fillMaxWidth(),

diff --git a/app/src/main/kotlin/li/songe/gkd/util/Singleton.kt b/app/src/main/kotlin/li/songe/gkd/util/Singleton.kt
@@ -14,6 +14,8 @@ import io.ktor.serialization.kotlinx.json.json
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json
 import li.songe.gkd.app
+import okhttp3.OkHttpClient
+import java.time.Duration
 
 
 val kv by lazy { MMKV.mmkvWithID("kv")!! }
@@ -48,14 +50,22 @@ val client by lazy {
 }
 
 val imageLoader by lazy {
-    ImageLoader.Builder(app).components {
-        if (Build.VERSION.SDK_INT >= 28) {
-            add(ImageDecoderDecoder.Factory())
-        } else {
-            add(GifDecoder.Factory())
-        }
-    }.diskCache {
-        DiskCache.Builder().directory(imageCacheDir).build()
-    }.build()
+    ImageLoader.Builder(app)
+        .okHttpClient(
+            OkHttpClient.Builder()
+                .connectTimeout(Duration.ofSeconds(30))
+                .readTimeout(Duration.ofSeconds(30))
+                .writeTimeout(Duration.ofSeconds(30))
+                .build()
+        )
+        .components {
+            if (Build.VERSION.SDK_INT >= 28) {
+                add(ImageDecoderDecoder.Factory())
+            } else {
+                add(GifDecoder.Factory())
+            }
+        }.diskCache {
+            DiskCache.Builder().directory(imageCacheDir).build()
+        }.build()
 }