2.0.8.1

Author: LCLTE

app/build.gradle.kts

@@ -17,8 +17,8 @@ android {
         applicationId = "com.donut.mixfile"
         minSdk = 26
         targetSdk = 36
-        versionCode = 153
-        versionName = "2.0.8"
+        versionCode = 154
+        versionName = "2.0.8.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

app/src/main/java/com/donut/mixfile/activity/video/VideoActivity.kt

@@ -1,12 +1,12 @@
 package com.donut.mixfile.activity.video
 
+import android.net.Uri
 import android.os.Bundle
 import android.view.View
 import android.view.WindowManager
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.material3.Text
-import androidx.core.net.toUri
 import com.donut.mixfile.activity.video.player.VideoPlayerScreen
 import com.donut.mixfile.ui.theme.MainTheme
 import com.donut.mixfile.util.cachedMutableOf
@@ -21,30 +21,31 @@ data class VideoHistory(val time: Long, val hash: String, val episode: Int)
 
 class VideoActivity : MixActivity("video") {
 
+    companion object {
+        var videoList = listOf<Uri>()
+        var videoHash = ""
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        val videoPlayerUrl = intent.getStringExtra("url") ?: ""
-        val fileList = intent.getStringExtra("fileList") ?: ""
-        var videos = listOf(videoPlayerUrl.toUri())
-        val videoHash = intent.getStringExtra("hash") ?: videoPlayerUrl
-        if (fileList.isNotEmpty()) {
-            videos = fileList.split("\n").map { it.toUri() }
-        }
+
         enterFullScreen()
         // 设置保持屏幕常亮
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
         enableEdgeToEdge()
         setContent {
             MainTheme {
-                if (videos.isEmpty()) {
+                if (videoList.isEmpty()) {
                     Text(text = "视频url为空")
                     return@MainTheme
                 }
                 VideoPlayerScreen(
-                    videoUris = videos,
+                    videoUris = videoList,
                     hash = videoHash
                 )
+                videoList = listOf()
+                videoHash = ""
                 return@MainTheme
             }
         }

app/src/main/java/com/donut/mixfile/util/file/FileDialog.kt

@@ -109,10 +109,9 @@ fun showFileInfoDialog(
                                 startActivity(intent)
                                 return@Chip
                             }
-                            val intent = Intent(app, VideoActivity::class.java).apply {
-                                putExtra("url", log.downloadUrl)
-                                putExtra("hash", shareInfo.toString().hashSHA256().toHex())
-                            }
+                            val intent = Intent(app, VideoActivity::class.java)
+                            VideoActivity.videoList = listOf(log.downloadUrl.toUri())
+                            VideoActivity.videoHash = shareInfo.toString().hashSHA256().toHex()
                             startActivity(intent)
                         }
                     }

app/src/main/java/com/donut/mixfile/util/file/FileImport.kt

@@ -12,6 +12,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import androidx.core.net.toUri
 import com.donut.mixfile.activity.video.VideoActivity
 import com.donut.mixfile.app
 import com.donut.mixfile.server.core.objects.FileDataLog
@@ -83,13 +84,9 @@ fun playVideoList(videoList: List<FileDataLog>) {
     val playList = videoList.sortedWith { file1, file2 ->
         file1.name.compareByName(file2.name)
     }
-    val intent = Intent(app, VideoActivity::class.java).apply {
-        putExtra(
-            "fileList",
-            playList.joinToString("\n") { it.downloadUrl }
-        )
-        putExtra("hash", playList.hashSHA256())
-    }
+    val intent = Intent(app, VideoActivity::class.java)
+    VideoActivity.videoList = playList.map { it.downloadUrl.toUri() }
+    VideoActivity.videoHash = playList.hashSHA256()
     startActivity(intent)
 }