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

package/android/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.dynamsoft.reactlibrary">
-
-</manifest>
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.dynamsoft.reactlibrary">
+
+</manifest>
   

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

@@ -1,23 +1,23 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.dynamsoft.reactlibrary;
-
-public interface Constants {
-  int TORCH_OFF = 0;
-  int TORCH_ON = 1;
-  // int FLASH_TORCH = 2;
-  // int FLASH_AUTO = 3;
-}
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.dynamsoft.reactlibrary;
+
+public interface Constants {
+  int TORCH_OFF = 0;
+  int TORCH_ON = 1;
+  // int FLASH_TORCH = 2;
+  // int FLASH_AUTO = 3;
+}

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")