From ab20e0182b1eb7d36a3c5f8fb1bf49fc739776ee Mon Sep 17 00:00:00 2001
From: zhang <494089941@qq.com>
Date: Wed, 11 Nov 2020 17:33:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=BA=8C=E7=BB=B4=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=BA=94=E7=94=A8=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android/app/build.gradle                 |  2 +-
 android/app/src/main/AndroidManifest.xml |  2 +-
 lib/ui/tool_pages/scan_page.dart         | 30 ++++++++++++------------
 pubspec.lock                             |  7 ------
 pubspec.yaml                             |  4 ++--
 5 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index f273b4d..e7227c1 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -44,7 +44,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.akucommunity.aku_community_manager"
-        minSdkVersion 24
+        minSdkVersion 20
         targetSdkVersion 29
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 289c90b..22a4b35 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -4,7 +4,7 @@
          In most cases you can leave this as-is, but you if you want to provide
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
-  <application android:name="io.flutter.app.FlutterApplication" android:label="小蜜蜂智慧社区管家端" android:icon="@mipmap/ic_launcher">
+  <application android:name="io.flutter.app.FlutterApplication" android:label="小蜜蜂智慧社区" android:icon="@mipmap/ic_launcher">
     <meta-data android:name="com.amap.api.v2.apikey" android:value="872b909f2ebc8150b809d692c4349f22"/>
     <activity android:name=".MainActivity" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
       <!-- Specifies an Android theme to apply to this Activity as soon as
diff --git a/lib/ui/tool_pages/scan_page.dart b/lib/ui/tool_pages/scan_page.dart
index ac7ebaf..f187df5 100644
--- a/lib/ui/tool_pages/scan_page.dart
+++ b/lib/ui/tool_pages/scan_page.dart
@@ -4,7 +4,7 @@ import 'package:aku_community_manager/tools/screen_tool.dart';
 import 'package:aku_community_manager/ui/widgets/common/aku_back_button.dart';
 import 'package:bot_toast/bot_toast.dart';
 import 'package:flutter/material.dart';
-import 'package:qr_code_scanner/qr_code_scanner.dart';
+// import 'package:qr_code_scanner/qr_code_scanner.dart';
 
 class ScanPage extends StatefulWidget {
   ScanPage({Key key}) : super(key: key);
@@ -15,7 +15,7 @@ class ScanPage extends StatefulWidget {
 
 class _ScanPageState extends State<ScanPage> {
   GlobalKey qrKey = GlobalKey(debugLabel: 'QR');
-  QRViewController _qrViewController;
+  // QRViewController _qrViewController;
   String tempText;
   Timer _timer;
   bool _barMove = false;
@@ -33,7 +33,7 @@ class _ScanPageState extends State<ScanPage> {
 
   @override
   void dispose() {
-    _qrViewController?.dispose();
+    // _qrViewController?.dispose();
     _timer?.cancel();
     super.dispose();
   }
@@ -43,18 +43,18 @@ class _ScanPageState extends State<ScanPage> {
     return Scaffold(
       body: Stack(
         children: [
-          QRView(
-            key: qrKey,
-            onQRViewCreated: (controller) {
-              _qrViewController = controller;
-              controller.scannedDataStream.listen((event) {
-                if (tempText != event) {
-                  tempText = event;
-                  BotToast.showText(text: event);
-                }
-              });
-            },
-          ),
+          // QRView(
+          //   key: qrKey,
+          //   onQRViewCreated: (controller) {
+          //     _qrViewController = controller;
+          //     controller.scannedDataStream.listen((event) {
+          //       if (tempText != event) {
+          //         tempText = event;
+          //         BotToast.showText(text: event);
+          //       }
+          //     });
+          //   },
+          // ),
           Center(
             child: Stack(
               children: [
diff --git a/pubspec.lock b/pubspec.lock
index b68d509..c47095e 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -331,13 +331,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.3.2+2"
-  qr_code_scanner:
-    dependency: "direct main"
-    description:
-      name: qr_code_scanner
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.0.13"
   rational:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 973b0a8..b157599 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -15,7 +15,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # 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.0.2+3
+version: 1.0.3+4
 
 environment:
   sdk: ">=2.7.0 <3.0.0"
@@ -40,7 +40,7 @@ dependencies:
   #划动组件
   carousel_slider: ^2.3.1
   #qrcode san
-  qr_code_scanner: ^0.0.13
+  # qr_code_scanner: ^0.0.13
   #toast
   bot_toast: ^3.0.4