diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index f9f763c..459cce7 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index d1d6470..895345d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,6 +18,9 @@ android { } } + lintOptions { + abortOnError false + } } dependencies { diff --git a/app/release/app-release.apk b/app/release/app-release.apk index 631ac0b..11c52fe 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/release/output.json b/app/release/output.json index 1caf134..f72fe2b 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":3,"versionName":"1.0.2","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":4,"versionName":"1.0.3","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/lib/build.gradle b/lib/build.gradle index f023a50..800f99c 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -20,6 +20,9 @@ android { } } + lintOptions { + abortOnError false + } } dependencies { diff --git a/lib/src/main/java/com/king/zxing/CaptureActivity.java b/lib/src/main/java/com/king/zxing/CaptureActivity.java index b1adc50..b2a80d3 100644 --- a/lib/src/main/java/com/king/zxing/CaptureActivity.java +++ b/lib/src/main/java/com/king/zxing/CaptureActivity.java @@ -19,17 +19,19 @@ package com.king.zxing; import android.app.Activity; import android.content.Intent; -import android.content.SharedPreferences; import android.content.pm.ActivityInfo; import android.content.res.Configuration; import android.graphics.Bitmap; +import android.graphics.Rect; +import android.graphics.RectF; +import android.hardware.Camera; import android.net.Uri; import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.preference.PreferenceManager; import android.util.Log; import android.view.KeyEvent; +import android.view.MotionEvent; import android.view.Surface; import android.view.SurfaceHolder; import android.view.SurfaceView; @@ -40,12 +42,12 @@ import android.view.WindowManager; import com.google.zxing.BarcodeFormat; import com.google.zxing.DecodeHintType; import com.google.zxing.Result; -import com.google.zxing.ResultMetadataType; import com.king.zxing.camera.CameraManager; import java.io.IOException; +import java.util.ArrayList; import java.util.Collection; -import java.util.EnumSet; +import java.util.List; import java.util.Map; /** @@ -62,16 +64,18 @@ public class CaptureActivity extends Activity implements SurfaceHolder.Callback private static final String TAG = CaptureActivity.class.getSimpleName(); - private static final long DEFAULT_INTENT_RESULT_DURATION_MS = 1500L; - private static final long BULK_MODE_SCAN_DELAY_MS = 1000L; +// private static final long DEFAULT_INTENT_RESULT_DURATION_MS = 1500L; +// private static final long BULK_MODE_SCAN_DELAY_MS = 1000L; + + private static final int DEVIATION = 6; private static final String[] ZXING_URLS = { "http://zxing.appspot.com/scan", "zxing://scan/" }; - private static final Collection DISPLAYABLE_METADATA_TYPES = - EnumSet.of(ResultMetadataType.ISSUE_NUMBER, - ResultMetadataType.SUGGESTED_PRICE, - ResultMetadataType.ERROR_CORRECTION_LEVEL, - ResultMetadataType.POSSIBLE_COUNTRY); +// private static final Collection DISPLAYABLE_METADATA_TYPES = +// EnumSet.of(ResultMetadataType.ISSUE_NUMBER, +// ResultMetadataType.SUGGESTED_PRICE, +// ResultMetadataType.ERROR_CORRECTION_LEVEL, +// ResultMetadataType.POSSIBLE_COUNTRY); private CameraManager cameraManager; private CaptureActivityHandler handler; @@ -93,6 +97,12 @@ public class CaptureActivity extends Activity implements SurfaceHolder.Callback private BeepManager beepManager; private AmbientLightManager ambientLightManager; + /** + * 是否支持缩放（变焦），默认支持 + */ + private boolean isZoom = true; + private float oldDistance; + public ViewfinderView getViewfinderView() { return viewfinderView; } @@ -157,6 +167,7 @@ public class CaptureActivity extends Activity implements SurfaceHolder.Callback // want to open the camera driver and measure the screen size if we're going to show the help on // first launch. That led to bugs where the scanning rectangle was the wrong size and partially // off screen. + cameraManager = new CameraManager(getApplication()); viewfinderView = findViewById(getViewFinderViewId()); viewfinderView.setCameraManager(cameraManager); @@ -167,11 +178,7 @@ public class CaptureActivity extends Activity implements SurfaceHolder.Callback handler = null; lastResult = null; - if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) { - setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); - } else { - setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); - } + setRequestedOrientation(getCurrentOrientation()); resetStatusView(); @@ -711,17 +718,17 @@ public class CaptureActivity extends Activity implements SurfaceHolder.Callback // ClipboardInterface.setText(resultHandler.getDisplayContents(), this); // } // } - - private void sendReplyMessage(int id, Object arg, long delayMS) { - if (handler != null) { - Message message = Message.obtain(handler, id, arg); - if (delayMS > 0L) { - handler.sendMessageDelayed(message, delayMS); - } else { - handler.sendMessage(message); - } - } - } +// +// private void sendReplyMessage(int id, Object arg, long delayMS) { +// if (handler != null) { +// Message message = Message.obtain(handler, id, arg); +// if (delayMS > 0L) { +// handler.sendMessageDelayed(message, delayMS); +// } else { +// handler.sendMessage(message); +// } +// } +// } private void initCamera(SurfaceHolder surfaceHolder) { if (surfaceHolder == null) { @@ -776,4 +783,153 @@ public class CaptureActivity extends Activity implements SurfaceHolder.Callback public void drawViewfinder() { viewfinderView.drawViewfinder(); } + + @Override + public boolean onTouchEvent(MotionEvent event) { + if(isZoom && cameraManager.isOpen()){ + Camera camera = cameraManager.getOpenCamera().getCamera(); + if(camera ==null){ + return super.onTouchEvent(event); + } + if (event.getPointerCount() == 1) {//单点触控，聚焦 + focusOnTouch(event,camera); + } else { + switch (event.getAction() & MotionEvent.ACTION_MASK) {//多点触控 + case MotionEvent.ACTION_POINTER_DOWN: + oldDistance = calcFingerSpacing(event); + break; + case MotionEvent.ACTION_MOVE: + float newDistance = calcFingerSpacing(event); + + if (newDistance > oldDistance + DEVIATION) {// + handleZoom(true, camera); + } else if (newDistance < oldDistance - DEVIATION) { + handleZoom(false, camera); + } + oldDistance = newDistance; + break; + } + } + } + return super.onTouchEvent(event); + } + + public boolean isZoom() { + return isZoom; + } + + public void setZoom(boolean zoom) { + isZoom = zoom; + } + + /** + * 处理变焦缩放 + * @param isZoomIn + * @param camera + */ + private void handleZoom(boolean isZoomIn, Camera camera) { + Camera.Parameters params = camera.getParameters(); + if (params.isZoomSupported()) { + int maxZoom = params.getMaxZoom(); + int zoom = params.getZoom(); + if (isZoomIn && zoom < maxZoom) { + zoom++; + } else if (zoom > 0) { + zoom--; + } + params.setZoom(zoom); + camera.setParameters(params); + } else { + Log.i(TAG, "zoom not supported"); + } + } + + /** + * 聚焦 + * @param event + * @param camera + */ + public void focusOnTouch(MotionEvent event,Camera camera) { + + Camera.Parameters params = camera.getParameters(); + Camera.Size previewSize = params.getPreviewSize(); + + Rect focusRect = calcTapArea(event.getRawX(), event.getRawY(), 1f,previewSize); + Rect meteringRect = calcTapArea(event.getRawX(), event.getRawY(), 1.5f,previewSize); + Camera.Parameters parameters = camera.getParameters(); + if (parameters.getMaxNumFocusAreas() > 0) { + List focusAreas = new ArrayList<>(); + focusAreas.add(new Camera.Area(focusRect, 600)); + parameters.setFocusAreas(focusAreas); + } + + if (parameters.getMaxNumMeteringAreas() > 0) { + List meteringAreas = new ArrayList<>(); + meteringAreas.add(new Camera.Area(meteringRect, 600)); + parameters.setMeteringAreas(meteringAreas); + } + final String currentFocusMode = params.getFocusMode(); + params.setFocusMode(Camera.Parameters.FOCUS_MODE_MACRO); + camera.setParameters(params); + + camera.autoFocus(new Camera.AutoFocusCallback() { + @Override + public void onAutoFocus(boolean success, Camera camera) { + Camera.Parameters params = camera.getParameters(); + params.setFocusMode(currentFocusMode); + camera.setParameters(params); + } + }); + + } + + /** + * 计算两指间距离 + * @param event + * @return + */ + private float calcFingerSpacing(MotionEvent event) { + float x = event.getX(0) - event.getX(1); + float y = event.getY(0) - event.getY(1); + return (float) Math.sqrt(x * x + y * y); + } + + /** + * 计算对焦区域 + * @param x + * @param y + * @param coefficient + * @param previewSize + * @return + */ + private Rect calcTapArea(float x, float y, float coefficient,Camera.Size previewSize) { + float focusAreaSize = 200; + int areaSize = Float.valueOf(focusAreaSize * coefficient).intValue(); + int centerX = (int) ((x / previewSize.width) * 2000 - 1000); + int centerY = (int) ((y / previewSize.height) * 2000 - 1000); + int left = clamp(centerX - (areaSize / 2), -1000, 1000); + int top = clamp(centerY - (areaSize / 2), -1000, 1000); + RectF rectF = new RectF(left, top, left + areaSize, top + areaSize); + return new Rect(Math.round(rectF.left), Math.round(rectF.top), + Math.round(rectF.right), Math.round(rectF.bottom)); + } + + /** + * + * @param x + * @param min + * @param max + * @return + */ + private int clamp(int x, int min, int max) { + if (x > max) { + return max; + } + if (x < min) { + return min; + } + return x; + } + + } \ No newline at end of file diff --git a/lib/src/main/java/com/king/zxing/camera/CameraConfigurationManager.java b/lib/src/main/java/com/king/zxing/camera/CameraConfigurationManager.java index f1fc216..d6813d0 100644 --- a/lib/src/main/java/com/king/zxing/camera/CameraConfigurationManager.java +++ b/lib/src/main/java/com/king/zxing/camera/CameraConfigurationManager.java @@ -158,6 +158,10 @@ final class CameraConfigurationManager { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + if(parameters.isZoomSupported()){ + parameters.setZoom(parameters.getMaxZoom() / 10); + } + theCamera.setDisplayOrientation(90); theCamera.setParameters(parameters);