diff --git a/lib/assets/barcode.html b/lib/assets/barcode.html index 314447e..8954e3a 100644 --- a/lib/assets/barcode.html +++ b/lib/assets/barcode.html @@ -20,22 +20,58 @@
- - \ No newline at end of file + diff --git a/lib/screens/io_device.dart b/lib/screens/io_device.dart index 65ac12b..d80b3e1 100644 --- a/lib/screens/io_device.dart +++ b/lib/screens/io_device.dart @@ -53,10 +53,13 @@ class BarcodeScanner extends StatelessWidget { cancelButtonText: cancelButtonText, isShowFlashIcon: isShowFlashIcon, scanType: scanType, + cameraFace: cameraFace, onScanned: onScanned, appBarTitle: appBarTitle, centerTitle: centerTitle, + barcodeAppBar: barcodeAppBar, delayMillis: delayMillis, + onClose: onClose, ); } else { /// Scan Android and ios barcode scanner with flutter_barcode_scanner @@ -86,7 +89,7 @@ class BarcodeScanner extends StatelessWidget { } } - _scanBarcodeForMobileAndTabDevices(ScanMode scanMode) async { + Future _scanBarcodeForMobileAndTabDevices(ScanMode scanMode) async { String barcode = await FlutterBarcodeScanner.scanBarcode( lineColor, cancelButtonText, diff --git a/lib/screens/window.dart b/lib/screens/window.dart index a077ea5..291e3e9 100644 --- a/lib/screens/window.dart +++ b/lib/screens/window.dart @@ -126,7 +126,12 @@ class WindowBarcodeScanner extends StatelessWidget { String getAssetFileUrl({required String asset}) { final assetsDirectory = p.join(p.dirname(Platform.resolvedExecutable), 'data', 'flutter_assets', asset); - return Uri.file(assetsDirectory).toString(); + return Uri.file(assetsDirectory).replace( + queryParameters: { + 'scanType': scanType.name, + 'cameraFace': cameraFace.name, + }, + ).toString(); } Future initPlatformState( @@ -155,7 +160,10 @@ class WindowBarcodeScanner extends StatelessWidget { return true; } - _buildAppBar(WebviewController controller, BuildContext context) { + PreferredSizeWidget? _buildAppBar( + WebviewController controller, + BuildContext context, + ) { if (appBarTitle == null && barcodeAppBar == null) { return null; }