升级 Gradle → 8.14、AGP → 8.11、Kotlin → 2.2.20 JVM 堆降到 -Xmx4G

android/app/src/main/AndroidManifest.xml

@@ -1,4 +1,5 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.gdfw.fxjk">
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -8,6 +9,10 @@
     <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28" />
 
     <uses-feature
         android:name="android.hardware.camera"

android/app/src/main/kotlin/com/gdfw/fxjk/recording/RecordingCameraController.kt

@@ -5,7 +5,6 @@ import android.util.Log
 import androidx.camera.core.CameraSelector
 import androidx.camera.core.Preview
 import androidx.camera.lifecycle.ProcessCameraProvider
-import androidx.camera.video.FileOutputOptions
 import androidx.camera.video.Quality
 import androidx.camera.video.QualitySelector
 import androidx.camera.video.Recorder
@@ -15,10 +14,6 @@ import androidx.camera.video.VideoRecordEvent
 import androidx.camera.view.PreviewView
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.LifecycleOwner
-import java.io.File
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
 import java.util.concurrent.Executor
 
 class RecordingCameraController(
@@ -39,6 +34,7 @@ class RecordingCameraController(
 
     private var recordingStartedAt: Long = 0L
     private var latestOutputPath: String? = null
+    private var pendingStopCallback: ((String?) -> Unit)? = null
 
     fun bindPreview(
         lifecycleOwner: LifecycleOwner,
@@ -118,6 +114,7 @@ class RecordingCameraController(
 
     fun startRecording(
         withAudio: Boolean,
+        displayName: String?,
         onStarted: (Boolean, String?) -> Unit,
     ) {
         val capture = videoCapture
@@ -131,9 +128,12 @@ class RecordingCameraController(
             return
         }
 
-        val outputFile = createOutputFile()
-        latestOutputPath = outputFile.absolutePath
-        val outputOptions = FileOutputOptions.Builder(outputFile).build()
+        val outputOptions =
+            RecordingOutputFactory.buildMediaStoreOutputOptions(
+                appContext,
+                displayName,
+            )
+        latestOutputPath = null
 
         val pending =
             capture.output.prepareRecording(appContext, outputOptions).apply {
@@ -171,6 +171,7 @@ class RecordingCameraController(
                                 ),
                             )
                         } else {
+                            latestOutputPath = event.outputResults.outputUri.toString()
                             updateStatus(
                                 RecordingStatus(
                                     RecordingState.PREVIEWING,
@@ -179,11 +180,14 @@ class RecordingCameraController(
                                 ),
                             )
                         }
+                        val stopCallback = pendingStopCallback
+                        pendingStopCallback = null
+                        stopCallback?.invoke(latestOutputPath)
                     }
                 }
             }
 
-        onStarted(true, latestOutputPath)
+        onStarted(true, latestOutputPath ?: "recording")
     }
 
     fun stopRecording(onStopped: (String?) -> Unit) {
@@ -193,6 +197,7 @@ class RecordingCameraController(
             return
         }
 
+        pendingStopCallback = onStopped
         updateStatus(
             RecordingStatus(
                 RecordingState.STOPPING,
@@ -202,7 +207,6 @@ class RecordingCameraController(
 
         recording.stop()
         activeRecording = null
-        onStopped(latestOutputPath)
     }
 
     fun unbind() {
@@ -221,16 +225,6 @@ class RecordingCameraController(
         return System.currentTimeMillis() - recordingStartedAt
     }
 
-    private fun createOutputFile(): File {
-        val moviesDir = File(appContext.getExternalFilesDir(null), "recordings")
-        if (!moviesDir.exists()) {
-            moviesDir.mkdirs()
-        }
-        val timestamp =
-            SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(Date())
-        return File(moviesDir, "REC_$timestamp.mp4")
-    }
-
     private fun updateStatus(next: RecordingStatus) {
         status = next
         statusListener?.invoke(next)

android/app/src/main/kotlin/com/gdfw/fxjk/recording/RecordingOutputFactory.kt

@@ -0,0 +1,51 @@
+package com.gdfw.fxjk.recording
+
+import android.content.ContentValues
+import android.content.Context
+import android.os.Build
+import android.provider.MediaStore
+import androidx.camera.video.MediaStoreOutputOptions
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+object RecordingOutputFactory {
+    private const val RELATIVE_PATH = "Movies/飞行极控"
+    private const val MIME_TYPE = "video/mp4"
+
+    fun buildMediaStoreOutputOptions(
+        context: Context,
+        displayName: String?,
+    ): MediaStoreOutputOptions {
+        val fileName = resolveFileName(displayName)
+        val contentValues =
+            ContentValues().apply {
+                put(MediaStore.MediaColumns.DISPLAY_NAME, fileName)
+                put(MediaStore.MediaColumns.MIME_TYPE, MIME_TYPE)
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                    put(MediaStore.Video.Media.RELATIVE_PATH, RELATIVE_PATH)
+                }
+            }
+
+        return MediaStoreOutputOptions.Builder(
+            context.contentResolver,
+            MediaStore.Video.Media.EXTERNAL_CONTENT_URI,
+        )
+            .setContentValues(contentValues)
+            .build()
+    }
+
+    fun resolveFileName(displayName: String?): String {
+        val trimmed = displayName?.trim().orEmpty()
+        if (trimmed.isNotEmpty()) {
+            return if (trimmed.lowercase(Locale.US).endsWith(".mp4")) {
+                trimmed
+            } else {
+                "$trimmed.mp4"
+            }
+        }
+        val timestamp =
+            SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(Date())
+        return "REC_$timestamp.mp4"
+    }
+}

android/app/src/main/kotlin/com/gdfw/fxjk/recording/RecordingPlatformHandler.kt

@@ -52,7 +52,8 @@ class RecordingPlatformHandler(
             "startRecording" -> {
                 val withAudio = call.argument<Boolean>("withAudio") ?: true
                 val enableDnd = call.argument<Boolean>("enableDoNotDisturb") ?: true
-                startRecording(withAudio, enableDnd, result)
+                val displayName = call.argument<String>("displayName")
+                startRecording(withAudio, enableDnd, displayName, result)
             }
             "stopRecording" -> stopRecording(result)
             "disposePreview" -> {
@@ -110,6 +111,7 @@ class RecordingPlatformHandler(
     private fun startRecording(
         withAudio: Boolean,
         enableDnd: Boolean,
+        displayName: String?,
         result: MethodChannel.Result,
     ) {
         val previewView = activity.recordingPreviewView
@@ -125,7 +127,7 @@ class RecordingPlatformHandler(
                 DoNotDisturbHelper.enable(activity)
             }
 
-            controller.startRecording(withAudio) { started, message ->
+            controller.startRecording(withAudio, displayName) { started, message ->
                 mainHandler.post {
                     if (started) {
                         startElapsedTicker()
@@ -170,12 +172,19 @@ class RecordingPlatformHandler(
             RecordingSession.stopForeground(activity)
             DoNotDisturbHelper.disable(activity)
             mainHandler.post {
-                result.success(
-                    mapOf(
-                        "outputPath" to path,
-                        "status" to controller.status.toMap(),
-                    ),
+                val gallerySaved =
+                    path != null &&
+                        controller.status.state != RecordingState.ERROR
+                val payload = mutableMapOf<String, Any?>(
+                    "outputPath" to path,
+                    "status" to controller.status.toMap(),
+                    "gallerySaved" to gallerySaved,
                 )
+                if (!gallerySaved) {
+                    payload["galleryErrorMessage"] =
+                        controller.status.message ?: "保存到相册失败"
+                }
+                result.success(payload)
             }
         }
     }

android/gradle.properties

@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=1G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
 # This builtInKotlin flag was added automatically by Flutter migrator

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip

android/settings.gradle.kts

@@ -19,8 +19,8 @@ pluginManagement {
 
 plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
-    id("com.android.application") version "8.9.1" apply false
-    id("org.jetbrains.kotlin.android") version "2.1.0" apply false
+    id("com.android.application") version "8.11.1" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
 }
 
 include(":app")