Yubico/yubioath-flutter
1
1
Fork 0
mirror of https://github.com/Yubico/yubioath-flutter.git synced 2024-11-26 10:33:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

pause and resume QR scanner

Browse Source
This commit is contained in:
Adam Velebil 2022-09-15 17:46:22 +02:00
parent 15198466b5
commit 8e766fd7f9
No known key found for this signature in database
GPG Key ID: AC6D6B9D715FC084
3 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
android/flutter_plugins/qrscanner_zxing/android/src/main/kotlin/com/yubico/authenticator/flutter_plugins/qrscanner_zxing/QRScannerView.kt
View File

@ -112,11 +112,20 @@ internal class QRScannerView(
private var imageAnalysis: ImageAnalysis? = null
private var preview: Preview? = null
private var barcodeAnalyzer : BarcodeAnalyzer = BarcodeAnalyzer(marginPct) { analyzeResult ->
if (analyzeResult.isSuccess) {
analyzeResult.getOrNull()?.let { result ->
reportCodeFound(result)
}
}
}
override fun getView(): View {
barcodeAnalyzer.analysisPaused = false;
return qrScannerView
}
override fun dispose() {
cameraProvider?.unbindAll()
preview = null
@ -161,6 +170,8 @@ internal class QRScannerView(
intent.addCategory(Intent.CATEGORY_DEFAULT)
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
startActivity(context, intent, null)
} else if (call.method == "resumeScanning") {
barcodeAnalyzer.analysisPaused = false;
}
}
}
@ -231,13 +242,7 @@ internal class QRScannerView(
.setTargetAspectRatio(QR_SCANNER_ASPECT_RATIO)
.build()
.also {
it.setAnalyzer(cameraExecutor, BarcodeAnalyzer(marginPct) { analyzeResult ->
if (analyzeResult.isSuccess) {
analyzeResult.getOrNull()?.let { result ->
reportCodeFound(result)
}
}
})
it.setAnalyzer(cameraExecutor, barcodeAnalyzer)
}
preview = Preview.Builder()
@ -266,6 +271,8 @@ internal class QRScannerView(
private val marginPct: Double?, private val listener: BarcodeAnalyzerListener
) : ImageAnalysis.Analyzer {
var analysisPaused = false;
val multiFormatReader = MultiFormatReader().also {
it.setHints(mapOf(DecodeHintType.POSSIBLE_FORMATS to listOf(BarcodeFormat.QR_CODE)))
}
@ -279,6 +286,11 @@ internal class QRScannerView(
override fun analyze(imageProxy: ImageProxy) {
try {
if (analysisPaused) {
return;
}
val buffer = imageProxy.planes[0].buffer
val intArray = buffer.toByteArray().map { it.toInt() }.toIntArray()
@ -304,6 +316,7 @@ internal class QRScannerView(
}
val result: com.google.zxing.Result = multiFormatReader.decode(bitmapToProcess)
analysisPaused = true // pause
Log.d(TAG, "Analysis result: ${result.text}")
listener.invoke(Result.success(result.text))
} catch (_: NotFoundException) {

5
android/flutter_plugins/qrscanner_zxing/lib/qrscanner_zxing_view.dart
View File

@ -54,6 +54,11 @@ class QRScannerZxingViewState extends State<QRScannerZxingView> {
channel.invokeMethod("requestCameraPermissions", null);
}
void resumeScanning() async {
debugPrint("Resuming QR code scanning");
await channel.invokeMethod("resumeScanning", null);
}
@override
void dispose() {
super.dispose();

3
lib/android/qr_scanner/qr_scanner_view.dart
View File

@ -43,6 +43,9 @@ class _QrScannerViewState extends State<QrScannerView> {
_credentialData = null;
_scannedString = null;
_status = ScanStatus.scanning;
_zxingViewKey.currentState?.resumeScanning();
});
}