Update

qinshihuang59 · Jul 22, 2016 · 6be7ecf · 6be7ecf
1 parent fe9f439
commit 6be7ecf
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 6 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.github.yoojia.zxing" >
 
-
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"

diff --git a/zxing/src/main/AndroidManifest.xml b/zxing/src/main/AndroidManifest.xml
@@ -2,8 +2,10 @@
     package="com.github.yoojia.qrcode"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-feature android:name="android.hardware.camera" android:required="true"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
-    <uses-feature android:name="android.hardware.camera"/>
-    <uses-feature android:name="android.hardware.camera.autofocus"/>
 </manifest>
diff --git a/zxing/src/main/java/com/github/yoojia/zxing2/camera/BitmapCallback.java b/zxing/src/main/java/com/github/yoojia/zxing2/camera/BitmapCallback.java
@@ -0,0 +1,19 @@
+package com.github.yoojia.zxing2.camera;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.hardware.Camera;
+
+/**
+ * @author Yoojia Chen (yoojiachen@gmail.com)
+ * @since 2.0
+ */
+public abstract class BitmapCallback implements Camera.PictureCallback {
+
+    @Override
+    public void onPictureTaken(byte[] data, Camera camera) {
+        onPictureTaken(BitmapFactory.decodeByteArray(data, 0, data.length));
+    }
+
+    public abstract void onPictureTaken(Bitmap bitmap);
+}
diff --git a/zxing/src/main/java/com/github/yoojia/zxing2/camera/Cameras.java b/zxing/src/main/java/com/github/yoojia/zxing2/camera/Cameras.java
@@ -1,11 +1,9 @@
 package com.github.yoojia.zxing2.camera;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.hardware.Camera;
-import android.view.Surface;
 
 /**
  * @author Yoojia Chen (yoojiachen@gmail.com)
@@ -44,6 +42,11 @@ public static boolean isAutoFocusSupported(Camera camera) {
         return camera.getParameters().getSupportedFocusModes().contains(Camera.Parameters.FOCUS_MODE_AUTO);
     }
 
+    /**
+     * 设置相机预览方式为跟随屏幕方向
+     * @param context Context
+     * @param camera Camera
+     */
     public static void followScreenOrientation(Context context, Camera camera){
         final int orientation = context.getResources().getConfiguration().orientation;
         if(orientation == Configuration.ORIENTATION_LANDSCAPE) {
@@ -52,4 +55,8 @@ public static void followScreenOrientation(Context context, Camera camera){
             camera.setDisplayOrientation(90);
         }
     }
+
+    public static void tackJPEGPicture(Camera camera, BitmapCallback callback) {
+        camera.takePicture(null, null, callback);
+    }
 }
diff --git a/zxing/src/main/java/com/github/yoojia/zxing2/camera/LiveCameraView.java b/zxing/src/main/java/com/github/yoojia/zxing2/camera/LiveCameraView.java
@@ -59,6 +59,9 @@ public void surfaceChanged(SurfaceHolder holder, int format, int width, int heig
 
     public void setCamera(Camera camera) {
         mCamera = camera;
+        final Camera.Parameters params = mCamera.getParameters();
+        params.setFocusMode(Camera.Parameters.FOCUS_MODE_AUTO);
+        params.setSceneMode(Camera.Parameters.SCENE_MODE_BARCODE);
     }
 
     private void startPreviewDisplay(SurfaceHolder holder){