Add QR scanner support for macOS with camera selection
- Refactor QR scanner into separate Scanner module for iOS and macOS - Add camera selection menu for devices with multiple cameras - Use Vision framework for QR detection on macOS - Remove tvOS QR scanner support (continuity camera) - Add camera entitlement and usage description for macOS - Fix minor issues in Intents and ExtensionProvider
This commit is contained in:
世界
@@ -0,0 +1,32 @@
|
||||
import AVFoundation
|
||||
import SwiftUI
|
||||
|
||||
public enum QRScanError: Error, LocalizedError {
|
||||
case cameraUnavailable
|
||||
case permissionDenied
|
||||
case scanFailed(Error)
|
||||
case invalidCode
|
||||
|
||||
public var errorDescription: String? {
|
||||
switch self {
|
||||
case .cameraUnavailable:
|
||||
return String(localized: "Camera is not available")
|
||||
case .permissionDenied:
|
||||
return String(localized: "Camera access denied")
|
||||
case let .scanFailed(error):
|
||||
return error.localizedDescription
|
||||
case .invalidCode:
|
||||
return String(localized: "Invalid QR code")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public struct QRScanResult: Sendable {
|
||||
public let string: String
|
||||
public let type: AVMetadataObject.ObjectType
|
||||
|
||||
public init(string: String, type: AVMetadataObject.ObjectType) {
|
||||
self.string = string
|
||||
self.type = type
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,227 @@
|
||||
#if os(iOS)
|
||||
|
||||
import AVFoundation
|
||||
import SwiftUI
|
||||
import UIKit
|
||||
|
||||
@MainActor
|
||||
final class QRScannerController: NSObject, ObservableObject {
|
||||
private var captureSession: AVCaptureSession?
|
||||
private var previewLayer: AVCaptureVideoPreviewLayer?
|
||||
private var metadataOutput: AVCaptureMetadataOutput?
|
||||
private var didFinishScanning = false
|
||||
|
||||
@Published var availableCameras: [AVCaptureDevice] = []
|
||||
@Published var selectedCamera: AVCaptureDevice?
|
||||
|
||||
let previewView = UIView()
|
||||
var onScan: ((Result<QRScanResult, QRScanError>) -> Void)?
|
||||
|
||||
override init() {
|
||||
super.init()
|
||||
previewView.backgroundColor = .black
|
||||
refreshCameraList()
|
||||
}
|
||||
|
||||
func refreshCameraList() {
|
||||
var deviceTypes: [AVCaptureDevice.DeviceType] = [
|
||||
.builtInWideAngleCamera,
|
||||
.builtInUltraWideCamera,
|
||||
.builtInTelephotoCamera,
|
||||
]
|
||||
if #available(iOS 17.0, *) {
|
||||
deviceTypes.append(.external)
|
||||
}
|
||||
let discoverySession = AVCaptureDevice.DiscoverySession(
|
||||
deviceTypes: deviceTypes,
|
||||
mediaType: .video,
|
||||
position: .unspecified
|
||||
)
|
||||
availableCameras = discoverySession.devices
|
||||
if selectedCamera == nil {
|
||||
selectedCamera = availableCameras.first
|
||||
}
|
||||
}
|
||||
|
||||
func selectCamera(_ camera: AVCaptureDevice) {
|
||||
guard camera.uniqueID != selectedCamera?.uniqueID else { return }
|
||||
selectedCamera = camera
|
||||
didFinishScanning = false
|
||||
|
||||
if captureSession != nil {
|
||||
stopScanning()
|
||||
captureSession = nil
|
||||
previewLayer?.removeFromSuperlayer()
|
||||
previewLayer = nil
|
||||
startScanning()
|
||||
}
|
||||
}
|
||||
|
||||
func startScanning() {
|
||||
guard captureSession == nil else {
|
||||
if captureSession?.isRunning == false {
|
||||
DispatchQueue.global(qos: .userInteractive).async { [weak self] in
|
||||
self?.captureSession?.startRunning()
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
switch AVCaptureDevice.authorizationStatus(for: .video) {
|
||||
case .authorized:
|
||||
setupCaptureSession()
|
||||
case .notDetermined:
|
||||
AVCaptureDevice.requestAccess(for: .video) { [weak self] granted in
|
||||
DispatchQueue.main.async {
|
||||
if granted {
|
||||
self?.setupCaptureSession()
|
||||
} else {
|
||||
self?.onScan?(.failure(.permissionDenied))
|
||||
}
|
||||
}
|
||||
}
|
||||
case .denied, .restricted:
|
||||
onScan?(.failure(.permissionDenied))
|
||||
@unknown default:
|
||||
onScan?(.failure(.cameraUnavailable))
|
||||
}
|
||||
}
|
||||
|
||||
func stopScanning() {
|
||||
DispatchQueue.global(qos: .userInteractive).async { [weak self] in
|
||||
self?.captureSession?.stopRunning()
|
||||
}
|
||||
}
|
||||
|
||||
func reset() {
|
||||
didFinishScanning = false
|
||||
}
|
||||
|
||||
private func setupCaptureSession() {
|
||||
let session = AVCaptureSession()
|
||||
|
||||
guard let videoCaptureDevice = selectedCamera ?? AVCaptureDevice.default(for: .video) else {
|
||||
onScan?(.failure(.cameraUnavailable))
|
||||
return
|
||||
}
|
||||
|
||||
let videoInput: AVCaptureDeviceInput
|
||||
do {
|
||||
videoInput = try AVCaptureDeviceInput(device: videoCaptureDevice)
|
||||
} catch {
|
||||
onScan?(.failure(.scanFailed(error)))
|
||||
return
|
||||
}
|
||||
|
||||
guard session.canAddInput(videoInput) else {
|
||||
onScan?(.failure(.cameraUnavailable))
|
||||
return
|
||||
}
|
||||
session.addInput(videoInput)
|
||||
|
||||
let metadataOutput = AVCaptureMetadataOutput()
|
||||
guard session.canAddOutput(metadataOutput) else {
|
||||
onScan?(.failure(.cameraUnavailable))
|
||||
return
|
||||
}
|
||||
session.addOutput(metadataOutput)
|
||||
metadataOutput.setMetadataObjectsDelegate(self, queue: .main)
|
||||
metadataOutput.metadataObjectTypes = [.qr]
|
||||
|
||||
self.metadataOutput = metadataOutput
|
||||
self.captureSession = session
|
||||
|
||||
let previewLayer = AVCaptureVideoPreviewLayer(session: session)
|
||||
previewLayer.videoGravity = .resizeAspectFill
|
||||
previewLayer.frame = previewView.bounds
|
||||
previewView.layer.addSublayer(previewLayer)
|
||||
self.previewLayer = previewLayer
|
||||
|
||||
DispatchQueue.global(qos: .userInteractive).async { [weak self] in
|
||||
self?.captureSession?.startRunning()
|
||||
}
|
||||
}
|
||||
|
||||
func updatePreviewFrame(_ frame: CGRect) {
|
||||
previewLayer?.frame = frame
|
||||
}
|
||||
}
|
||||
|
||||
extension QRScannerController: AVCaptureMetadataOutputObjectsDelegate {
|
||||
nonisolated func metadataOutput(
|
||||
_ output: AVCaptureMetadataOutput,
|
||||
didOutput metadataObjects: [AVMetadataObject],
|
||||
from connection: AVCaptureConnection
|
||||
) {
|
||||
Task { @MainActor in
|
||||
guard !didFinishScanning,
|
||||
let metadataObject = metadataObjects.first,
|
||||
let readableObject = metadataObject as? AVMetadataMachineReadableCodeObject,
|
||||
let stringValue = readableObject.stringValue
|
||||
else {
|
||||
return
|
||||
}
|
||||
|
||||
didFinishScanning = true
|
||||
AudioServicesPlaySystemSound(SystemSoundID(kSystemSoundID_Vibrate))
|
||||
|
||||
let result = QRScanResult(string: stringValue, type: readableObject.type)
|
||||
onScan?(.success(result))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct QRScannerControllerView: UIViewControllerRepresentable {
|
||||
let controller: QRScannerController
|
||||
|
||||
func makeUIViewController(context: Context) -> UIViewController {
|
||||
let viewController = QRScannerViewController(controller: controller)
|
||||
return viewController
|
||||
}
|
||||
|
||||
func updateUIViewController(_ uiViewController: UIViewController, context: Context) {}
|
||||
}
|
||||
|
||||
private class QRScannerViewController: UIViewController {
|
||||
let controller: QRScannerController
|
||||
|
||||
init(controller: QRScannerController) {
|
||||
self.controller = controller
|
||||
super.init(nibName: nil, bundle: nil)
|
||||
}
|
||||
|
||||
@available(*, unavailable)
|
||||
required init?(coder: NSCoder) {
|
||||
fatalError("init(coder:) has not been implemented")
|
||||
}
|
||||
|
||||
override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
view.backgroundColor = .black
|
||||
view.addSubview(controller.previewView)
|
||||
controller.previewView.translatesAutoresizingMaskIntoConstraints = false
|
||||
NSLayoutConstraint.activate([
|
||||
controller.previewView.topAnchor.constraint(equalTo: view.topAnchor),
|
||||
controller.previewView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
|
||||
controller.previewView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
|
||||
controller.previewView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
|
||||
])
|
||||
}
|
||||
|
||||
override func viewDidLayoutSubviews() {
|
||||
super.viewDidLayoutSubviews()
|
||||
controller.updatePreviewFrame(view.bounds)
|
||||
}
|
||||
|
||||
override func viewWillAppear(_ animated: Bool) {
|
||||
super.viewWillAppear(animated)
|
||||
controller.startScanning()
|
||||
}
|
||||
|
||||
override func viewWillDisappear(_ animated: Bool) {
|
||||
super.viewWillDisappear(animated)
|
||||
controller.stopScanning()
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,241 @@
|
||||
#if os(macOS)
|
||||
|
||||
import AppKit
|
||||
import AVFoundation
|
||||
import SwiftUI
|
||||
import Vision
|
||||
|
||||
@MainActor
|
||||
final class QRScannerController: NSObject, ObservableObject {
|
||||
private var captureSession: AVCaptureSession?
|
||||
private var previewLayer: AVCaptureVideoPreviewLayer?
|
||||
private var videoOutput: AVCaptureVideoDataOutput?
|
||||
private var didFinishScanning = false
|
||||
|
||||
@Published var availableCameras: [AVCaptureDevice] = []
|
||||
@Published var selectedCamera: AVCaptureDevice?
|
||||
|
||||
let previewView = NSView()
|
||||
var onScan: ((Result<QRScanResult, QRScanError>) -> Void)?
|
||||
|
||||
override init() {
|
||||
super.init()
|
||||
previewView.wantsLayer = true
|
||||
previewView.layer?.backgroundColor = NSColor.black.cgColor
|
||||
refreshCameraList()
|
||||
}
|
||||
|
||||
func refreshCameraList() {
|
||||
let discoverySession = AVCaptureDevice.DiscoverySession(
|
||||
deviceTypes: [.builtInWideAngleCamera, .externalUnknown],
|
||||
mediaType: .video,
|
||||
position: .unspecified
|
||||
)
|
||||
availableCameras = discoverySession.devices
|
||||
if selectedCamera == nil {
|
||||
selectedCamera = availableCameras.first
|
||||
}
|
||||
}
|
||||
|
||||
func selectCamera(_ camera: AVCaptureDevice) {
|
||||
guard camera.uniqueID != selectedCamera?.uniqueID else { return }
|
||||
selectedCamera = camera
|
||||
didFinishScanning = false
|
||||
|
||||
if captureSession != nil {
|
||||
stopScanning()
|
||||
captureSession = nil
|
||||
previewLayer?.removeFromSuperlayer()
|
||||
previewLayer = nil
|
||||
startScanning()
|
||||
}
|
||||
}
|
||||
|
||||
func startScanning() {
|
||||
guard captureSession == nil else {
|
||||
if captureSession?.isRunning == false {
|
||||
DispatchQueue.global(qos: .userInteractive).async { [weak self] in
|
||||
self?.captureSession?.startRunning()
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
switch AVCaptureDevice.authorizationStatus(for: .video) {
|
||||
case .authorized:
|
||||
setupCaptureSession()
|
||||
case .notDetermined:
|
||||
AVCaptureDevice.requestAccess(for: .video) { [weak self] granted in
|
||||
DispatchQueue.main.async {
|
||||
if granted {
|
||||
self?.setupCaptureSession()
|
||||
} else {
|
||||
self?.onScan?(.failure(.permissionDenied))
|
||||
}
|
||||
}
|
||||
}
|
||||
case .denied, .restricted:
|
||||
onScan?(.failure(.permissionDenied))
|
||||
@unknown default:
|
||||
onScan?(.failure(.cameraUnavailable))
|
||||
}
|
||||
}
|
||||
|
||||
func stopScanning() {
|
||||
DispatchQueue.global(qos: .userInteractive).async { [weak self] in
|
||||
self?.captureSession?.stopRunning()
|
||||
}
|
||||
}
|
||||
|
||||
func reset() {
|
||||
didFinishScanning = false
|
||||
}
|
||||
|
||||
private func setupCaptureSession() {
|
||||
let session = AVCaptureSession()
|
||||
|
||||
guard let videoCaptureDevice = selectedCamera ?? AVCaptureDevice.default(for: .video) else {
|
||||
onScan?(.failure(.cameraUnavailable))
|
||||
return
|
||||
}
|
||||
|
||||
let videoInput: AVCaptureDeviceInput
|
||||
do {
|
||||
videoInput = try AVCaptureDeviceInput(device: videoCaptureDevice)
|
||||
} catch {
|
||||
onScan?(.failure(.scanFailed(error)))
|
||||
return
|
||||
}
|
||||
|
||||
guard session.canAddInput(videoInput) else {
|
||||
onScan?(.failure(.cameraUnavailable))
|
||||
return
|
||||
}
|
||||
session.addInput(videoInput)
|
||||
|
||||
let videoOutput = AVCaptureVideoDataOutput()
|
||||
videoOutput.videoSettings = [
|
||||
kCVPixelBufferPixelFormatTypeKey as String: kCVPixelFormatType_32BGRA,
|
||||
]
|
||||
videoOutput.setSampleBufferDelegate(self, queue: DispatchQueue(label: "QRScannerQueue"))
|
||||
|
||||
guard session.canAddOutput(videoOutput) else {
|
||||
onScan?(.failure(.cameraUnavailable))
|
||||
return
|
||||
}
|
||||
session.addOutput(videoOutput)
|
||||
|
||||
self.videoOutput = videoOutput
|
||||
self.captureSession = session
|
||||
|
||||
let previewLayer = AVCaptureVideoPreviewLayer(session: session)
|
||||
previewLayer.videoGravity = .resizeAspectFill
|
||||
previewLayer.frame = previewView.bounds
|
||||
previewView.layer?.addSublayer(previewLayer)
|
||||
self.previewLayer = previewLayer
|
||||
|
||||
DispatchQueue.global(qos: .userInteractive).async { [weak self] in
|
||||
self?.captureSession?.startRunning()
|
||||
}
|
||||
}
|
||||
|
||||
func updatePreviewFrame(_ frame: CGRect) {
|
||||
previewLayer?.frame = frame
|
||||
}
|
||||
|
||||
private func processQRCode(_ payloadString: String) {
|
||||
guard !didFinishScanning else { return }
|
||||
didFinishScanning = true
|
||||
|
||||
DispatchQueue.main.async { [weak self] in
|
||||
NSSound.beep()
|
||||
let result = QRScanResult(string: payloadString, type: .qr)
|
||||
self?.onScan?(.success(result))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extension QRScannerController: AVCaptureVideoDataOutputSampleBufferDelegate {
|
||||
nonisolated func captureOutput(
|
||||
_ output: AVCaptureOutput,
|
||||
didOutput sampleBuffer: CMSampleBuffer,
|
||||
from connection: AVCaptureConnection
|
||||
) {
|
||||
guard let pixelBuffer = CMSampleBufferGetImageBuffer(sampleBuffer) else { return }
|
||||
|
||||
let request = VNDetectBarcodesRequest { [weak self] request, _ in
|
||||
guard let results = request.results as? [VNBarcodeObservation] else { return }
|
||||
|
||||
for result in results {
|
||||
if result.symbology == .qr, let payload = result.payloadStringValue {
|
||||
self?.processQRCode(payload)
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
request.symbologies = [.qr]
|
||||
|
||||
let handler = VNImageRequestHandler(cvPixelBuffer: pixelBuffer, options: [:])
|
||||
try? handler.perform([request])
|
||||
}
|
||||
}
|
||||
|
||||
struct QRScannerControllerView: NSViewControllerRepresentable {
|
||||
let controller: QRScannerController
|
||||
|
||||
func makeNSViewController(context: Context) -> NSViewController {
|
||||
let viewController = QRScannerViewController(controller: controller)
|
||||
return viewController
|
||||
}
|
||||
|
||||
func updateNSViewController(_ nsViewController: NSViewController, context: Context) {}
|
||||
}
|
||||
|
||||
private class QRScannerViewController: NSViewController {
|
||||
let controller: QRScannerController
|
||||
|
||||
init(controller: QRScannerController) {
|
||||
self.controller = controller
|
||||
super.init(nibName: nil, bundle: nil)
|
||||
}
|
||||
|
||||
@available(*, unavailable)
|
||||
required init?(coder: NSCoder) {
|
||||
fatalError("init(coder:) has not been implemented")
|
||||
}
|
||||
|
||||
override func loadView() {
|
||||
view = NSView()
|
||||
view.wantsLayer = true
|
||||
view.layer?.backgroundColor = NSColor.black.cgColor
|
||||
}
|
||||
|
||||
override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
view.addSubview(controller.previewView)
|
||||
controller.previewView.translatesAutoresizingMaskIntoConstraints = false
|
||||
NSLayoutConstraint.activate([
|
||||
controller.previewView.topAnchor.constraint(equalTo: view.topAnchor),
|
||||
controller.previewView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
|
||||
controller.previewView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
|
||||
controller.previewView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
|
||||
])
|
||||
}
|
||||
|
||||
override func viewDidLayout() {
|
||||
super.viewDidLayout()
|
||||
controller.updatePreviewFrame(view.bounds)
|
||||
}
|
||||
|
||||
override func viewWillAppear() {
|
||||
super.viewWillAppear()
|
||||
controller.startScanning()
|
||||
}
|
||||
|
||||
override func viewWillDisappear() {
|
||||
super.viewWillDisappear()
|
||||
controller.stopScanning()
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,127 @@
|
||||
#if !os(tvOS)
|
||||
|
||||
import AVFoundation
|
||||
import Library
|
||||
import SwiftUI
|
||||
|
||||
@MainActor
|
||||
public struct QRScannerView: View {
|
||||
@Environment(\.dismiss) private var dismiss
|
||||
@State private var alert: AlertState?
|
||||
@StateObject private var controller = QRScannerController()
|
||||
|
||||
private let onScan: (QRScanResult) -> Void
|
||||
|
||||
public init(onScan: @escaping (QRScanResult) -> Void) {
|
||||
self.onScan = onScan
|
||||
}
|
||||
|
||||
public var body: some View {
|
||||
#if os(iOS)
|
||||
iOSBody
|
||||
#elseif os(macOS)
|
||||
macOSBody
|
||||
#endif
|
||||
}
|
||||
|
||||
#if os(iOS)
|
||||
private var iOSBody: some View {
|
||||
NavigationStackCompat {
|
||||
QRScannerControllerView(controller: controller)
|
||||
.ignoresSafeArea()
|
||||
.navigationTitle("Scan QR Code")
|
||||
.navigationBarTitleDisplayMode(.inline)
|
||||
.toolbar {
|
||||
ToolbarItem(placement: .cancellationAction) {
|
||||
Button("Cancel") { dismiss() }
|
||||
}
|
||||
ToolbarItem(placement: .primaryAction) {
|
||||
Menu {
|
||||
if controller.availableCameras.count > 1 {
|
||||
Menu("Camera") {
|
||||
ForEach(controller.availableCameras, id: \.uniqueID) { camera in
|
||||
Button {
|
||||
controller.selectCamera(camera)
|
||||
} label: {
|
||||
if camera.uniqueID == controller.selectedCamera?.uniqueID {
|
||||
Label(camera.localizedName, systemImage: "checkmark")
|
||||
} else {
|
||||
Text(camera.localizedName)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} label: {
|
||||
Image(systemName: "ellipsis.circle")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.alert($alert)
|
||||
.onAppear {
|
||||
controller.onScan = handleScanResult
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#if os(macOS)
|
||||
private var macOSBody: some View {
|
||||
VStack(spacing: 0) {
|
||||
QRScannerControllerView(controller: controller)
|
||||
.frame(minWidth: 400, minHeight: 300)
|
||||
|
||||
Divider()
|
||||
|
||||
HStack {
|
||||
if controller.availableCameras.count > 1 {
|
||||
Picker("Camera", selection: Binding(
|
||||
get: { controller.selectedCamera },
|
||||
set: { camera in
|
||||
if let camera {
|
||||
controller.selectCamera(camera)
|
||||
}
|
||||
}
|
||||
)) {
|
||||
ForEach(controller.availableCameras, id: \.uniqueID) { camera in
|
||||
Text(camera.localizedName).tag(camera as AVCaptureDevice?)
|
||||
}
|
||||
}
|
||||
.frame(maxWidth: 250)
|
||||
}
|
||||
Spacer()
|
||||
Button("Cancel") { dismiss() }
|
||||
.keyboardShortcut(.cancelAction)
|
||||
}
|
||||
.padding()
|
||||
}
|
||||
.alert($alert)
|
||||
.onAppear {
|
||||
controller.onScan = handleScanResult
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
private func handleScanResult(_ result: Result<QRScanResult, QRScanError>) {
|
||||
switch result {
|
||||
case let .success(scanResult):
|
||||
dismiss()
|
||||
onScan(scanResult)
|
||||
case let .failure(error):
|
||||
switch error {
|
||||
case .permissionDenied:
|
||||
alert = AlertState(
|
||||
title: String(localized: "Camera Access Denied"),
|
||||
message: String(localized: "Please enable camera access in Settings to scan QR codes.")
|
||||
)
|
||||
default:
|
||||
alert = AlertState(
|
||||
title: String(localized: "Scanner Error"),
|
||||
message: error.localizedDescription
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user