QR scanning fixes for Huawei asset scan

main_production_upgrade_ios
WaseemAbbasi22 6 days ago
parent 887217646a
commit c4b4c7f75f

@ -1,14 +1,232 @@
//Todo delete after testing
// import 'dart:async';
// import 'dart:io';
//
// import 'package:flutter/material.dart';
// import 'package:fluttertoast/fluttertoast.dart';
// import 'package:mobile_scanner/mobile_scanner.dart';
// import 'package:provider/provider.dart';
// import 'package:qr_code_scanner_plus/qr_code_scanner_plus.dart';
// import 'package:test_sa/extensions/context_extension.dart';
// import 'package:test_sa/extensions/int_extensions.dart';
// import 'package:test_sa/extensions/string_extensions.dart';
// import 'package:test_sa/extensions/text_extensions.dart';
// import 'package:test_sa/extensions/widget_extensions.dart';
// import 'package:test_sa/helper/utils.dart';
// import 'package:test_sa/models/device/asset.dart';
// import 'package:test_sa/modules/cm_module/views/components/action_button/footer_action_button.dart';
// import 'package:test_sa/modules/tm_module/device_transfer/search_device_page.dart';
// import 'package:test_sa/new_views/app_style/app_color.dart';
// import 'package:test_sa/new_views/common_widgets/default_app_bar.dart';
//
// import '../../../controllers/providers/api/devices_provider.dart';
// import '../../../models/device/asset_search.dart';
// import '../../../new_views/common_widgets/app_filled_button.dart';
//
// class AssetScanQr extends StatefulWidget {
// static const String id = "/asset-scan-qr";
//
// const AssetScanQr({Key? key, required this.title, this.multiSelection = false, this.enablePickManually = true}) : super(key: key);
// final String title;
// final bool multiSelection;
// final bool enablePickManually;
//
// @override
// _AssetScanQrState createState() => _AssetScanQrState();
// }
//
// class _AssetScanQrState extends State<AssetScanQr> {
// // Barcode result;
// // QRViewController? _controller;
// bool _scanDone = false;
// bool _scanning = false;
// final GlobalKey qrKey = GlobalKey(debugLabel: 'QR_scanner');
// late AssetProvider _devicesProvider;
//
// MobileScannerController? controller;
//
// @override
// void initState() {
// // TODO: implement initState
// super.initState();
// controller = MobileScannerController(
// detectionSpeed: DetectionSpeed.noDuplicates,
// formats: [],
// returnImage: false,
// torchEnabled: false,
// invertImage: false,
// autoZoom: true,
// );
// }
//
// @override
// void dispose() {
// super.dispose();
// controller?.dispose();
// _devicesProvider.searchReset();
// }
//
// _pickManually() async {
// controller?.pause();
// await Navigator.push(context, MaterialPageRoute(builder: (context) => SearchDevicePage(multiSelection: widget.multiSelection))).then((value) => controller?.stop());
// }
//
// _getDevice(String result, {bool isQr = false}) async {
// _devicesProvider.reset();
// await _devicesProvider.getAssets(
// search: DeviceSearch(assetNo: result, assetSerialNumber: ""),
// isQr: isQr,
// );
// return _devicesProvider.devices;
// }
//
// @override
// Widget build(BuildContext context) {
// _devicesProvider = Provider.of<AssetProvider>(context);
// return Scaffold(
// appBar: DefaultAppBar(title: widget.title),
// body: Column(
// children: [
// Stack(
// children: [
// MobileScanner(
// key: qrKey,
// tapToFocus: true,
// controller: controller,
// onDetect: (result) async {
// String? scanData = result.barcodes.first.rawValue;
// if (!_scanDone) {
// _scanDone = true;
// if (!widget.enablePickManually) {
// if (scanData != null) {
// Navigator.of(context).pop(Asset(assetNumber: scanData));
// } else {
// _scanDone = false;
// }
// } else {
// setState(() {
// _scanning = true;
// });
// final result = await _getDevice(scanData!, isQr: true);
// setState(() {
// _scanning = false;
// });
// if (result.isNotEmpty) {
// if (widget.multiSelection) {
// Navigator.of(context).pop(<Asset>[result[0]]);
// } else {
// Navigator.of(context).pop(result[0]);
// }
// } else {
// Utils.showToast("No Item Found. Try Again", toastGravity: ToastGravity.CENTER);
// _scanDone = false;
// }
// }
// }
// },
// ),
//
// // QRView(
// // key: qrKey,
// // onQRViewCreated: (QRViewController controller) {
// // setState(() {
// // _controller = controller;
// // });
// // controller.scannedDataStream.listen((scanData) async {
// // if (!_scanDone) {
// // _scanDone = true;
// // if (!widget.enablePickManually) {
// // if (scanData.code != null) {
// // Navigator.of(context).pop(Asset(assetNumber: scanData.code!));
// // } else {
// // _scanDone = false;
// // }
// // } else {
// // _controller?.pauseCamera();
// // setState(() {
// // _scanning = true;
// // });
// // final result = await _getDevice(scanData.code!, isQr: true);
// // setState(() {
// // _scanning = false;
// // });
// // if (result.isNotEmpty) {
// // if (widget.multiSelection) {
// // Navigator.of(context).pop(<Asset>[result[0]]);
// // } else {
// // Navigator.of(context).pop(result[0]);
// // }
// // } else {
// // Utils.showToast("No Item Found. Try Again", toastGravity: ToastGravity.CENTER);
// // _controller?.resumeCamera();
// // _scanDone = false;
// // }
// // }
// // }
// // });
// // },
// // ),
// Center(
// child: 'scan'.toSvgAsset(
// height: 283.toScreenHeight.toInt(),
// width: 283.toScreenWidth.toInt(),
// fit: BoxFit.fitHeight,
// ),
// ),
// if (_scanning)
// Container(
// width: 56.toScreenHeight,
// height: 56.toScreenHeight,
// padding: const EdgeInsets.all(8),
// decoration: const BoxDecoration(shape: BoxShape.circle, color: Colors.white),
// child: const CircularProgressIndicator(color: AppColor.primary10, strokeWidth: 3),
// ).center
// ],
// ).expanded,
// if (widget.enablePickManually)
// FooterActionButton.footerContainer(
// context: context,
// child: AppFilledButton(
// label: context.translation.pickManually,
// onPressed: _pickManually,
// ),
// ),
// ],
// ),
// // bottomSheet:
// // 16.height,
//
// // Container(
// // height: 82.toScreenHeight,
// // color: Colors.white,
// // width: MediaQuery.of(context).size.width,
// // child: Center(
// // child: SizedBox(
// // height: 50.toScreenHeight,
// // width: 358.toScreenWidth,
// // child: AppFilledButton(
// // label: context.translation.pickManually,
// // onPressed: _pickManually,
// // ),
// // ),
// // ),
// // )
// );
// }
// }
import 'dart:async'; import 'dart:async';
import 'dart:io'; import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:fluttertoast/fluttertoast.dart'; import 'package:fluttertoast/fluttertoast.dart';
import 'package:google_api_availability/google_api_availability.dart';
import 'package:mobile_scanner/mobile_scanner.dart'; import 'package:mobile_scanner/mobile_scanner.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:qr_code_scanner_plus/qr_code_scanner_plus.dart'; import 'package:qr_code_scanner_plus/qr_code_scanner_plus.dart';
import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/context_extension.dart';
import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/extensions/string_extensions.dart';
import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/helper/utils.dart'; import 'package:test_sa/helper/utils.dart';
@ -25,7 +243,13 @@ import '../../../new_views/common_widgets/app_filled_button.dart';
class AssetScanQr extends StatefulWidget { class AssetScanQr extends StatefulWidget {
static const String id = "/asset-scan-qr"; static const String id = "/asset-scan-qr";
const AssetScanQr({Key? key, required this.title, this.multiSelection = false, this.enablePickManually = true}) : super(key: key); const AssetScanQr({
Key? key,
required this.title,
this.multiSelection = false,
this.enablePickManually = true,
}) : super(key: key);
final String title; final String title;
final bool multiSelection; final bool multiSelection;
final bool enablePickManually; final bool enablePickManually;
@ -35,42 +259,77 @@ class AssetScanQr extends StatefulWidget {
} }
class _AssetScanQrState extends State<AssetScanQr> { class _AssetScanQrState extends State<AssetScanQr> {
// Barcode result;
// QRViewController? _controller;
bool _scanDone = false;
bool _scanning = false;
final GlobalKey qrKey = GlobalKey(debugLabel: 'QR_scanner'); final GlobalKey qrKey = GlobalKey(debugLabel: 'QR_scanner');
late AssetProvider _devicesProvider; late AssetProvider _devicesProvider;
MobileScannerController? controller; MobileScannerController? mobileController;
QRViewController? qrController;
bool _scanDone = false;
bool _scanning = false;
bool _isHuawei = false;
bool _isLoading = true;
@override @override
void initState() { void initState() {
// TODO: implement initState
super.initState(); super.initState();
controller = MobileScannerController( _initScanner();
detectionSpeed: DetectionSpeed.noDuplicates, }
formats: [],
returnImage: false, Future<void> _initScanner() async {
torchEnabled: false, _isHuawei = Platform.isAndroid && !(await _isGoogleServicesAvailable());
invertImage: false,
autoZoom: true, if (!_isHuawei) {
); mobileController = MobileScannerController(
detectionSpeed: DetectionSpeed.noDuplicates,
formats: [],
returnImage: false,
torchEnabled: false,
invertImage: false,
autoZoom: true,
);
}
if (mounted) {
setState(() {
_isLoading = false;
});
}
}
Future<bool> _isGoogleServicesAvailable() async {
GooglePlayServicesAvailability availability = await GoogleApiAvailability.instance.checkGooglePlayServicesAvailability();
String status = availability.toString().split('.').last;
return status == "success";
} }
@override @override
void dispose() { void dispose() {
super.dispose(); mobileController?.dispose();
controller?.dispose(); qrController?.dispose();
_devicesProvider.searchReset(); _devicesProvider.searchReset();
super.dispose();
} }
_pickManually() async { Future<void> _pickManually() async {
controller?.pause(); mobileController?.pause();
await Navigator.push(context, MaterialPageRoute(builder: (context) => SearchDevicePage(multiSelection: widget.multiSelection))).then((value) => controller?.stop()); qrController?.pauseCamera();
await Navigator.push(
context,
MaterialPageRoute(
builder: (context) => SearchDevicePage(multiSelection: widget.multiSelection),
),
);
mobileController?.stop();
qrController?.resumeCamera();
} }
_getDevice(String result, {bool isQr = false}) async { Future<List<Asset>> _getDevice(String result, {bool isQr = false}) async {
_devicesProvider.reset(); _devicesProvider.reset();
await _devicesProvider.getAssets( await _devicesProvider.getAssets(
search: DeviceSearch(assetNo: result, assetSerialNumber: ""), search: DeviceSearch(assetNo: result, assetSerialNumber: ""),
@ -79,6 +338,54 @@ class _AssetScanQrState extends State<AssetScanQr> {
return _devicesProvider.devices; return _devicesProvider.devices;
} }
Future<void> _handleScan(String scanData) async {
if (_scanDone) return;
_scanDone = true;
if (!widget.enablePickManually) {
Navigator.of(context).pop(Asset(assetNumber: scanData));
return;
}
setState(() {
_scanning = true;
});
final result = await _getDevice(scanData, isQr: true);
setState(() {
_scanning = false;
});
if (result.isNotEmpty) {
if (widget.multiSelection) {
Navigator.of(context).pop(<Asset>[result[0]]);
} else {
Navigator.of(context).pop(result[0]);
}
} else {
Utils.showToast(
"No Item Found. Try Again",
toastGravity: ToastGravity.CENTER,
);
_scanDone = false;
mobileController?.start();
qrController?.resumeCamera();
}
}
void _onQrViewCreated(QRViewController controller) {
qrController = controller;
controller.scannedDataStream.listen((scanData) async {
if (_scanDone) return;
if (scanData.code == null || scanData.code!.isEmpty) return;
await _handleScan(scanData.code!);
});
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
_devicesProvider = Provider.of<AssetProvider>(context); _devicesProvider = Provider.of<AssetProvider>(context);
@ -86,102 +393,66 @@ class _AssetScanQrState extends State<AssetScanQr> {
appBar: DefaultAppBar(title: widget.title), appBar: DefaultAppBar(title: widget.title),
body: Column( body: Column(
children: [ children: [
Stack( _isLoading
children: [ ? const CircularProgressIndicator(color: AppColor.primary10).center
MobileScanner( : Stack(
key: qrKey, children: [
tapToFocus: true, _isHuawei
controller: controller, ? QRView(
onDetect: (result) async { key: qrKey,
String? scanData = result.barcodes.first.rawValue; onQRViewCreated: _onQrViewCreated,
if (!_scanDone) { overlay: QrScannerOverlayShape(
_scanDone = true; borderColor: Colors.white,
if (!widget.enablePickManually) { borderRadius: 12,
if (scanData != null) { borderLength: 30,
Navigator.of(context).pop(Asset(assetNumber: scanData)); borderWidth: 4,
} else { cutOutSize: MediaQuery.of(context).size.width * 0.7,
_scanDone = false; ),
} )
} else { : MobileScanner(
setState(() { key: qrKey,
_scanning = true; controller: mobileController,
}); tapToFocus: true,
final result = await _getDevice(scanData!, isQr: true); onDetect: (capture) async {
setState(() { if (_scanDone) return;
_scanning = false;
});
if (result.isNotEmpty) {
if (widget.multiSelection) {
Navigator.of(context).pop(<Asset>[result[0]]);
} else {
Navigator.of(context).pop(result[0]);
}
} else {
Utils.showToast("No Item Found. Try Again", toastGravity: ToastGravity.CENTER);
_scanDone = false;
}
}
}
},
),
// QRView( final barcodes = capture.barcodes;
// key: qrKey, if (barcodes.isEmpty) return;
// onQRViewCreated: (QRViewController controller) {
// setState(() { final value = barcodes.first.rawValue;
// _controller = controller; if (value == null || value.isEmpty) return;
// });
// controller.scannedDataStream.listen((scanData) async { await _handleScan(value);
// if (!_scanDone) { },
// _scanDone = true; ),
// if (!widget.enablePickManually) {
// if (scanData.code != null) { /// SVG Overlay (only for non-Huawei)
// Navigator.of(context).pop(Asset(assetNumber: scanData.code!)); if (!_isHuawei)
// } else { Center(
// _scanDone = false; child: 'scan'.toSvgAsset(
// } height: 283.toScreenHeight.toInt(),
// } else { width: 283.toScreenWidth.toInt(),
// _controller?.pauseCamera(); fit: BoxFit.fitHeight,
// setState(() { ),
// _scanning = true; ),
// });
// final result = await _getDevice(scanData.code!, isQr: true); /// Loader
// setState(() { if (_scanning)
// _scanning = false; Container(
// }); width: 56.toScreenHeight,
// if (result.isNotEmpty) { height: 56.toScreenHeight,
// if (widget.multiSelection) { padding: const EdgeInsets.all(8),
// Navigator.of(context).pop(<Asset>[result[0]]); decoration: const BoxDecoration(
// } else { shape: BoxShape.circle,
// Navigator.of(context).pop(result[0]); color: Colors.white,
// } ),
// } else { child: const CircularProgressIndicator(
// Utils.showToast("No Item Found. Try Again", toastGravity: ToastGravity.CENTER); color: AppColor.primary10,
// _controller?.resumeCamera(); strokeWidth: 3,
// _scanDone = false; ),
// } ).center,
// } ],
// } ).expanded,
// });
// },
// ),
Center(
child: 'scan'.toSvgAsset(
height: 283.toScreenHeight.toInt(),
width: 283.toScreenWidth.toInt(),
fit: BoxFit.fitHeight,
),
),
if (_scanning)
Container(
width: 56.toScreenHeight,
height: 56.toScreenHeight,
padding: const EdgeInsets.all(8),
decoration: const BoxDecoration(shape: BoxShape.circle, color: Colors.white),
child: const CircularProgressIndicator(color: AppColor.primary10, strokeWidth: 3),
).center
],
).expanded,
if (widget.enablePickManually) if (widget.enablePickManually)
FooterActionButton.footerContainer( FooterActionButton.footerContainer(
context: context, context: context,
@ -192,24 +463,6 @@ class _AssetScanQrState extends State<AssetScanQr> {
), ),
], ],
), ),
// bottomSheet:
// 16.height,
// Container(
// height: 82.toScreenHeight,
// color: Colors.white,
// width: MediaQuery.of(context).size.width,
// child: Center(
// child: SizedBox(
// height: 50.toScreenHeight,
// width: 358.toScreenWidth,
// child: AppFilledButton(
// label: context.translation.pickManually,
// onPressed: _pickManually,
// ),
// ),
// ),
// )
); );
} }
} }

Loading…
Cancel
Save