当缩小之后不再自动放大

Author: devilsen

czxing/src/main/java/me/devilsen/czxing/camera/CameraSurface.java

@@ -30,6 +30,7 @@ public class CameraSurface extends SurfaceView implements SensorController.Camer
     private boolean mIsTouchFocusing;
     private boolean mSurfaceCreated;
     private boolean mFlashLightIsOpen;
+    private boolean mZoomOutFlag;
 
     private Point focusCenter;
     private long mLastTouchTime;
@@ -241,6 +242,7 @@ void handleZoom(boolean isZoomIn, int scale) {
                 zoom += scale;
             } else if (!isZoomIn && zoom > 0) {
                 BarCodeUtil.d("缩小");
+                mZoomOutFlag = true;
                 zoom -= scale;
             } else {
                 BarCodeUtil.d("既不放大也不缩小");
@@ -333,6 +335,15 @@ public boolean isPreviewing() {
         return mCamera != null && mPreviewing && mSurfaceCreated;
     }
 
+    /**
+     * 是否有过缩小操作
+     *
+     * @return true：缩小过
+     */
+    public boolean hadZoomOut() {
+        return mZoomOutFlag;
+    }
+
     private void handleFocus(float x, float y) {
         float centerX = x;
         float centerY = y;

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

@@ -5,7 +5,6 @@
 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;
@@ -309,7 +308,7 @@ void tryZoom(CodeResult result) {
 
     private void handleAutoZoom(int len) {
         try {
-            if (mCamera == null || mScanBoxView == null || len <= 0) {
+            if (mCamera == null || mScanBoxView == null || len <= 0 || mCameraSurface.hadZoomOut()) {
                 return;
             }