From 513482b27319855501fe601ac7240152fa930e5e Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Mon, 11 Jan 2021 10:04:01 +0100 Subject: [PATCH] Updated iOS part to support code filtering. Updated minSDK for example. --- example/ios/Runner.xcodeproj/project.pbxproj | 8 +-- example/pubspec.yaml | 2 +- ios/Classes/QRView.swift | 57 ++++++++++---------- 3 files changed, 33 insertions(+), 34 deletions(-) diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index 7cef5f2..3d2b2af 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -168,7 +168,7 @@ TargetAttributes = { 97C146ED1CF9000F007C117D = { CreatedOnToolsVersion = 7.3.1; - DevelopmentTeam = 5LSCTACHT8; + DevelopmentTeam = RCH2VG82SH; LastSwiftMigration = 1020; ProvisioningStyle = Automatic; }; @@ -372,7 +372,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = 5LSCTACHT8; + DEVELOPMENT_TEAM = RCH2VG82SH; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -510,7 +510,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = 5LSCTACHT8; + DEVELOPMENT_TEAM = RCH2VG82SH; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -541,7 +541,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = 5LSCTACHT8; + DEVELOPMENT_TEAM = RCH2VG82SH; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 6df5ea4..929acf1 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -3,7 +3,7 @@ description: Demonstrates how to use the flutter_qr plugin. publish_to: 'none' environment: - sdk: ">=2.3.0 <3.0.0" + sdk: ">=2.6.0 <3.0.0" dependencies: flutter: diff --git a/ios/Classes/QRView.swift b/ios/Classes/QRView.swift index daff69d..e2c65b6 100644 --- a/ios/Classes/QRView.swift +++ b/ios/Classes/QRView.swift @@ -104,36 +104,35 @@ public class QRView:NSObject,FlutterPlatformView { try self.scanner?.startScanning(with: self.cameraFacing, resultBlock: { [weak self] codes in if let codes = codes { for code in codes { -// var typeString: String; -// switch(code.type) { -// case AVMetadataObject.ObjectType.aztec: -// typeString = "AZTEC" -// case AVMetadataObject.ObjectType.code39: -// typeString = "CODE_39" -// case AVMetadataObject.ObjectType.code93: -// typeString = "CODE_93" -// case AVMetadataObject.ObjectType.code128: -// typeString = "CODE_128" -// case AVMetadataObject.ObjectType.dataMatrix: -// typeString = "DATA_MATRIX" -// case AVMetadataObject.ObjectType.ean8: -// typeString = "EAN_8" -// case AVMetadataObject.ObjectType.ean13: -// typeString = "EAN_13" -// case AVMetadataObject.ObjectType.itf14: -// typeString = "ITF" -// case AVMetadataObject.ObjectType.pdf417: -// typeString = "PDF_417" -// case AVMetadataObject.ObjectType.qr: -// typeString = "QR_CODE" -// case AVMetadataObject.ObjectType.upce: -// typeString = "UPC_E" -// default: -// return -// } + var typeString: String; + switch(code.type) { + case AVMetadataObject.ObjectType.aztec: + typeString = "AZTEC" + case AVMetadataObject.ObjectType.code39: + typeString = "CODE_39" + case AVMetadataObject.ObjectType.code93: + typeString = "CODE_93" + case AVMetadataObject.ObjectType.code128: + typeString = "CODE_128" + case AVMetadataObject.ObjectType.dataMatrix: + typeString = "DATA_MATRIX" + case AVMetadataObject.ObjectType.ean8: + typeString = "EAN_8" + case AVMetadataObject.ObjectType.ean13: + typeString = "EAN_13" + case AVMetadataObject.ObjectType.itf14: + typeString = "ITF" + case AVMetadataObject.ObjectType.pdf417: + typeString = "PDF_417" + case AVMetadataObject.ObjectType.qr: + typeString = "QR_CODE" + case AVMetadataObject.ObjectType.upce: + typeString = "UPC_E" + default: + return + } guard let stringValue = code.stringValue else { continue } - let typeString = code.type.rawValue - let result = ["code": stringValue, "type": typeString] + let result = ["code": stringValue, "type": typeString] if allowedBarcodeTypes.count == 0 || allowedBarcodeTypes.contains(code.type) { self?.channel.invokeMethod("onRecognizeQR", arguments: result) }