[optimize] Optimize UI performance

2025-08-26 13:22:16 +08:00
parent 6d89a6f5c2
commit 3ed53ee593
12 changed files with 90 additions and 104 deletions
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -26,6 +26,7 @@ android {
                getDefaultProguardFile("proguard-android-optimize.txt"),
                "proguard-rules.pro"
            )
+            signingConfig = signingConfigs.getByName("debug")
        }
    }
    compileOptions {
@@ -67,6 +68,7 @@ dependencies {
    implementation(libs.androidx.ui.graphics)
    implementation(libs.androidx.ui.tooling.preview)
    implementation(libs.androidx.material3)
+    implementation(libs.androidx.media3.datasource.okhttp)
    testImplementation(libs.junit)
    androidTestImplementation(libs.androidx.junit)
    androidTestImplementation(libs.androidx.espresso.core)
--- a/app/src/main/java/com/acitelight/aether/helper/MemoryVideo.kt
+++ b/app/src/main/java/com/acitelight/aether/helper/MemoryVideo.kt
@@ -1,66 +0,0 @@
-import android.content.Context
-import android.view.ViewGroup
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.viewinterop.AndroidView
-import androidx.media3.common.MediaItem
-import androidx.media3.common.util.UnstableApi
-import androidx.media3.datasource.ByteArrayDataSource
-import androidx.media3.datasource.DataSource
-import androidx.media3.exoplayer.ExoPlayer
-import androidx.media3.exoplayer.source.ProgressiveMediaSource
-import androidx.media3.ui.PlayerView
-
-
-@androidx.annotation.OptIn(UnstableApi::class)
-@Composable
-private fun InMemoryVideoPlayer(
-    modifier: Modifier = Modifier,
-    videoData: ByteArray
-) {
-    val context = LocalContext.current
-
-    val exoPlayer = remember(context, videoData) {
-        createExoPlayer(context, videoData)
-    }
-
-    DisposableEffect(Unit) {
-        onDispose {
-            exoPlayer.release()
-        }
-    }
-
-    AndroidView(
-        modifier = modifier,
-        factory = {
-            PlayerView(it).apply {
-                player = exoPlayer
-                layoutParams = ViewGroup.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    ViewGroup.LayoutParams.MATCH_PARENT
-                )
-            }
-        }
-    )
-}
-
-@androidx.annotation.OptIn(UnstableApi::class)
-private fun createExoPlayer(context: Context, videoData: ByteArray): ExoPlayer {
-    val byteArrayDataSource = ByteArrayDataSource(videoData)
-
-    val factory = DataSource.Factory {
-        byteArrayDataSource
-    }
-
-    val mediaSource = ProgressiveMediaSource.Factory(factory)
-        .createMediaSource(MediaItem.fromUri("data://local/video.mp4"))
-
-    return ExoPlayer.Builder(context).build().apply {
-        setMediaSource(mediaSource)
-        prepare()
-        playWhenReady = false
-    }
-}
--- a/app/src/main/java/com/acitelight/aether/service/ApiClient.kt
+++ b/app/src/main/java/com/acitelight/aether/service/ApiClient.kt
@@ -69,6 +69,11 @@ object ApiClient {
        }
    }

+    fun createOkHttp(): OkHttpClient
+    {
+        return createOkHttpClientWithDynamicCert(loadCertificateFromString(cert))
+    }
+
    private fun createRetrofit(): Retrofit {
        val okHttpClient = createOkHttpClientWithDynamicCert(loadCertificateFromString(cert))

--- a/app/src/main/java/com/acitelight/aether/service/MediaManager.kt
+++ b/app/src/main/java/com/acitelight/aether/service/MediaManager.kt
@@ -23,16 +23,17 @@ object MediaManager
        }
    }

-    suspend fun listVideos(klass: String): List<Video>
+    suspend fun listVideos(klass: String, callback: (Video) -> Unit)
    {
-        try {
-            val j = ApiClient.api!!.queryVideoClasses(klass, token)
-            return j.map{
-                queryVideo(klass, it)!!
-            }.toList()
-        }catch (e: Exception)
+        val j = ApiClient.api!!.queryVideoClasses(klass, token)
+        for(it in j)
        {
-            return listOf()
+            try {
+                callback(queryVideo(klass, it)!!)
+            }catch (e: Exception)
+            {
+
+            }
        }
    }

--- a/app/src/main/java/com/acitelight/aether/view/HomeScreen.kt
+++ b/app/src/main/java/com/acitelight/aether/view/HomeScreen.kt
@@ -58,7 +58,7 @@ fun HomeScreen(homeScreenViewModel: HomeScreenViewModel = viewModel(), navContro
                            Global.sameClassVideos = RecentManager.recent
                            val route = "video_player_route/${ "${i.klass}/${i.id}".toHex() }"
                            navController.navigate(route)
-                        })
+                        }, homeScreenViewModel.imageLoader!!)
                    HorizontalDivider(Modifier.padding(vertical = 8.dp).alpha(0.25f), 1.dp, DividerDefaults.color)
                }
            }
--- a/app/src/main/java/com/acitelight/aether/view/VideoPlayer.kt
+++ b/app/src/main/java/com/acitelight/aether/view/VideoPlayer.kt
@@ -88,6 +88,7 @@ import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.sp
+import coil3.ImageLoader
 import coil3.compose.AsyncImage
 import coil3.request.ImageRequest
 import com.acitelight.aether.Global
@@ -572,7 +573,7 @@ fun VideoPlayerPortal(videoPlayerViewModel: VideoPlayerViewModel, navController:
                            videoPlayerViewModel._player?.pause()
                            val route = "video_player_route/${ "${i.klass}/${i.id}".toHex() }"
                            navController.navigate(route)
-                        })
+                        }, videoPlayerViewModel.imageLoader!!)
                    HorizontalDivider(Modifier.padding(vertical = 8.dp).alpha(0.25f), 1.dp, DividerDefaults.color)
                }
            }
@@ -683,13 +684,13 @@ fun HorizontalGallery(videoPlayerViewModel: VideoPlayerViewModel)
        contentPadding = PaddingValues(horizontal = 24.dp)
    ) {
        items(videoPlayerViewModel.video?.getGallery() ?: listOf()) { it ->
-            SingleImageItem(img = it)
+            SingleImageItem(img = it, videoPlayerViewModel.imageLoader!!)
        }
    }
 }

@Composable
-fun SingleImageItem(img: KeyImage) {
+fun SingleImageItem(img: KeyImage, imageLoader: ImageLoader) {
    AsyncImage(
        model = ImageRequest.Builder(LocalContext.current)
            .data(img.url)
@@ -700,7 +701,8 @@ fun SingleImageItem(img: KeyImage) {
        modifier = Modifier
            .fillMaxWidth()
            .clip(RoundedCornerShape(12.dp)),
-        contentScale = ContentScale.Crop
+        contentScale = ContentScale.Crop,
+        imageLoader = imageLoader
    )
 }

@@ -912,7 +914,7 @@ fun VideoPlayerLandscape(videoPlayerViewModel: VideoPlayerViewModel)
 }

@Composable
-fun MiniVideoCard(modifier: Modifier, video: Video, onClick: () -> Unit)
+fun MiniVideoCard(modifier: Modifier, video: Video, onClick: () -> Unit, imageLoader: ImageLoader)
 {
    var isImageLoaded by remember { mutableStateOf(false) }
    Card(
@@ -943,7 +945,8 @@ fun MiniVideoCard(modifier: Modifier, video: Video, onClick: () -> Unit)
                modifier = Modifier
                    .width(128.dp).fillMaxHeight()
                    .clip(RoundedCornerShape(8.dp)),
-                contentScale = ContentScale.Crop
+                contentScale = ContentScale.Crop,
+                imageLoader = imageLoader
            )

            Column (
--- a/app/src/main/java/com/acitelight/aether/view/VideoScreen.kt
+++ b/app/src/main/java/com/acitelight/aether/view/VideoScreen.kt
@@ -72,7 +72,7 @@ fun String.hexToString(charset: Charset = Charsets.UTF_8): String {
@Composable
 fun VideoScreen(videoScreenViewModel: VideoScreenViewModel = viewModel(), navController: NavHostController)
 {
-    val videoList by videoScreenViewModel.videos.collectAsState()
+    videoScreenViewModel.SetupClient()

    Column(
        modifier = Modifier.fillMaxSize() // 或至少 fillMaxWidth()
@@ -86,7 +86,7 @@ fun VideoScreen(videoScreenViewModel: VideoScreenViewModel = viewModel(), navCon
            horizontalArrangement = Arrangement.spacedBy(8.dp)
        )
        {
-            items(videoList) { video ->
+            items(videoScreenViewModel.videos) { video ->
                VideoCard(video, navController, videoScreenViewModel)
            }
        }
@@ -115,15 +115,13 @@ fun TopRow(videoScreenViewModel: VideoScreenViewModel)

@Composable
 fun VideoCard(video: Video, navController: NavHostController, videoScreenViewModel: VideoScreenViewModel) {
-    val videoList by videoScreenViewModel.videos.collectAsState()
-
    Card(
        shape = RoundedCornerShape(6.dp),
        modifier = Modifier
            .fillMaxWidth()
            .wrapContentHeight(),
        onClick = {
-            Global.sameClassVideos = videoList
+            Global.sameClassVideos = videoScreenViewModel.videos
            val route = "video_player_route/${ "${video.klass}/${video.id}".toHex() }"
            navController.navigate(route)
        }
@@ -142,7 +140,8 @@ fun VideoCard(video: Video, navController: NavHostController, videoScreenViewMod
                    contentDescription = null,
                    modifier = Modifier
                        .fillMaxSize(),
-                    contentScale = ContentScale.Crop
+                    contentScale = ContentScale.Crop,
+                    imageLoader = videoScreenViewModel.imageLoader!!
                )

                Text(
--- a/app/src/main/java/com/acitelight/aether/viewModel/HomeScreenViewModel.kt
+++ b/app/src/main/java/com/acitelight/aether/viewModel/HomeScreenViewModel.kt
@@ -11,11 +11,15 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
+import coil3.ImageLoader
+import coil3.network.okhttp.OkHttpNetworkFetcherFactory
+import okhttp3.OkHttpClient
 import com.acitelight.aether.Global
 import com.acitelight.aether.dataStore
 import com.acitelight.aether.model.Video
 import com.acitelight.aether.model.VideoQueryIndex
 import com.acitelight.aether.service.ApiClient
+import com.acitelight.aether.service.ApiClient.createOkHttp
 import com.acitelight.aether.service.AuthManager
 import com.acitelight.aether.service.MediaManager
 import com.acitelight.aether.service.MediaManager.token
@@ -52,6 +56,7 @@ class HomeScreenViewModel(application: Application) : AndroidViewModel(applicati
    }

    var _init = false
+    var imageLoader: ImageLoader? = null;

    @Composable
    fun Init(){
@@ -59,6 +64,11 @@ class HomeScreenViewModel(application: Application) : AndroidViewModel(applicati
        _init = true

        val context = LocalContext.current
+        imageLoader =  ImageLoader.Builder(context)
+            .components {
+                add(OkHttpNetworkFetcherFactory(createOkHttp()))
+            }
+            .build()
        remember {
            viewModelScope.launch {
                RecentManager.Query(context)
--- a/app/src/main/java/com/acitelight/aether/viewModel/VideoPlayerViewModel.kt
+++ b/app/src/main/java/com/acitelight/aether/viewModel/VideoPlayerViewModel.kt
@@ -16,10 +16,15 @@ import androidx.media3.common.MediaItem
 import androidx.media3.common.Player
 import androidx.media3.common.Player.STATE_READY
 import androidx.media3.common.util.UnstableApi
+import androidx.media3.datasource.okhttp.OkHttpDataSource
 import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
+import coil3.ImageLoader
+import coil3.network.okhttp.OkHttpNetworkFetcherFactory
 import com.acitelight.aether.Global
 import com.acitelight.aether.model.Video
 import com.acitelight.aether.model.VideoQueryIndex
+import com.acitelight.aether.service.ApiClient.createOkHttp
 import com.acitelight.aether.service.MediaManager
 import com.acitelight.aether.service.RecentManager
 import com.acitelight.aether.view.hexToString
@@ -46,6 +51,10 @@ class VideoPlayerViewModel() : ViewModel()
    var renderedFirst = false
    var video: Video? = null

+    val dataSourceFactory = OkHttpDataSource.Factory(createOkHttp())
+    var imageLoader: ImageLoader? = null;
+
+    @OptIn(UnstableApi::class)
    @Composable
    fun Init(videoId: String)
    {
@@ -53,11 +62,20 @@ class VideoPlayerViewModel() : ViewModel()
        val context = LocalContext.current
        val v = videoId.hexToString()

+        imageLoader =  ImageLoader.Builder(context)
+            .components {
+                add(OkHttpNetworkFetcherFactory(createOkHttp()))
+            }
+            .build()
+
        remember {
            viewModelScope.launch {
                video = MediaManager.queryVideo(v.split("/")[0], v.split("/")[1])!!
                RecentManager.Push(context, VideoQueryIndex(v.split("/")[0], v.split("/")[1]))
-                _player = ExoPlayer.Builder(context).build().apply {
+                _player = ExoPlayer
+                    .Builder(context)
+                    .setMediaSourceFactory(DefaultMediaSourceFactory(dataSourceFactory))
+                    .build().apply {
                    val url = video?.getVideo() ?: ""
                    val mediaItem = MediaItem.fromUri(url)
                    setMediaItem(mediaItem)
--- a/app/src/main/java/com/acitelight/aether/viewModel/VideoScreenViewModel.kt
+++ b/app/src/main/java/com/acitelight/aether/viewModel/VideoScreenViewModel.kt
@@ -1,18 +1,24 @@
 package com.acitelight.aether.viewModel

 import android.app.Application
+import androidx.compose.runtime.Composable
 import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.ui.platform.LocalContext
 import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import coil3.ImageLoader
+import coil3.network.okhttp.OkHttpNetworkFetcherFactory
 import com.acitelight.aether.Global
 import com.acitelight.aether.dataStore
 import com.acitelight.aether.model.Video
 import com.acitelight.aether.service.ApiClient
+import com.acitelight.aether.service.ApiClient.createOkHttp
 import com.acitelight.aether.service.AuthManager
 import com.acitelight.aether.service.MediaManager
 import kotlinx.coroutines.flow.Flow
@@ -39,15 +45,27 @@ class VideoScreenViewModel(application: Application) : AndroidViewModel(applicat
    private val _tabIndex = mutableIntStateOf(0)
    val tabIndex: State<Int> = _tabIndex

-    private val _videos = MutableStateFlow<List<Video>>(emptyList())
-    val videos: StateFlow<List<Video>> = _videos
+    val videos = mutableStateListOf<Video>()
    private val _klasses = MutableStateFlow<List<String>>(emptyList())
    val klasses: StateFlow<List<String>> = _klasses;
+    var imageLoader: ImageLoader? = null;
+
+    @Composable
+    fun SetupClient()
+    {
+        val context = LocalContext.current
+        imageLoader =  ImageLoader.Builder(context)
+            .components {
+                add(OkHttpNetworkFetcherFactory(createOkHttp()))
+            }
+            .build()
+    }

    suspend fun init() {
        _klasses.value = MediaManager.listVideoKlasses()
-        val p = MediaManager.listVideos(_klasses.value.first())
-        _videos.value = p
+        MediaManager.listVideos(_klasses.value.first()){
+            v -> videos.add(videos.size, v)
+        }
    }

    fun setTabIndex(index: Int)
@@ -55,8 +73,11 @@ class VideoScreenViewModel(application: Application) : AndroidViewModel(applicat
        viewModelScope.launch()
        {
            _tabIndex.intValue = index;
-            val p = MediaManager.listVideos(_klasses.value[index])
-            _videos.value = p
+            videos.clear()
+            MediaManager.listVideos(_klasses.value[index])
+            {
+                v -> videos.add(videos.size, v)
+            }
        }
    }