Merge branch 'linfeng/dev/compatibility/20260609' into linfeng/dev/2026612

2026-06-12 17:10:24 +08:00
parent 25ac9c4c35 7a654d54f0
commit c01ce1dca0
20 changed files with 209 additions and 154 deletions
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -30,8 +30,10 @@
 	<string>需要访问相机以显示预览并录制视频。</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>需要访问麦克风以录制视频声音；未授权时将静音录制。</string>
-	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string>需要将录制的视频保存到相册。</string>
+	<key>UIFileSharingEnabled</key>
+	<true/>
+	<key>LSSupportsOpeningDocumentsInPlace</key>
+	<true/>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>
--- a/ios/Runner/RecordingPlugin.swift
+++ b/ios/Runner/RecordingPlugin.swift
@@ -1,6 +1,5 @@
 import AVFoundation
 import Flutter
-import Photos
 import UIKit

 private enum RecordingState: String {
@@ -110,8 +109,8 @@ private final class RecordingCameraController: NSObject, AVCaptureFileOutputReco
  private var audioInput: AVCaptureDeviceInput?
  private var configured = false
  private var latestOutputPath: String?
-  private var latestGallerySaved = true
-  private var latestGalleryErrorMessage: String?
+  private var latestFileSaved = true
+  private var latestFileErrorMessage: String?
  private var pendingDisplayName: String?
  private var recordingStartedAt: Date?
  private var elapsedTimer: Timer?
@@ -216,10 +215,10 @@ private final class RecordingCameraController: NSObject, AVCaptureFileOutputReco
        }

        self.pendingDisplayName = displayName
-        self.latestGallerySaved = true
-        self.latestGalleryErrorMessage = nil
+        self.latestFileSaved = true
+        self.latestFileErrorMessage = nil
        let outputURL = try self.createOutputURL(displayName: displayName)
-        self.latestOutputPath = outputURL.lastPathComponent
+        self.latestOutputPath = outputURL.path
        self.recordingStartedAt = Date()
        self.updateStatus(RecordingStatus(state: .recording, outputPath: outputURL.path))
        self.movieOutput.startRecording(to: outputURL, recordingDelegate: self)
@@ -255,11 +254,11 @@ private final class RecordingCameraController: NSObject, AVCaptureFileOutputReco
          var payload: [String: Any] = [
            "outputPath": self.latestOutputPath as Any,
            "status": self.currentStatusMap(),
-            "gallerySaved": self.latestGallerySaved,
+            "fileSaved": self.latestFileSaved,
          ]
-          if !self.latestGallerySaved {
-            payload["galleryErrorMessage"] =
-              self.latestGalleryErrorMessage ?? "保存到相册失败"
+          if !self.latestFileSaved {
+            payload["fileErrorMessage"] =
+              self.latestFileErrorMessage ?? "保存到文件夹失败"
          }
          result(payload)
        }
@@ -370,8 +369,8 @@ private final class RecordingCameraController: NSObject, AVCaptureFileOutputReco
    pendingStopResult = nil

    if let error {
-      latestGallerySaved = false
-      latestGalleryErrorMessage = error.localizedDescription
+      latestFileSaved = false
+      latestFileErrorMessage = error.localizedDescription
      updateStatus(
        RecordingStatus(
          state: .error, outputPath: latestOutputPath, message: error.localizedDescription))
@@ -379,29 +378,30 @@ private final class RecordingCameraController: NSObject, AVCaptureFileOutputReco
      return
    }

-    saveVideoToPhotoLibrary(fileURL: outputFileURL) { [weak self] success, message in
-      guard let self else { return }
-      self.latestGallerySaved = success
-      self.latestGalleryErrorMessage = message
-      if success {
-        self.updateStatus(
-          RecordingStatus(
-            state: .previewing,
-            outputPath: self.latestOutputPath,
-            elapsedMillis: self.elapsedMillis()
-          )
+    latestFileSaved = true
+    latestFileErrorMessage = nil
+    latestOutputPath = outputFileURL.path
+    guard FileManager.default.fileExists(atPath: outputFileURL.path) else {
+      latestFileSaved = false
+      latestFileErrorMessage = "录制文件未生成"
+      updateStatus(
+        RecordingStatus(
+          state: .error,
+          outputPath: latestOutputPath,
+          message: latestFileErrorMessage
        )
-      } else {
-        self.updateStatus(
-          RecordingStatus(
-            state: .error,
-            outputPath: self.latestOutputPath,
-            message: message ?? "保存到相册失败"
-          )
-        )
-      }
-      self.finishStopRecording(stopResult: stopResult)
+      )
+      finishStopRecording(stopResult: stopResult)
+      return
    }
+    updateStatus(
+      RecordingStatus(
+        state: .previewing,
+        outputPath: latestOutputPath,
+        elapsedMillis: elapsedMillis()
+      )
+    )
+    finishStopRecording(stopResult: stopResult)
  }

  private func finishStopRecording(stopResult: FlutterResult?) {
@@ -411,68 +411,16 @@ private final class RecordingCameraController: NSObject, AVCaptureFileOutputReco
      var payload: [String: Any] = [
        "outputPath": self.latestOutputPath as Any,
        "status": self.currentStatusMap(),
-        "gallerySaved": self.latestGallerySaved,
+        "fileSaved": self.latestFileSaved,
      ]
-      if !self.latestGallerySaved {
-        payload["galleryErrorMessage"] =
-          self.latestGalleryErrorMessage ?? "保存到相册失败，请开启相册权限"
+      if !self.latestFileSaved {
+        payload["fileErrorMessage"] =
+          self.latestFileErrorMessage ?? "保存到文件夹失败，请检查文件保存权限"
      }
      stopResult?(payload)
    }
  }

-  private func saveVideoToPhotoLibrary(
-    fileURL: URL,
-    completion: @escaping (Bool, String?) -> Void
-  ) {
-    let performSave = {
-      PHPhotoLibrary.shared().performChanges({
-        PHAssetCreationRequest.forAsset().addResource(with: .video, fileURL: fileURL, options: nil)
-      }) { success, error in
-        if success {
-          try? FileManager.default.removeItem(at: fileURL)
-          completion(true, nil)
-        } else {
-          completion(false, error?.localizedDescription ?? "保存到相册失败")
-        }
-      }
-    }
-
-    if #available(iOS 14, *) {
-      let status = PHPhotoLibrary.authorizationStatus(for: .addOnly)
-      switch status {
-      case .authorized, .limited:
-        performSave()
-      case .notDetermined:
-        PHPhotoLibrary.requestAuthorization(for: .addOnly) { newStatus in
-          if newStatus == .authorized || newStatus == .limited {
-            performSave()
-          } else {
-            completion(false, "未授予相册权限")
-          }
-        }
-      default:
-        completion(false, "未授予相册权限")
-      }
-    } else {
-      let status = PHPhotoLibrary.authorizationStatus()
-      switch status {
-      case .authorized:
-        performSave()
-      case .notDetermined:
-        PHPhotoLibrary.requestAuthorization { newStatus in
-          if newStatus == .authorized {
-            performSave()
-          } else {
-            completion(false, "未授予相册权限")
-          }
-        }
-      default:
-        completion(false, "未授予相册权限")
-      }
-    }
-  }
-
  private func configureSession(withAudio: Bool) throws {
    if configured {
      try configureAudioInput(enabled: withAudio)
@@ -584,7 +532,30 @@ private final class RecordingCameraController: NSObject, AVCaptureFileOutputReco
    try FileManager.default.createDirectory(at: recordingsURL, withIntermediateDirectories: true)

    let fileName = Self.resolveFileName(displayName: displayName)
-    return recordingsURL.appendingPathComponent(fileName)
+    return uniqueOutputURL(in: recordingsURL, preferredFileName: fileName)
+  }
+
+  private func uniqueOutputURL(in directoryURL: URL, preferredFileName: String) -> URL {
+    let preferredURL = directoryURL.appendingPathComponent(preferredFileName)
+    guard !FileManager.default.fileExists(atPath: preferredURL.path) else {
+      let fileExtension = preferredURL.pathExtension
+      let baseName = preferredURL.deletingPathExtension().lastPathComponent
+      let timestamp = Self.fileNameDateFormatter.string(from: Date())
+
+      var index = 0
+      while true {
+        let suffix = index == 0 ? timestamp : "\(timestamp)_\(index)"
+        let nextName = fileExtension.isEmpty
+          ? "\(baseName)_\(suffix)"
+          : "\(baseName)_\(suffix).\(fileExtension)"
+        let nextURL = directoryURL.appendingPathComponent(nextName)
+        if !FileManager.default.fileExists(atPath: nextURL.path) {
+          return nextURL
+        }
+        index += 1
+      }
+    }
+    return preferredURL
  }

  private static func resolveFileName(displayName: String?) -> String {
@@ -602,6 +573,13 @@ private final class RecordingCameraController: NSObject, AVCaptureFileOutputReco
    return "REC_\(formatter.string(from: Date())).mov"
  }

+  private static let fileNameDateFormatter: DateFormatter = {
+    let formatter = DateFormatter()
+    formatter.locale = Locale(identifier: "en_US_POSIX")
+    formatter.dateFormat = "yyyyMMdd_HHmmss"
+    return formatter
+  }()
+
  private func updateStatus(_ next: RecordingStatus) {
    status = next
  }