fix crash issue

ICTASL · Nov 11, 2020 · 6182d48 · 6182d48
1 parent ac9a4ec
commit 6182d48
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 69 deletions.
diff --git a/lib/page/screen/qr_scan_screen.dart b/lib/page/screen/qr_scan_screen.dart
@@ -14,7 +14,7 @@ class _QrScanScreenState extends State<QrScanScreen> {
   final GlobalKey qrKey = GlobalKey(debugLabel: 'QR');
   var qrText = "";
   QRViewController controller;
-
+  bool scanned = false;
   @override
   void initState() {
     super.initState();
@@ -29,63 +29,83 @@ class _QrScanScreenState extends State<QrScanScreen> {
   @override
   Widget build(BuildContext context) {
     double height = MediaQuery.of(context).size.height;
-    return Scaffold(
-      body: Column(
-        children: <Widget>[
-          Expanded(
-            flex: 5,
-            child: QRView(
-              key: qrKey,
-              onQRViewCreated: _onQRViewCreated,
-            ),
-          ),
-          Row(
-            children: <Widget>[
-              Container(
-                padding: EdgeInsets.all(10),
-                height: 100,
-                width: 100,
-                color: Colors.white,
-                child: Image.asset(
-                  "assets/images/stay_safe.png",
-                  fit: BoxFit.cover,
-                ),
-              ),
-              Expanded(
-                child: Center(
-                  child: Text(
-                    AppLocalizations.of(context).translate("qr_instruct"),
-                    overflow: TextOverflow.ellipsis,
-                    maxLines: 2,
-                    style: TextStyle(color: Colors.black, fontSize: 20),
+    return scanned == false
+        ? Scaffold(
+            body: Column(
+              children: <Widget>[
+                Expanded(
+                  flex: 5,
+                  child: QRView(
+                    key: qrKey,
+                    onQRViewCreated: _onQRViewCreated,
                   ),
                 ),
-              )
-            ],
+                Row(
+                  children: <Widget>[
+                    Container(
+                      padding: EdgeInsets.all(10),
+                      height: 100,
+                      width: 100,
+                      color: Colors.white,
+                      child: Image.asset(
+                        "assets/images/stay_safe.png",
+                        fit: BoxFit.cover,
+                      ),
+                    ),
+                    Expanded(
+                      child: Center(
+                        child: Text(
+                          AppLocalizations.of(context).translate("qr_instruct"),
+                          overflow: TextOverflow.ellipsis,
+                          maxLines: 2,
+                          style: TextStyle(color: Colors.black, fontSize: 20),
+                        ),
+                      ),
+                    )
+                  ],
+                )
+              ],
+            ),
           )
-        ],
-      ),
-    );
+        : Container();
   }
 
   void _handleURLButtonPress(BuildContext context, String url) {
+    // Navigator.push(context,
+    //         MaterialPageRoute(builder: (context) => QrWebviewScreen(url: url)))
+    //     .then((_) {
+    //   _backagain();
+    // });
+
     Navigator.push(context,
-        MaterialPageRoute(builder: (context) => QrWebviewScreen(url: url)));
+            MaterialPageRoute(builder: (context) => QrWebviewScreen(url: url)))
+        .then((_) {
+      _backagain();
+    });
+  }
+
+  void _backagain() {
+    setState(() {
+      scanned = false;
+      controller.resumeCamera();
+    });
   }
 
   void _onQRViewCreated(QRViewController controller) {
-    print("called");
     this.controller = controller;
+
     controller.scannedDataStream.listen((scanData) {
-      setState(() {
-        qrText = scanData;
+      if (scanned == false) {
+        setState(() {
+          qrText = scanData;
+          if (qrText != "") {
+            scanned = true;
 
-        if (qrText != "") {
-          controller.pauseCamera();
-          _handleURLButtonPress(context, qrText);
-        }
-      });
-      // controller.resumeCamera();
+            controller.pauseCamera();
+            _handleURLButtonPress(context, qrText);
+          }
+        });
+      }
     });
   }
 }
diff --git a/lib/page/screen/qr_webview_screen.dart b/lib/page/screen/qr_webview_screen.dart
@@ -44,28 +44,5 @@ class _QrWebviewScreenState extends State<QrWebviewScreen> {
           },
           javascriptMode: JavascriptMode.unrestricted,
         ));
-
-    //  WillPopScope(
-    //   onWillPop: () => _exitApp(context),
-    //   child: Scaffold(
-    //     body: WebView(
-    //       javascriptMode: JavascriptMode.unrestricted,
-    //       initialUrl: widget.url,
-    //     ),
-    //   ),
-    // );
   }
-
-  // Future<bool> _exitApp(BuildContext context) async {
-  //   print("cal");
-  //   if (await controllerGlobal.canGoBack()) {
-  //     print("onwill goback");
-  //     controllerGlobal.goBack();
-  //   } else {
-  //     Scaffold.of(context).showSnackBar(
-  //       const SnackBar(content: Text("No back history item")),
-  //     );
-  //     return Future.value(false);
-  //   }
-  // }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -11,7 +11,7 @@ description: Self tracking app
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.16.0+36
+version: 1.17.0+37
 
 environment:
     sdk: ">=2.1.0 <3.0.0"