修复横屏崩溃的问题

Author: devilsen

README.md

@@ -9,7 +9,7 @@ C++ port of ZXing for Android
 ### 使用
 在gradle中:
 ``` groovy
-implementation 'me.devilsen:CZXing:0.8.7'
+implementation 'me.devilsen:CZXing:0.8.8'
 ```
 建议加入abiFilters
 ```gradle

czxing/build.gradle

@@ -7,7 +7,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 14
-        versionName "0.8.7"
+        versionName "0.8.8"
 
         externalNativeBuild {
             cmake {

czxing/src/main/cpp/ImageScheduler.cpp

@@ -40,7 +40,7 @@ ImageScheduler::process(jbyte *bytes, int left, int top, int cropWidth, int crop
     }
     isProcessing = true;
 
-    LOGE("process begin...");
+//    LOGE("process begin...");
 
     frameData.bytes = bytes;
     frameData.left = left;
@@ -81,7 +81,7 @@ void ImageScheduler::readyMat() {
     Mat gray;
     cvtColor(src, gray, COLOR_RGBA2GRAY);
 
-    LOGE("start decode...");
+//    LOGE("start decode...");
     decodeGrayPixels(gray);
 }
 
@@ -223,7 +223,7 @@ Result ImageScheduler::decodePixels(Mat mat) {
 }
 
 bool ImageScheduler::analysisBrightness(const FrameData frameData) {
-    LOGE("start analysisBrightness...");
+//    LOGE("start analysisBrightness...");
 
     // 像素点的总亮度
     unsigned long pixelLightCount = 0L;

czxing/src/main/cpp/zxing/src/qrcode/QRFinderPatternFinder.cpp

@@ -208,9 +208,9 @@ static float CrossCheckVertical(const BitMatrix& image, int startI, int centerJ,
 		stateCount[4]++;
 		i++;
 	}
-//	if (stateCount[4] >= maxCount) {
-//		return std::numeric_limits<float>::quiet_NaN();
-//	}
+	if (stateCount[4] >= maxCount && stateCount[0] > maxCount) {
+		return std::numeric_limits<float>::quiet_NaN();
+	}
 
 	// If we found a finder-pattern-like section, but its size is more than 40% different than
 	// the original, assume it's a false positive
@@ -274,9 +274,9 @@ static float CrossCheckHorizontal(const BitMatrix& image, int startJ, int center
 		stateCount[4]++;
 		j++;
 	}
-//	if (stateCount[4] >= maxCount) {
-//		return std::numeric_limits<float>::quiet_NaN();
-//	}
+	if (stateCount[4] >= maxCount && stateCount[0] > maxCount) {
+		return std::numeric_limits<float>::quiet_NaN();
+	}
 
 	// If we found a finder-pattern-like section, but its size is significantly different than
 	// the original, assume it's a false positive

czxing/src/main/java/me/devilsen/czxing/ScanActivity.java

@@ -99,8 +99,8 @@ private void initData() {
     @Override
     protected void onStart() {
         super.onStart();
-        mScanView.openCamera(); // 打开后置摄像头开始预览，但是并未开始识别
-        mScanView.startScan();  // 显示扫描框，并开始识别
+//        mScanView.openCamera(); // 打开后置摄像头开始预览，但是并未开始识别
+//        mScanView.startScan();  // 显示扫描框，并开始识别
     }
 
     @Override
@@ -123,8 +123,8 @@ protected void onPause() {
 
     @Override
     protected void onStop() {
-        mScanView.stopScan();
-        mScanView.closeCamera(); // 关闭摄像头预览，并且隐藏扫描框
+//        mScanView.stopScan();
+//        mScanView.closeCamera(); // 关闭摄像头预览，并且隐藏扫描框
         super.onStop();
     }
 

czxing/src/main/java/me/devilsen/czxing/util/ResolutionAdapterUtil.java

@@ -1,5 +1,9 @@
 package me.devilsen.czxing.util;
 
+import android.content.Context;
+
+import me.devilsen.czxing.camera.CameraUtil;
+
 /**
  * desc : 分辨率转换util
  * date : 2019-08-20 17:07
@@ -23,10 +27,10 @@ public void setResolutionSize(int resolutionWidth, int resolutionHeight) {
         setRatio();
     }
 
-    public void setCameraSize(int cameraWidth, int cameraHeight) {
+    public void setCameraSize(boolean portrait, int cameraWidth, int cameraHeight) {
         this.cameraWidth = cameraWidth;
         this.cameraHeight = cameraHeight;
-        if (cameraWidth > cameraHeight) {
+        if (portrait) {
             int temp = this.cameraWidth;
             this.cameraWidth = this.cameraHeight;
             this.cameraHeight = temp;

czxing/src/main/java/me/devilsen/czxing/view/BarCoderView.java

@@ -5,6 +5,7 @@
 import android.graphics.Rect;
 import android.hardware.Camera;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.ViewGroup;
 import android.view.animation.AccelerateDecelerateInterpolator;
 import android.widget.FrameLayout;
@@ -107,22 +108,21 @@ public void onPreviewFrame(byte[] data, Camera camera) {
             int top;
             int rowWidth = size.width;
             int rowHeight = size.height;
-            resolutionAdapter.setCameraSize(rowWidth, rowHeight);
             // 这里需要把得到的数据也翻转
-            if (CameraUtil.isPortrait(getContext())) {
+            boolean portrait = CameraUtil.isPortrait(getContext());
+            if (portrait) {
                 left = scanBoxRect.top - expandTop;
                 top = scanBoxRect.left;
             } else {
                 left = scanBoxRect.left;
-                top = scanBoxRect.top - expandTop;
+                top = scanBoxRect.top;
             }
 
+            resolutionAdapter.setCameraSize(portrait, rowWidth, rowHeight);
             left = resolutionAdapter.getAdapterWidth(left);
             top = resolutionAdapter.getAdapterHeight(top);
             scanBoxSize = resolutionAdapter.getAdapterWidth(scanBoxSize);
-
             scanDataStrategy(data, left, top, scanBoxSize, scanBoxSize, rowWidth, rowHeight);
-
         } catch (Exception e) {
             e.printStackTrace();
         }

czxing/src/main/java/me/devilsen/czxing/view/ScanBoxView.java

@@ -200,7 +200,8 @@ private void calFramingRect() {
 
         int viewWidth = getWidth();
         int viewHeight = getHeight();
-        mBoxSize = Math.min(viewWidth * 3 / 5, MAX_BOX_SIZE);
+        int minSize = Math.min(viewHeight, viewWidth);
+        mBoxSize = Math.min(minSize * 3 / 5, MAX_BOX_SIZE);
         mBoxLeft = (viewWidth - mBoxSize) / 2;
         mBoxTop = (viewHeight - mBoxSize) / 2 + mTopOffset;
         mFramingRect = new Rect(mBoxLeft, mBoxTop, mBoxLeft + mBoxSize, mBoxTop + mBoxSize);

sample/build.gradle

@@ -48,7 +48,7 @@ android {
 dependencies {
 
 //    implementation project(':czxing')
-    implementation 'me.devilsen:CZXing:0.8.7'
+    implementation 'me.devilsen:CZXing:0.8.8'
 
     implementation rootProject.ext.appcompat
     testImplementation rootProject.ext.junit