Bläddra i källkod

5.21 1.0.92 -- 2

huxiaoqiang 4 år sedan
förälder
incheckning
9ff0f7a3d8

+ 1 - 1
android/app/build.gradle

@@ -39,7 +39,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.bh.bbyyy"
-        minSdkVersion 16
+        minSdkVersion 19
         targetSdkVersion 29
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

+ 20 - 17
lib/paegs/gang_page/gang_in_page/gang_in_page.dart

@@ -30,10 +30,9 @@ import 'package:url_launcher/url_launcher.dart';
 
 import 'gang_information_page/gang_information_page.dart';
 import 'initiate_collection_page/initiate_collection_page.dart';
-import 'package:qrscan/qrscan.dart' as scanner;
-
+import 'scan_page/scan_page.dart';
 class GangInPage extends StatefulWidget {
-  MyShopBeanDataData data;
+ MyShopBeanDataData data;
   NewOrderBeanContent order;
 
   GangInPage(this.data, this.order);
@@ -99,20 +98,24 @@ class _GangInPageState extends State<GangInPage> {
               child: IconButton(
                   icon: Icon(Icons.qr_code_scanner),
                   onPressed: () async {
-                    String cameraScanResult = await scanner.scan();
-                    if (cameraScanResult.isNotEmpty &&
-                        cameraScanResult != null &&
-                        cameraScanResult.length == 8) {
-                      Timer(Duration(milliseconds: 200), () {
-                        StoreBeanDataData store = StoreBeanDataData();
-                        store.ownerUid = widget.data.ownerUid;
-                        store.ownerName = widget.data.ownerName;
-                        store.uid = widget.data.shopUid;
-                        MyTools().toPage(context, AddMemberPage(store: store,qrUID: cameraScanResult,), (then){});
-                        MyTools().hideKeyboard(context);
-                        controller.requestRefresh();
-                      });
-                    }
+                    MyTools().toPage(context, ScanPage(), (then){
+                      if(then is String){
+                        if (then.isNotEmpty &&
+                            then != null &&
+                            then.length == 8) {
+                          Timer(Duration(milliseconds: 200), () {
+                            StoreBeanDataData store = StoreBeanDataData();
+                            store.ownerUid = widget.data.ownerUid;
+                            store.ownerName = widget.data.ownerName;
+                            store.uid = widget.data.shopUid;
+                            MyTools().toPage(context, AddMemberPage(store: store,qrUID: then,), (then){});
+                            MyTools().hideKeyboard(context);
+                            controller.requestRefresh();
+                          });
+                        }
+                      }
+                    });
+
                   }),
             ),
             Visibility(

+ 0 - 1
lib/paegs/gang_page/gang_in_page/gang_information_page/add_member_page/add_member_page.dart

@@ -14,7 +14,6 @@ import 'package:bbyyy/my_tools/my_views.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
-import 'package:qrscan/qrscan.dart' as scanner;
 
 class AddMemberPage extends StatefulWidget {
   const AddMemberPage({Key key, this.store,this.qrUID}) : super(key: key);

+ 36 - 0
lib/paegs/gang_page/gang_in_page/scan_page/scan_page.dart

@@ -0,0 +1,36 @@
+import 'package:bbyyy/my_tools/my_views.dart';
+import 'package:flutter/material.dart';
+import 'package:scan/scan.dart';
+
+class ScanPage extends StatefulWidget {
+  const ScanPage({Key key}) : super(key: key);
+
+  @override
+  _ScanPageState createState() => _ScanPageState();
+}
+
+class _ScanPageState extends State<ScanPage> {
+  ScanController controller = ScanController();
+  String qrcode = 'Unknown';
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Column(
+        children: [
+          MyViews().myAppBar('扫描二维码', context, []),
+          Expanded(
+            child: ScanView(
+              controller: controller,
+              scanAreaScale: .7,
+              scanLineColor: Colors.green.shade400,
+              onCapture: (data) {
+                print(data);
+                Navigator.pop(context,data);
+              },
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

+ 7 - 7
pubspec.lock

@@ -616,13 +616,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.0.0"
-  qrscan:
-    dependency: "direct main"
-    description:
-      name: qrscan
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.3.1"
   rational:
     dependency: transitive
     description:
@@ -637,6 +630,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.26.0"
+  scan:
+    dependency: "direct main"
+    description:
+      name: scan
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.4.3"
   scroll_to_index:
     dependency: "direct main"
     description:

+ 1 - 1
pubspec.yaml

@@ -65,7 +65,7 @@ dependencies:
   permission_handler: ^6.1.3
   catcher: ^0.6.5
   qr_flutter: ^4.0.0
-  qrscan: ^0.3.1
+  scan: ^1.4.3
 
 dev_dependencies:
   flutter_test: