add: improve something

pdliuw · Jun 17, 2022 · 8757c25 · 8757c25
1 parent b706622
commit 8757c25
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [3.2.2]
+
+* fix  something
+* improve something
+
 ## [3.2.1]
 
 * fix  something

diff --git a/README.md b/README.md
@@ -248,7 +248,7 @@ iOS支持PlatformView配置：
 
 |iOS-一维码/二维码 识别/生成|Android-一维码/二维码 识别/生成|Web、MacOS-二维码 生成|
 |:-|:-|:-|
-|[基于: MTBBarcodeScanner](https://github.com/mikebuss/MTBBarcodeScanner)|[基于: dm77/barcodescanner](https://github.com/dm77/barcodescanner)|[基于: qr_flutter](https://github.com/lukef/qr.flutter)|
+|[基于: MTBBarcodeScanner](https://github.com/mikebuss/MTBBarcodeScanner)|[基于: zxing](https://github.com/zxing/zxing)|[基于: qr_flutter](https://github.com/lukef/qr.flutter)|
 |:-|:-|:-|
 
 ## 待办

diff --git a/README_EN.md b/README_EN.md
@@ -234,7 +234,7 @@ You can add whiltelist by opening `chrome://flags` and search for `unsafely-trea
 
 |iOS-Barcode/QRCode Scanner/Creator|Android-Barcode/QRCode Scanner/Creator|Web、MacOS-QrCode Creator|
 |:-|:-|:-|
-|[Built on: MTBBarcodeScanner](https://github.com/mikebuss/MTBBarcodeScanner)|[Built on: dm77/barcodescanner](https://github.com/dm77/barcodescanner)|[Built on: qr_flutter](https://github.com/lukef/qr.flutter)|
+|[Built on: MTBBarcodeScanner](https://github.com/mikebuss/MTBBarcodeScanner)|[Built on: zxing](https://github.com/zxing/zxing)|[Built on: qr_flutter](https://github.com/lukef/qr.flutter)|
 |:-|:-|:-|
 
 ## TODO

diff --git a/android/src/main/kotlin/com/air/ai_barcode/AndroidScannerView.kt b/android/src/main/kotlin/com/air/ai_barcode/AndroidScannerView.kt
@@ -23,7 +23,8 @@ class AndroidScannerView(
     context: Context?,
     viewid: Int,
     args: Any?
-) : PlatformView, MethodChannel.MethodCallHandler, EventChannel.StreamHandler, BarcodeCallback {
+) : PlatformView, MethodChannel.MethodCallHandler, EventChannel.StreamHandler, BarcodeCallback,
+    DecoratedBarcodeView.TorchListener {
 
     /**
      * 用于向Flutter发送数据
@@ -88,6 +89,8 @@ class AndroidScannerView(
     lateinit var channelResult: MethodChannel.Result;
     var mEventChannelSink: EventChannel.EventSink? = null;
 
+    var mTorchOn: Boolean = false
+
     init {
         mTextView.text = "Scanner view";
         /*
@@ -124,6 +127,7 @@ class AndroidScannerView(
         mZXingBarcode.barcodeView.decoderFactory = DefaultDecoderFactory(formats)
         mZXingBarcode.setStatusText("")
         mZXingBarcode.decodeContinuous(this)
+        mZXingBarcode.setTorchListener(this)
 
 
         return mZXingBarcode;
@@ -155,14 +159,26 @@ class AndroidScannerView(
     }
 
     private fun openFlash() {
-//        zxing.flash = true;
+        mZXingBarcode.setTorchOn()
     }
 
     private fun closeFlash() {
-//        zxing.flash = false;
+        mZXingBarcode.setTorchOff()
     }
 
     private fun toggleFlash() {
-//        zxing.toggleFlash();
+        if (mTorchOn) {
+            closeFlash()
+        } else {
+            openFlash()
+        }
+    }
+
+    override fun onTorchOff() {
+        mTorchOn = false
+    }
+
+    override fun onTorchOn() {
+        mTorchOn = true
     }
 }
diff --git a/example/lib/app_barcode_scanner_widget.dart b/example/lib/app_barcode_scanner_widget.dart
@@ -228,7 +228,22 @@ class _AppBarcodeScannerWidgetState extends State<_BarcodeScannerWidget> {
       children: <Widget>[
         Expanded(
           child: _getScanWidgetByPlatform(),
-        )
+        ),
+        Row(
+          mainAxisAlignment: MainAxisAlignment.spaceAround,
+          children: [
+            ElevatedButton(
+                onPressed: () {
+                  _scannerController.openFlash();
+                },
+                child: Text("Open")),
+            ElevatedButton(
+                onPressed: () {
+                  _scannerController.closeFlash();
+                },
+                child: Text("Close")),
+          ],
+        ),
       ],
     );
   }

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: ai_barcode
 description: barcode,qrcode,scan,scanning,Barcode generation,Barcode scanning,qrcode,qrcode generation,qrcode creator
-version: 3.2.1
+version: 3.2.2
 homepage: https://pdliuw.github.io/
 repository: https://github.com/pdliuw/ai_barcode