优化一些细节

devilsen · Sep 17, 2019 · d1d97d1 · d1d97d1
1 parent feb0f67
commit d1d97d1
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ C++ port of ZXing for Android
 ### 使用
 在gradle中:
 ``` groovy
-implementation 'me.devilsen:CZXing:0.8.9'
+implementation 'me.devilsen:CZXing:0.9'
 ```
 建议加入abiFilters
 ```gradle

diff --git a/czxing/build.gradle b/czxing/build.gradle
@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 14
-        versionName "0.8.9"
+        versionCode 16
+        versionName "0.9"
 
         externalNativeBuild {
             cmake {

diff --git a/czxing/opencv/libs/arm64-v8a/libopencv_imgcodecs.a b/czxing/opencv/libs/arm64-v8a/libopencv_imgcodecs.a
diff --git a/czxing/opencv/libs/armeabi-v7a/libopencv_imgcodecs.a b/czxing/opencv/libs/armeabi-v7a/libopencv_imgcodecs.a
diff --git a/czxing/src/main/cpp/ImageScheduler.cpp b/czxing/src/main/cpp/ImageScheduler.cpp
@@ -215,10 +215,9 @@ void ImageScheduler::decodeAdaptivePixels(const Mat &gray) {
     Result result = decodePixels(lightMat);
     if (result.isValid()) {
         javaCallHelper->onResult(result);
+    } else {
+        recognizerQrCode(gray);
     }
-//    } else {
-//        recognizerQrCode(gray);
-//    }
 }
 
 void ImageScheduler::recognizerQrCode(const Mat &mat) {

diff --git a/czxing/src/main/java/me/devilsen/czxing/view/BarCoderView.java b/czxing/src/main/java/me/devilsen/czxing/view/BarCoderView.java
@@ -308,6 +308,8 @@ void tryZoom(CodeResult result) {
 
     private void handleAutoZoom(int len) {
         try {
+            BarCodeUtil.d("len: " + len);
+
             if (mCamera == null || mScanBoxView == null || len <= 0 || mCameraSurface.hadZoomOut()) {
                 return;
             }

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -47,8 +47,8 @@ android {
 
 dependencies {
 
-    implementation project(':czxing')
-//    implementation 'me.devilsen:CZXing:0.8.9'
+//    implementation project(':czxing')
+    implementation 'me.devilsen:CZXing:0.9'
 
     implementation rootProject.ext.appcompat
     testImplementation rootProject.ext.junit
-Original file line number
+Diff line change
@@ Expand Up / @@ -308,6 +308,8 @@ void tryZoom(CodeResult result) { @@
         private void handleAutoZoom(int len) {
             try {
+                BarCodeUtil.d("len: " + len);
                 if (mCamera == null || mScanBoxView == null || len <= 0 || mCameraSurface.hadZoomOut()) {
                     return;
                 }
@@ Expand Down @@