dynamsoft-capture-vision-react-native 1.1.3 → 1.1.4-beta09052010

package/android/src/main/java/com/dynamsoft/reactlibrary/RNDCECameraView.java

@@ -1,5 +1,8 @@
 package com.dynamsoft.reactlibrary;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.dynamsoft.dce.CameraEnhancer;
 import com.dynamsoft.dce.CameraEnhancerException;
 import com.dynamsoft.dce.DCECameraView;
@@ -10,12 +13,18 @@ import com.facebook.react.uimanager.ThemedReactContext;
 public class RNDCECameraView extends DCECameraView implements LifecycleEventListener {
 
     CameraEnhancer mCamera;
+    ReactApplicationContext mAppContext;
+    RNDynamsoftBarcodeReaderModule mDbrModule;
 
-    public RNDCECameraView(ThemedReactContext context, ReactApplicationContext appContext, CameraEnhancer cameraEnhancer) {
+    public RNDCECameraView(ThemedReactContext context, ReactApplicationContext appContext, @Nullable CameraEnhancer cameraEnhancer, @NonNull RNDynamsoftBarcodeReaderModule dbrModule) {
         super(context);
         context.addLifecycleEventListener(this);
+        mAppContext = appContext;
+        mDbrModule = dbrModule;
         mCamera = cameraEnhancer;
-        mCamera.setCameraView(this);
+        if(mCamera != null) {
+            mCamera.setCameraView(this);
+        }
     }
 
     @Override
@@ -40,6 +49,14 @@ public class RNDCECameraView extends DCECameraView implements LifecycleEventList
 
     @Override
     public void onHostResume() {
+        if(mCamera == null) {
+            if(mAppContext.getCurrentActivity() != null) {
+                mCamera = new CameraEnhancer(mAppContext.getCurrentActivity());
+                mCamera.setCameraView(this);
+                mDbrModule.mIsCameraAttached = false;
+                mDbrModule.mReader.setCameraEnhancer(mCamera);
+            }
+        }
         if(mCamera!=null){
             try {
                 mCamera.open();

package/android/src/main/java/com/dynamsoft/reactlibrary/RNDCECameraViewManager.java

@@ -7,6 +7,8 @@ import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.util.Base64;
 
+import androidx.annotation.NonNull;
+
 import com.dynamsoft.dce.CameraEnhancer;
 import com.dynamsoft.dce.CameraEnhancerException;
 import com.dynamsoft.dce.RegionDefinition;
@@ -33,12 +35,16 @@ public class RNDCECameraViewManager extends ViewGroupManager<RNDCECameraView> {
     CameraEnhancer mCamera;
     RNDynamsoftBarcodeReaderModule mDbrModule;
 
-    public RNDCECameraViewManager(ReactApplicationContext reactContext, RNDynamsoftBarcodeReaderModule dbrModule) {
+    public RNDCECameraViewManager(ReactApplicationContext reactContext, @NonNull RNDynamsoftBarcodeReaderModule dbrModule) {
         mReactApplicationContext = reactContext;
         mDbrModule = dbrModule;
-        if (dbrModule.getActivity() != null) {
-            mCamera = new CameraEnhancer(dbrModule.getActivity());
+        if (reactContext.getCurrentActivity() != null) {
+            mCamera = new CameraEnhancer(reactContext.getCurrentActivity());
             dbrModule.mCamera = mCamera;
+            if(dbrModule.mReader != null && !dbrModule.mIsCameraAttached) {
+                dbrModule.mIsCameraAttached = true;
+                dbrModule.mReader.setCameraEnhancer(mCamera);
+            }
         }
     }
 
@@ -52,10 +58,16 @@ public class RNDCECameraViewManager extends ViewGroupManager<RNDCECameraView> {
     @Override
     protected RNDCECameraView createViewInstance(ThemedReactContext reactContext) {
         if (mCamera == null) {
-            mCamera = new CameraEnhancer(mDbrModule.getActivity());
-            mDbrModule.mCamera = mCamera;
+            if (reactContext.getCurrentActivity() != null) {
+                mCamera = new CameraEnhancer(reactContext.getCurrentActivity());
+                mDbrModule.mCamera = mCamera;
+                if(mDbrModule.mReader != null && !mDbrModule.mIsCameraAttached) {
+                    mDbrModule.mIsCameraAttached = true;
+                    mDbrModule.mReader.setCameraEnhancer(mCamera);
+                }
+            }
         }
-        return new RNDCECameraView(reactContext, mReactApplicationContext, mCamera);
+        return new RNDCECameraView(reactContext, mReactApplicationContext, mCamera, mDbrModule);
     }
 
     @ReactProp(name = "overlayVisible")

package/android/src/main/java/com/dynamsoft/reactlibrary/RNDynamsoftBarcodeReaderModule.java

@@ -26,19 +26,21 @@ import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.annotation.Nullable;
 
 
 public class RNDynamsoftBarcodeReaderModule extends ReactContextBaseJavaModule {
 
     private final ReactApplicationContext mReactContext;
-    private BarcodeReader mReader;
 
-    private boolean mIsCameraAttached;
-    CameraEnhancer mCamera;
+    public BarcodeReader mReader;
+    public boolean mIsCameraAttached;
+    public CameraEnhancer mCamera;
 
     public RNDynamsoftBarcodeReaderModule(ReactApplicationContext reactContext) {
         super(reactContext);
@@ -46,11 +48,6 @@ public class RNDynamsoftBarcodeReaderModule extends ReactContextBaseJavaModule {
         mIsCameraAttached = false;
     }
 
-
-    protected Activity getActivity() {
-        return  super.getCurrentActivity();
-    }
-
     @Override
     public String getName() {
         return "RNDynamsoftBarcodeReader";
@@ -64,7 +61,7 @@ public class RNDynamsoftBarcodeReaderModule extends ReactContextBaseJavaModule {
                 put("TorchState", getFlashModeConstants());
             }
 
-            private Map<String, Object> getFlashModeConstants(){
+            private Map<String, Object> getFlashModeConstants() {
                 return Collections.unmodifiableMap(new HashMap<String, Object>() {
                     {
                         put("off", Constants.TORCH_OFF);
@@ -93,12 +90,17 @@ public class RNDynamsoftBarcodeReaderModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void createInstance() {
-        try {
-            mReader = new BarcodeReader();
-        } catch (BarcodeReaderException e) {
-            e.printStackTrace();
+        if(mReader == null) {
+            try {
+                mReader = new BarcodeReader();
+            } catch (BarcodeReaderException e) {
+                e.printStackTrace();
+            }
+        }
+        if (mCamera != null && !mIsCameraAttached) {
+            mIsCameraAttached = true;
+            mReader.setCameraEnhancer(mCamera);
         }
-        mReader.setCameraEnhancer(mCamera);
     }
 
     @ReactMethod
@@ -131,7 +133,7 @@ public class RNDynamsoftBarcodeReaderModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void startBarcodeScanning() {
-        if (!mIsCameraAttached) {
+        if (mCamera != null && !mIsCameraAttached) {
             mReader.setCameraEnhancer(mCamera);
             mIsCameraAttached = true;
         }

package/android/src/main/java/com/dynamsoft/reactlibrary/RNDynamsoftCaptrueVisionPackage.java

@@ -20,9 +20,6 @@ public class RNDynamsoftCaptrueVisionPackage implements ReactPackage {
     @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
         mDbrModule = new RNDynamsoftBarcodeReaderModule(reactContext);
-        if(mDCEViewManager !=null && mDCEViewManager.mCamera != null) {
-            mDbrModule.mCamera = mDCEViewManager.mCamera;
-        }
         return Arrays.<NativeModule>asList(mDbrModule);
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dynamsoft-capture-vision-react-native",
-  "version": "1.1.3",
+  "version": "1.1.4-beta09052010",
   "description": "Dynamsoft Capture Vision React Native SDK",
   "homepage": "https://www.dynamsoft.com/capture-vision/docs/introduction",
   "main": "./js/index.js",