From 56d5d55d6e9f624968e5c16e395c4f3f93356112 Mon Sep 17 00:00:00 2001 From: Songzex <2402265378@qq.com> Date: Thu, 22 Oct 2026 13:22:35 +0800 Subject: [PATCH] =?UTF-8?q?+ios=E7=AB=AF=E7=9A=84=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ios/Classes/UsbCameraEngine.swift | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/packages/usb_camera_android/ios/Classes/UsbCameraEngine.swift b/packages/usb_camera_android/ios/Classes/UsbCameraEngine.swift index 6b4cd6f9..43cd9bb4 100644 --- a/packages/usb_camera_android/ios/Classes/UsbCameraEngine.swift +++ b/packages/usb_camera_android/ios/Classes/UsbCameraEngine.swift @@ -7,12 +7,14 @@ // 用 AVCaptureSession + AVCaptureVideoPreviewLayer 出画面。 // 协议与 Android 端完全对齐:deviceId 使用 device.uniqueID。 // -// 兼容性:整个 Runner / pod 的最低系统版本仍为 iOS 12, -// 因此对 iOS 17 才有的 API(.externalUnknown)一律用 #available 运行时保护, +// 兼容性:整个 Runner / pod 的最低系统版本仍为 iOS 12。 +// 外接摄像头类型用 rawValue 字符串构造(不直接引用 iOS 17 SDK 才有的静态符号), +// 保证旧 SDK 也能编译;枚举逻辑仍用 #available(iOS 17.0,*) 保护, // iOS 17 以下枚举返回空、isSupported 返回 false,走优雅降级。 // import AVFoundation +import CoreMedia import Flutter import UIKit @@ -39,10 +41,24 @@ final class UsbCameraEngine: NSObject, FlutterStreamHandler { // MARK: - 枚举 + /// 外接摄像头设备类型。 + /// + /// 用 rawValue 字符串构造,而不是直接引用 `.external` / `.externalUnknown` + /// 这两个 iOS 17 SDK 才有的静态符号——这样在较旧的 Xcode/SDK 下也能编译通过, + /// 运行时(iPadOS 17+ 真机/模拟器)再真正枚举到 UVC 设备。 + /// "AVCaptureDeviceTypeExternal" 是 iPadOS 17 对 UVC 外接摄像头的正式类型; + /// "AVCaptureDeviceTypeExternalUnknown" 为其过时同义词,一并带上做兼容。 + private var externalDeviceTypes: [AVCaptureDevice.DeviceType] { + [ + AVCaptureDevice.DeviceType(rawValue: "AVCaptureDeviceTypeExternal"), + AVCaptureDevice.DeviceType(rawValue: "AVCaptureDeviceTypeExternalUnknown"), + ] + } + private func discoverySession() -> AVCaptureDevice.DiscoverySession { if #available(iOS 17.0, *) { return AVCaptureDevice.DiscoverySession( - deviceTypes: [.externalUnknown], + deviceTypes: externalDeviceTypes, mediaType: .video, position: .unspecified )