Fix black screen bug by make CameraPreview a singleton

Fix "Method called after release()" caused by calling stopCameraPreview twice
ideacreation · Oct 25, 2016 · 06e5bc0 · 06e5bc0
1 parent dc460ba
commit 06e5bc0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/android/src/main/java/com/eguma/barcodescanner/CameraManager.java b/android/src/main/java/com/eguma/barcodescanner/CameraManager.java
@@ -4,11 +4,19 @@
 import java.util.List;
 
 public class CameraManager {
+    private static CameraManager mCameraManager;
+
     private int mCameraId = -1;
     private Camera mCamera;
 
-    public CameraManager() {
-        mCamera = getCameraInstance();
+    private CameraManager() {
+    }
+
+    public static CameraManager getInstance() {
+        if (mCameraManager == null) {
+            mCameraManager = new CameraManager();
+        }
+        return mCameraManager;
     }
 
     public Camera getCamera() {

diff --git a/android/src/main/java/com/eguma/barcodescanner/CameraPreview.java b/android/src/main/java/com/eguma/barcodescanner/CameraPreview.java
@@ -23,8 +23,8 @@
 import com.google.zxing.common.HybridBinarizer;
 
 public class CameraPreview extends SurfaceView implements SurfaceHolder.Callback {
-    private CameraManager mCameraManager;
-    private Camera mCamera;
+    private static CameraManager mCameraManager;
+    private static Camera mCamera;
     private String mCameraType;
     private Camera.PreviewCallback mPreviewCallback;
 
@@ -37,8 +37,7 @@ public class CameraPreview extends SurfaceView implements SurfaceHolder.Callback
 
     public CameraPreview(Context context, Camera.PreviewCallback previewCallback) {
         super(context);
-
-        mCameraManager = new CameraManager();
+        mCameraManager = CameraManager.getInstance();
         mAutoFocusHandler = new Handler();
         mPreviewCallback = previewCallback;
     }
@@ -89,6 +88,7 @@ public void stopCameraPreview() {
                 mCamera.cancelAutoFocus();
                 mCamera.setPreviewCallback(null);
                 mCamera.stopPreview();
+                mCamera = null;
             } catch(Exception e) {
                 Log.e(TAG, e.toString(), e);
             }