1.3.0

Author: chavesgu

CHANGELOG.md

@@ -1,3 +1,5 @@
+## 1.3.0
+- add huawei sdk for android decoder
 ## 1.2.0
 - fix android decode qrcode from image
 ## 1.1.1

README.md

@@ -1,8 +1,8 @@
 # scan
 
-flutter widget to scan qrcode customly.
+scan qrcode in widget tree.
 
-Get qrcode from image.
+decode qrcode image from path.
 
 > if you want to generate qrcode image, you should use [qr_flutter](https://pub.dev/packages/qr_flutter)
 

android/build.gradle

@@ -5,6 +5,7 @@ buildscript {
     repositories {
         google()
         jcenter()
+        maven {url 'https://developer.huawei.com/repo/'}
     }
 
     dependencies {
@@ -16,6 +17,7 @@ rootProject.allprojects {
     repositories {
         google()
         jcenter()
+        maven {url 'https://developer.huawei.com/repo/'}
     }
 }
 
@@ -37,4 +39,6 @@ dependencies {
     implementation('com.journeyapps:zxing-android-embedded:4.1.0') { transitive = false }
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.zxing:core:3.3.0'
+//    implementation 'com.huawei.hms:scanplus:1.3.1.300'
+    implementation 'com.huawei.hms:scan:1.3.1.300'
 }

android/src/main/java/com/chavesgu/scan/QRCodeDecoder.java

@@ -1,5 +1,6 @@
 package com.chavesgu.scan;
 
+import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.util.Log;
@@ -17,6 +18,9 @@
 import com.google.zxing.RGBLuminanceSource;
 import com.google.zxing.common.GlobalHistogramBinarizer;
 import com.google.zxing.common.HybridBinarizer;
+import com.huawei.hms.hmsscankit.ScanUtil;
+import com.huawei.hms.ml.scan.HmsScan;
+import com.huawei.hms.ml.scan.HmsScanAnalyzerOptions;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -199,4 +203,17 @@ private static void encodeYUV420SP(byte[] yuv420sp, int[] argb, int width, int h
             }
         }
     }
+
+
+    public static String decodeQRCode(Context context, String path) {
+        Bitmap bitmap = BitmapFactory.decodeFile(path);
+
+        HmsScanAnalyzerOptions options = new HmsScanAnalyzerOptions.Creator().setPhotoMode(true).create();
+        HmsScan[] hmsScans = ScanUtil.decodeWithBitmap(context, bitmap, options);
+
+        if (hmsScans != null && hmsScans.length > 0) {
+            return hmsScans[0].getOriginalValue();
+        }
+        return syncDecodeQRCode(path);
+    }
 }

android/src/main/java/com/chavesgu/scan/ScanPlugin.java

@@ -4,6 +4,9 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.AsyncTask;
+import android.os.Build;
+import android.os.VibrationEffect;
+import android.os.Vibrator;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.BinaryBitmap;
@@ -34,6 +37,8 @@
 import io.flutter.plugin.common.MethodChannel.Result;
 import io.flutter.plugin.common.PluginRegistry.Registrar;
 
+import static android.content.Context.VIBRATOR_SERVICE;
+
 /** ScanPlugin */
 public class ScanPlugin implements FlutterPlugin, MethodCallHandler, ActivityAware {
   private MethodChannel channel;
@@ -113,7 +118,7 @@ public QrCodeAsyncTask(ScanPlugin plugin, String path) {
     @Override
     protected String doInBackground(String... strings) {
       // 解析二维码/条码
-      return QRCodeDecoder.syncDecodeQRCode(path);
+      return QRCodeDecoder.decodeQRCode(mWeakReference.get().flutterPluginBinding.getApplicationContext(), path);
     }
 
     @Override
@@ -124,6 +129,16 @@ protected void onPostExecute(String s) {
       plugin._result.success(s);
       plugin.task.cancel(true);
       plugin.task = null;
+      if (s!=null) {
+        Vibrator myVib = (Vibrator) plugin.flutterPluginBinding.getApplicationContext().getSystemService(VIBRATOR_SERVICE);
+        if (myVib != null) {
+          if (Build.VERSION.SDK_INT >= 26) {
+            myVib.vibrate(VibrationEffect.createOneShot(50, VibrationEffect.DEFAULT_AMPLITUDE));
+          } else {
+            myVib.vibrate(50);
+          }
+        }
+      }
     }
   }
 }

android/src/main/java/com/chavesgu/scan/ScanViewNew.java

@@ -7,6 +7,7 @@
 import android.content.pm.ActivityInfo;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.VibrationEffect;
 import android.os.Vibrator;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -66,7 +67,11 @@ public void barcodeResult(BarcodeResult result) {
                 captureListener.onCapture(result.getText());
                 Vibrator myVib = (Vibrator) context.getSystemService(VIBRATOR_SERVICE);
                 if (myVib != null) {
-                    myVib.vibrate(50);
+                    if (Build.VERSION.SDK_INT >= 26) {
+                        myVib.vibrate(VibrationEffect.createOneShot(50, VibrationEffect.DEFAULT_AMPLITUDE));
+                    } else {
+                        myVib.vibrate(50);
+                    }
                 }
             }
         });

pubspec.yaml

@@ -1,6 +1,6 @@
 name: scan
-description: flutter widget to scan qrcode customly.Get qrcode from image path.
-version: 1.2.0
+description: scan qrcode in widget tree.decode qrcode image from path.
+version: 1.3.0
 homepage: https://github.com/chavesgu/FlutterScan
 
 environment: