Bläddra i källkod

Merge pull request #247 from juliuscanute/240-green-dot-ios

240 green dot ios
flutter-beta
Julian Steenbakker 5 år sedan
committed by GitHub
förälder
incheckning
7fc3c3e7a2
Ingen känd nyckel hittad för denna signaturen i databasen GPG-nyckel ID: 4AEE18F83AFDEB23
4 ändrade filer med 21 tillägg och 7 borttagningar
  1. +2
    -0
      android/src/main/kotlin/net/touchcapture/qr/flutterqr/QRView.kt
  2. +4
    -4
      example/lib/main.dart
  3. +3
    -1
      ios/Classes/QRView.swift
  4. +12
    -2
      lib/src/qr_code_scanner.dart

+ 2
- 0
android/src/main/kotlin/net/touchcapture/qr/flutterqr/QRView.kt Visa fil

@@ -70,6 +70,8 @@ class QRView(messenger: BinaryMessenger, id: Int, private val params: HashMap<St
"flipCamera" -> flipCamera(result)
"toggleFlash" -> toggleFlash(result)
"pauseCamera" -> pauseCamera(result)
// Stopping camera is the same as pausing camera
"stopCamera" -> pauseCamera(result)
"resumeCamera" -> resumeCamera(result)
"requestPermissions" -> checkAndRequestPermission(result)
"getCameraInfo" -> getCameraInfo(result)


+ 4
- 4
example/lib/main.dart Visa fil

@@ -56,7 +56,7 @@ class _QRViewExampleState extends State<QRViewExample> {
children: <Widget>[
Container(
margin: EdgeInsets.all(8),
child: RaisedButton(
child: ElevatedButton(
onPressed: () async {
await controller?.toggleFlash();
setState(() {});
@@ -70,7 +70,7 @@ class _QRViewExampleState extends State<QRViewExample> {
),
Container(
margin: EdgeInsets.all(8),
child: RaisedButton(
child: ElevatedButton(
onPressed: () async {
await controller?.flipCamera();
setState(() {});
@@ -95,7 +95,7 @@ class _QRViewExampleState extends State<QRViewExample> {
children: <Widget>[
Container(
margin: EdgeInsets.all(8),
child: RaisedButton(
child: ElevatedButton(
onPressed: () async {
await controller?.pauseCamera();
},
@@ -104,7 +104,7 @@ class _QRViewExampleState extends State<QRViewExample> {
),
Container(
margin: EdgeInsets.all(8),
child: RaisedButton(
child: ElevatedButton(
onPressed: () async {
await controller?.resumeCamera();
},


+ 3
- 1
ios/Classes/QRView.swift Visa fil

@@ -59,6 +59,8 @@ public class QRView:NSObject,FlutterPlatformView {
self?.toggleFlash(result)
case "pauseCamera":
self?.pauseCamera(result)
case "stopCamera":
self?.stopCamera(result)
case "resumeCamera":
self?.resumeCamera(result)
case "getCameraInfo":
@@ -185,7 +187,7 @@ public class QRView:NSObject,FlutterPlatformView {
}
func stopScan(_ result: @escaping FlutterResult){
func stopCamera(_ result: @escaping FlutterResult){
MTBBarcodeScanner.requestCameraPermission(success: { permissionGranted in
if permissionGranted {
if let sc: MTBBarcodeScanner = self.scanner {


+ 12
- 2
lib/src/qr_code_scanner.dart Visa fil

@@ -251,7 +251,7 @@ class QRViewController {
}
}

/// Pauses barcode scanning
/// Pauses the camera and barcode scanning
Future<void> pauseCamera() async {
try {
await _channel.invokeMethod('pauseCamera');
@@ -260,6 +260,15 @@ class QRViewController {
}
}

/// Stops barcode scanning and the camera
Future<void> stopCamera() async {
try {
await _channel.invokeMethod('stopCamera');
} on PlatformException catch (e) {
throw CameraException(e.code, e.message);
}
}

/// Resumes barcode scanning
Future<void> resumeCamera() async {
try {
@@ -280,8 +289,9 @@ class QRViewController {
}
}

/// Disposes the barcode stream.
/// Stops the camera and disposes the barcode stream.
void dispose() {
stopCamera();
_scanUpdateController.close();
}



Laddar…
Avbryt
Spara