优化细节

Author: jenly1314

README.md

@@ -81,27 +81,27 @@ allprojects {
 
 ```gradle
 // OpenCV基础库（*必须）
-implementation 'com.github.jenly1314.WeChatQRCode:opencv:1.1.0'
-implementation 'com.github.jenly1314.WeChatQRCode:opencv-armv7a:1.1.0'
+implementation 'com.github.jenly1314.WeChatQRCode:opencv:1.1.1'
+implementation 'com.github.jenly1314.WeChatQRCode:opencv-armv7a:1.1.1'
 
 // OpenCV的其他ABI（可选），根据你的需求选择想要的so支持
-implementation 'com.github.jenly1314.WeChatQRCode:opencv-armv64:1.1.0'
-implementation 'com.github.jenly1314.WeChatQRCode:opencv-x86:1.1.0'
-implementation 'com.github.jenly1314.WeChatQRCode:opencv-x86_64:1.1.0'
+implementation 'com.github.jenly1314.WeChatQRCode:opencv-armv64:1.1.1'
+implementation 'com.github.jenly1314.WeChatQRCode:opencv-x86:1.1.1'
+implementation 'com.github.jenly1314.WeChatQRCode:opencv-x86_64:1.1.1'
 
 // 微信二维码识别功能（可选）
-implementation 'com.github.jenly1314.WeChatQRCode:wechat-qrcode:1.1.0'
+implementation 'com.github.jenly1314.WeChatQRCode:wechat-qrcode:1.1.1'
 
 // 微信二维码扫码功能（可选）
-implementation 'com.github.jenly1314.WeChatQRCode:wechat-qrcode-scanning:1.1.0'
+implementation 'com.github.jenly1314.WeChatQRCode:wechat-qrcode-scanning:1.1.1'
 //MLKit的Camera核心库：如果您使用了wechat-qrcode-scanning，则必须依赖mlkit-camera-core库
-implementation 'com.github.jenly1314.MLKit:mlkit-camera-core:1.0.2'
+implementation 'com.github.jenly1314.MLKit:mlkit-camera-core:1.0.3'
 
 ```
 
 ## 示例
 
-初始化 **OpenCV** 和 **WeChatQRCodeDetector** （建议在 **Application** 的 **onCreate** 方法中初始化）
+初始化 **OpenCV** 和 **WeChatQRCodeDetector** （建议在 **MainActivity** 的 **onCreate** 方法中初始化）
 ```kotlin
         //初始化OpenCV
         OpenCV.initAsync(context)
@@ -176,6 +176,7 @@ class WeChatQRCodeActivity : WeChatCameraScanActivity() {
 ## 版本记录
 
 #### v1.1.1：2021-11-2
+* 优化细节
 * 更新mlkit-camera-core至v1.0.3
 
 #### v1.1.0：2021-8-6

app/release/app-release.apk

@@ -0,0 +1,18 @@
+{
+  "version": 2,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.king.wechat.qrcode.app",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "versionCode": 4,
+      "versionName": "1.1.1",
+      "outputFile": "app-release.apk"
+    }
+  ]
+}

app/release/output-metadata.json

@@ -18,8 +18,8 @@ android.useAndroidX = true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style   = official
 
-VERSION_NAME=1.1.0
-VERSION_CODE=3
+VERSION_NAME=1.1.1
+VERSION_CODE=4
 GROUP=com.github.jenly1314.WeChatQRCode
 
 POM_DESCRIPTION=Wechat QRCode

gradle.properties

@@ -1,7 +1,7 @@
 //App
 def app_version = [:]
-app_version.versionCode = 3
-app_version.versionName = "1.1.0"
+app_version.versionCode = 4
+app_version.versionName = "1.1.1"
 ext.app_version = app_version
 
 //build version

versions.gradle

@@ -7,27 +7,100 @@
 import com.king.mlkit.vision.camera.util.BitmapUtils;
 import com.king.mlkit.vision.camera.util.LogUtils;
 import com.king.wechat.qrcode.WeChatQRCodeDetector;
+
+import org.opencv.core.Mat;
+
+import java.util.ArrayList;
 import java.util.List;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.camera.core.ImageProxy;
 
 /**
  * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
  */
 public class WeChatScanningAnalyzer implements Analyzer<List<String>> {
+
+    /**
+     * 是否需要返回二维码的各个顶点
+     */
+    private boolean isNeedVertices;
+
+    public WeChatScanningAnalyzer(){
+        this(false);
+    }
+
+    /**
+     * 构造
+     * @param isNeedVertices 是否需要返回二维码的各个顶点
+     */
+    public WeChatScanningAnalyzer(boolean isNeedVertices){
+        this.isNeedVertices = isNeedVertices;
+    }
+
     @Override
     public void analyze(@NonNull ImageProxy imageProxy, @NonNull Analyzer.OnAnalyzeListener<AnalyzeResult<List<String>>> listener) {
         try {
             final Bitmap bitmap = BitmapUtils.getBitmap(imageProxy);
-            List<String> result = WeChatQRCodeDetector.detectAndDecode(bitmap);
-            if(result != null && result.size() > 0){
-                listener.onSuccess(new AnalyzeResult<>(bitmap,result));
+            AnalyzeResult<List<String>> result = detectAndDecode(bitmap, isNeedVertices);
+            if(result != null){
+                listener.onSuccess(result);
             }else{
                 listener.onFailure();
             }
         } catch (Exception e) {
             LogUtils.w(e);
         }
     }
+
+    /**
+     * 检测并识别二维码
+     * @param bitmap
+     * @param isNeedVertices
+     * @return
+     */
+    @Nullable
+    private AnalyzeResult<List<String>> detectAndDecode(Bitmap bitmap,boolean isNeedVertices) {
+        if(isNeedVertices){//如果需要返回二维码的各个顶点
+            final List<Mat> points = new ArrayList<>();
+            List<String> result = WeChatQRCodeDetector.detectAndDecode(bitmap, points);
+            if(result != null && result.size() > 0){
+                return new QRCodeAnalyzeResult<>(bitmap, result, points);
+            }
+        }else{//反之则需识别结果即可
+            List<String> result = WeChatQRCodeDetector.detectAndDecode(bitmap);
+            if(result != null && result.size() > 0){
+                return new QRCodeAnalyzeResult<>(bitmap, result);
+            }
+        }
+
+        return null;
+    }
+
+    public static class QRCodeAnalyzeResult<T> extends AnalyzeResult<T> {
+
+        private List<Mat> points;
+
+        public QRCodeAnalyzeResult() {
+            super();
+        }
+
+        public QRCodeAnalyzeResult(Bitmap bitmap, T result) {
+            super(bitmap,result);
+        }
+
+        public QRCodeAnalyzeResult(Bitmap bitmap, T result,List<Mat> points) {
+            super(bitmap,result);
+            this.points = points;
+        }
+
+        public List<Mat> getPoints() {
+            return points;
+        }
+
+        public void setPoints(List<Mat> points) {
+            this.points = points;
+        }
+    }
 }