v1.0.8 fix #13

bingoogolapple · bingoogolapple · commit 9b29b6802ff4 · 2016-05-27T04:09:19.000+08:00
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@
 
 ```groovy
 dependencies {
-    compile 'com.google.zxing:core:3.1.0'
+    compile 'com.google.zxing:core:3.2.1'
     compile 'cn.bingoogolapple:bga-qrcodecore:latestVersion@aar'
     compile 'cn.bingoogolapple:bga-zxing:latestVersion@aar'
 }
@@ -260,6 +260,6 @@ void onEncodeQRCodeFailure()
 
 ### 关于我
 
-| 新浪微博 | 个人主页 | 邮箱 | BGA系列开源库QQ群 |
-| ------------ | ------------- | ------------ | ------------ |
-| <a href="http://weibo.com/bingoogol" target="_blank">bingoogolapple</a> | <a  href="http://www.bingoogolapple.cn" target="_blank">bingoogolapple.cn</a>  | <a href="mailto:bingoogolapple@gmail.com" target="_blank">bingoogolapple@gmail.com</a> | ![BGA_CODE_CLUB](http://7xk9dj.com1.z0.glb.clouddn.com/BGA_CODE_CLUB.png?imageView2/2/w/200) |
+| 新浪微博 | 个人主页 | 邮箱 | BGA系列开源库QQ群 | 如果你觉得这个库确实对你有帮助，可以考虑赞助我一块钱买机械键盘来撸代码 |
+| ------------ | ------------- | ------------ | ------------ | ------------ |
+| <a href="http://weibo.com/bingoogol" target="_blank">bingoogolapple</a> | <a  href="http://www.bingoogolapple.cn" target="_blank">bingoogolapple.cn</a>  | <a href="mailto:bingoogolapple@gmail.com" target="_blank">bingoogolapple@gmail.com</a> | ![BGA_CODE_CLUB](http://7xk9dj.com1.z0.glb.clouddn.com/BGA_CODE_CLUB.png?imageView2/2/w/200) | ![BGA_AliPay](http://7xk9dj.com1.z0.glb.clouddn.com/BGAAliPay.JPG?imageView2/2/w/300) |
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0-beta1'
+        classpath 'com.android.tools.build:gradle:2.1.0'
 
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle.properties b/gradle.properties
@@ -3,8 +3,8 @@ ANDROID_BUILD_TARGET_SDK_VERSION=23
 ANDROID_BUILD_SDK_VERSION=23
 ANDROID_BUILD_TOOLS_VERSION=23.0.3
 
-VERSION_NAME=1.0.7
-VERSION_CODE=107
+VERSION_NAME=1.0.8
+VERSION_CODE=108
 
 
 
diff --git a/qrcodecore/src/main/java/cn/bingoogolapple/qrcode/core/CameraPreview.java b/qrcodecore/src/main/java/cn/bingoogolapple/qrcode/core/CameraPreview.java
@@ -4,7 +4,6 @@
 import android.content.pm.PackageManager;
 import android.hardware.Camera;
 import android.os.Handler;
-import android.util.AttributeSet;
 import android.util.Log;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
@@ -22,10 +21,6 @@ public CameraPreview(Context context) {
         super(context);
     }
 
-    public CameraPreview(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
     public void setCamera(Camera camera) {
         mCamera = camera;
         if (mCamera != null) {
diff --git a/qrcodecore/src/main/java/cn/bingoogolapple/qrcode/core/ProcessDataTask.java b/qrcodecore/src/main/java/cn/bingoogolapple/qrcode/core/ProcessDataTask.java
@@ -0,0 +1,40 @@
+package cn.bingoogolapple.qrcode.core;
+
+import android.hardware.Camera;
+import android.os.AsyncTask;
+
+public class ProcessDataTask extends AsyncTask<Void,Void,String> {
+    private Camera mCamera;
+    private byte[] mData;
+    private Delegate mDelegate;
+
+    public ProcessDataTask(Camera camera, byte[] data, Delegate delegate) {
+        mCamera = camera;
+        mData = data;
+        mDelegate = delegate;
+    }
+
+    @Override
+    protected String doInBackground(Void... params) {
+        Camera.Parameters parameters = mCamera.getParameters();
+        Camera.Size size = parameters.getPreviewSize();
+        int width = size.width;
+        int height = size.height;
+
+        byte[] rotatedData = new byte[mData.length];
+        for (int y = 0; y < height; y++) {
+            for (int x = 0; x < width; x++) {
+                rotatedData[x * height + height - y - 1] = mData[x + y * width];
+            }
+        }
+        int tmp = width;
+        width = height;
+        height = tmp;
+
+        return mDelegate.processData(rotatedData, width, height);
+    }
+
+    public interface Delegate {
+        String processData(byte[] data, int width, int height);
+    }
+}
diff --git a/qrcodecore/src/main/java/cn/bingoogolapple/qrcode/core/QRCodeView.java b/qrcodecore/src/main/java/cn/bingoogolapple/qrcode/core/QRCodeView.java
@@ -3,16 +3,18 @@
 import android.content.Context;
 import android.hardware.Camera;
 import android.os.Handler;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.FrameLayout;
 
-public abstract class QRCodeView extends FrameLayout implements Camera.PreviewCallback {
+public abstract class QRCodeView extends FrameLayout implements Camera.PreviewCallback, ProcessDataTask.Delegate {
     protected Camera mCamera;
     protected CameraPreview mPreview;
     protected ScanBoxView mScanBoxView;
     protected Delegate mDelegate;
     protected Handler mHandler;
+    protected boolean mSpotAble = false;
 
     public QRCodeView(Context context, AttributeSet attributeSet) {
         this(context, attributeSet, 0);
@@ -103,6 +105,8 @@ public void startSpot() {
      * @param delay
      */
     public void startSpotDelay(int delay) {
+        mSpotAble = true;
+
         startCamera();
         // 开始前先移除之前的任务
         mHandler.removeCallbacks(mOneShotPreviewCallbackTask);
@@ -113,6 +117,8 @@ public void startSpotDelay(int delay) {
      * 停止识别
      */
     public void stopSpot() {
+        mSpotAble = false;
+
         if (mCamera != null) {
             mCamera.setOneShotPreviewCallback(null);
         }
@@ -152,32 +158,30 @@ public void closeFlashlight() {
     }
 
     @Override
-    public void onPreviewFrame(byte[] data, Camera camera) {
-        Camera.Parameters parameters = camera.getParameters();
-        Camera.Size size = parameters.getPreviewSize();
-        int width = size.width;
-        int height = size.height;
-
-        byte[] rotatedData = new byte[data.length];
-        for (int y = 0; y < height; y++) {
-            for (int x = 0; x < width; x++) {
-                rotatedData[x * height + height - y - 1] = data[x + y * width];
-            }
+    public void onPreviewFrame(final byte[] data, final Camera camera) {
+        if (mSpotAble) {
+            new ProcessDataTask(camera, data, this) {
+                @Override
+                protected void onPostExecute(String result) {
+                    if (mSpotAble) {
+                        if (mDelegate != null && !TextUtils.isEmpty(result)) {
+                            mDelegate.onScanQRCodeSuccess(result);
+                        } else {
+                            try {
+                                camera.setOneShotPreviewCallback(QRCodeView.this);
+                            } catch (RuntimeException e) {
+                            }
+                        }
+                    }
+                }
+            }.execute();
         }
-        int tmp = width;
-        width = height;
-        height = tmp;
-        data = rotatedData;
-
-        handleData(data, width, height, camera);
     }
 
-    protected abstract void handleData(byte[] data, int width, int height, Camera camera);
-
     private Runnable mOneShotPreviewCallbackTask = new Runnable() {
         @Override
         public void run() {
-            if (mCamera != null) {
+            if (mCamera != null && mSpotAble) {
                 mCamera.setOneShotPreviewCallback(QRCodeView.this);
             }
         }
diff --git a/zbar/src/main/java/cn/bingoogolapple/qrcode/zbar/ZBarView.java b/zbar/src/main/java/cn/bingoogolapple/qrcode/zbar/ZBarView.java
@@ -1,8 +1,6 @@
 package cn.bingoogolapple.qrcode.zbar;
 
 import android.content.Context;
-import android.hardware.Camera;
-import android.os.AsyncTask;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 
@@ -43,40 +41,20 @@ public void setupScanner() {
     }
 
     @Override
-    protected void handleData(final byte[] data, final int width, final int height, final Camera camera) {
-        new AsyncTask<Void,Void,String>() {
-
-            @Override
-            protected String doInBackground(Void... params) {
-                String result = null;
-                Image barcode = new Image(width, height, "Y800");
-                barcode.setData(data);
-                if (mScanner.scanImage(barcode) != 0) {
-                    SymbolSet syms = mScanner.getResults();
-                    for (Symbol sym : syms) {
-                        String symData = sym.getData();
-                        if (!TextUtils.isEmpty(symData)) {
-                            result = symData;
-                            break;
-                        }
-                    }
-                }
-                return result;
-            }
-
-            @Override
-            protected void onPostExecute(String result) {
-                if (mDelegate != null && !TextUtils.isEmpty(result)) {
-                    mDelegate.onScanQRCodeSuccess(result);
-                } else {
-                    try {
-                        camera.setOneShotPreviewCallback(ZBarView.this);
-                    } catch (RuntimeException e) {
-                    }
+    public String processData(byte[] data, int width, int height) {
+        String result = null;
+        Image barcode = new Image(width, height, "Y800");
+        barcode.setData(data);
+        if (mScanner.scanImage(barcode) != 0) {
+            SymbolSet syms = mScanner.getResults();
+            for (Symbol sym : syms) {
+                String symData = sym.getData();
+                if (!TextUtils.isEmpty(symData)) {
+                    result = symData;
+                    break;
                 }
             }
-        }.execute();
-
+        }
+        return result;
     }
-
 }
diff --git a/zbardemo/build.gradle b/zbardemo/build.gradle
@@ -13,12 +13,12 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:23.3.0'
-    compile 'pub.devrel:easypermissions:0.1.5'
+    compile 'com.android.support:appcompat-v7:23.4.0'
+    compile 'pub.devrel:easypermissions:0.1.6'
 //    compile project(':zbar')
 
     // -------------------- 以下两个库是必须依赖的 ----------------------------
-    compile 'cn.bingoogolapple:bga-qrcodecore:1.0.7@aar'
-    compile 'cn.bingoogolapple:bga-zbar:1.0.7@aar'
+    compile 'cn.bingoogolapple:bga-qrcodecore:1.0.8@aar'
+    compile 'cn.bingoogolapple:bga-zbar:1.0.8@aar'
     // -------------------- 以上两个库是必须依赖的 ----------------------------
 }
diff --git a/zxing/src/main/java/cn/bingoogolapple/qrcode/zxing/ZXingView.java b/zxing/src/main/java/cn/bingoogolapple/qrcode/zxing/ZXingView.java
@@ -1,9 +1,6 @@
 package cn.bingoogolapple.qrcode.zxing;
 
 import android.content.Context;
-import android.hardware.Camera;
-import android.os.AsyncTask;
-import android.text.TextUtils;
 import android.util.AttributeSet;
 
 import com.google.zxing.BinaryBitmap;
@@ -17,7 +14,6 @@
 public class ZXingView extends QRCodeView {
     private MultiFormatReader mMultiFormatReader;
 
-
     public ZXingView(Context context, AttributeSet attributeSet) {
         this(context, attributeSet, 0);
     }
@@ -33,40 +29,21 @@ private void initMultiFormatReader() {
     }
 
     @Override
-    protected void handleData(final byte[] data, final int width, final int height, final Camera camera) {
-        new AsyncTask<Void,Void,String>() {
-
-            @Override
-            protected String doInBackground(Void... params) {
-                String result = null;
-                Result rawResult = null;
-
-                try {
-                    PlanarYUVLuminanceSource source = new PlanarYUVLuminanceSource(data, width, height, 0, 0, width, height, false);
-                    rawResult = mMultiFormatReader.decodeWithState(new BinaryBitmap(new HybridBinarizer(source)));
-                } catch (Exception e) {
-                } finally {
-                    mMultiFormatReader.reset();
-                }
-
-                if (rawResult != null) {
-                    result = rawResult.getText();
-                }
-                return result;
-            }
-
-            @Override
-            protected void onPostExecute(String result) {
-                if (mDelegate != null && !TextUtils.isEmpty(result)) {
-                    mDelegate.onScanQRCodeSuccess(result);
-                } else {
-                    try {
-                        camera.setOneShotPreviewCallback(ZXingView.this);
-                    } catch (RuntimeException e) {
-                    }
-
-                }
-            }
-        }.execute();
+    public String processData(byte[] data, int width, int height) {
+        String result = null;
+        Result rawResult = null;
+
+        try {
+            PlanarYUVLuminanceSource source = new PlanarYUVLuminanceSource(data, width, height, 0, 0, width, height, false);
+            rawResult = mMultiFormatReader.decodeWithState(new BinaryBitmap(new HybridBinarizer(source)));
+        } catch (Exception e) {
+        } finally {
+            mMultiFormatReader.reset();
+        }
+
+        if (rawResult != null) {
+            result = rawResult.getText();
+        }
+        return result;
     }
 }
diff --git a/zxingdemo/build.gradle b/zxingdemo/build.gradle
@@ -13,13 +13,13 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:23.3.0'
-    compile 'pub.devrel:easypermissions:0.1.5'
+    compile 'com.android.support:appcompat-v7:23.4.0'
+    compile 'pub.devrel:easypermissions:0.1.6'
 //    compile project(':zxing')
 
     // -------------------- 以下三个库是必须依赖的 ----------------------------
     compile 'com.google.zxing:core:3.2.1'
-    compile 'cn.bingoogolapple:bga-qrcodecore:1.0.7@aar'
-    compile 'cn.bingoogolapple:bga-zxing:1.0.7@aar'
+    compile 'cn.bingoogolapple:bga-qrcodecore:1.0.8@aar'
+    compile 'cn.bingoogolapple:bga-zxing:1.0.8@aar'
     // -------------------- 以上三个库是必须依赖的 ----------------------------
 }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`jcenter()`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:2.1.0-beta1'`
	`8`	`+ classpath 'com.android.tools.build:gradle:2.1.0'`
`9`	`9`
`10`	`10`
`11`	`11`	`// NOTE: Do not place your application dependencies here; they belong`