修复内存泄漏的问题

Author: devilsen

README.md

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

czxing/build.gradle

@@ -7,7 +7,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 16
-        versionName "0.9"
+        versionName "0.9.1"
 
         externalNativeBuild {
             cmake {

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

@@ -234,23 +234,27 @@ void handleZoom(boolean isZoomIn) {
      * @param scale    放大缩小的数值
      */
     void handleZoom(boolean isZoomIn, int scale) {
-        Camera.Parameters params = mCamera.getParameters();
-        if (params.isZoomSupported()) {
-            int zoom = params.getZoom();
-            if (isZoomIn && zoom < params.getMaxZoom()) {
-                BarCodeUtil.d("放大");
-                zoom += scale;
-            } else if (!isZoomIn && zoom > 0) {
-                BarCodeUtil.d("缩小");
-                mZoomOutFlag = true;
-                zoom -= scale;
+        try {
+            Camera.Parameters params = mCamera.getParameters();
+            if (params.isZoomSupported()) {
+                int zoom = params.getZoom();
+                if (isZoomIn && zoom < params.getMaxZoom()) {
+                    BarCodeUtil.d("放大");
+                    zoom += scale;
+                } else if (!isZoomIn && zoom > 0) {
+                    BarCodeUtil.d("缩小");
+                    mZoomOutFlag = true;
+                    zoom -= scale;
+                } else {
+                    BarCodeUtil.d("既不放大也不缩小");
+                }
+                params.setZoom(zoom);
+                mCamera.setParameters(params);
             } else {
-                BarCodeUtil.d("既不放大也不缩小");
+                BarCodeUtil.d("不支持缩放");
             }
-            params.setZoom(zoom);
-            mCamera.setParameters(params);
-        } else {
-            BarCodeUtil.d("不支持缩放");
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 

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

@@ -56,7 +56,6 @@ public ScanView(Context context, AttributeSet attrs, int defStyleAttr) {
                 BarcodeFormat.EAN_13,
                 BarcodeFormat.UPC_A
         );
-        reader.setReadCodeListener(this);
     }
 
     @Override
@@ -71,6 +70,7 @@ public void onPreviewFrame(byte[] data, int left, int top, int width, int height
 
     @Override
     public void startScan() {
+        reader.setReadCodeListener(this);
         super.startScan();
         reader.prepareRead();
         isStop = false;
@@ -81,6 +81,7 @@ public void stopScan() {
         super.stopScan();
         reader.stopRead();
         isStop = true;
+        reader.setReadCodeListener(null);
     }
 
     @Override

sample/build.gradle

@@ -47,8 +47,9 @@ android {
 
 dependencies {
 
+//    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-beta-3'
 //    implementation project(':czxing')
-    implementation 'me.devilsen:CZXing:0.9'
+    implementation 'me.devilsen:CZXing:0.9.1'
 
     implementation rootProject.ext.appcompat
     testImplementation rootProject.ext.junit