dynamsoft-capture-vision-react-native 1.1.0 → 1.1.1

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

@@ -16,8 +16,8 @@
 package com.dynamsoft.reactlibrary;
 
 public interface Constants {
-  int TORCH_ON = 0;
-  int TORCH_OFF = 1;
+  int TORCH_OFF = 0;
+  int TORCH_ON = 1;
   // int FLASH_TORCH = 2;
   // int FLASH_AUTO = 3;
 }

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

@@ -31,12 +31,15 @@ public class RNDCECameraViewManager extends ViewGroupManager<RNDCECameraView> {
 
     ReactApplicationContext mReactApplicationContext;
     CameraEnhancer mCamera;
-
+    RNDynamsoftBarcodeReaderModule mDbrModule;
 
     public RNDCECameraViewManager(ReactApplicationContext reactContext, RNDynamsoftBarcodeReaderModule dbrModule) {
         mReactApplicationContext = reactContext;
-        mCamera = new CameraEnhancer(dbrModule.getActivity());
-        dbrModule.mCamera = mCamera;
+        mDbrModule = dbrModule;
+        if (dbrModule.getActivity() != null) {
+            mCamera = new CameraEnhancer(dbrModule.getActivity());
+            dbrModule.mCamera = mCamera;
+        }
     }
 
     private static final String REACT_CLASS = "DYSCameraView";
@@ -48,6 +51,10 @@ public class RNDCECameraViewManager extends ViewGroupManager<RNDCECameraView> {
 
     @Override
     protected RNDCECameraView createViewInstance(ThemedReactContext reactContext) {
+        if (mCamera == null) {
+            mCamera = new CameraEnhancer(mDbrModule.getActivity());
+            mDbrModule.mCamera = mCamera;
+        }
         return new RNDCECameraView(reactContext, mReactApplicationContext, mCamera);
     }
 
@@ -81,11 +88,11 @@ public class RNDCECameraViewManager extends ViewGroupManager<RNDCECameraView> {
                 if (location != null) {
                     int x = (location.hasKey("x") && !location.isNull("x")) ? location.getInt("x") : 25;
                     int y = (location.hasKey("y") && !location.isNull("y")) ? location.getInt("y") : 100;
-                    startPoint = new Point(x,y);
+                    startPoint = new Point(x, y);
                     width = (location.hasKey("width") && !location.isNull("width")) ? location.getInt("width") : 45;
                     height = (location.hasKey("height") && !location.isNull("height")) ? location.getInt("height") : 45;
                 } else {
-                    //Default location. Unit is dp.
+                    // Default location. Unit is dp.
                     startPoint = new Point(25, 100);
                     width = 45;
                     height = 45;
@@ -132,13 +139,6 @@ public class RNDCECameraViewManager extends ViewGroupManager<RNDCECameraView> {
         }
     }
 
-//    @Nullable
-//    @Override
-//    public Map<String, Object> getExportedViewConstants() {
-//        return super.getExportedViewConstants();
-//    }
-
-
     @ReactProp(name = "scanRegionVisible")
     public void setScanRegionVisible(RNDCECameraView view, boolean isVisible) {
         mCamera.setScanRegionVisible(isVisible);

package/ios/RNDynamsoftCaptureVision/DYSCameraView.m

@@ -44,9 +44,9 @@
 }
 
 - (void)setTorchState:(int)torchState{
-    if (torchState == 0) {
+    if (torchState == 1) {
         [[StaticClass instance].dce turnOnTorch];
-    }else if (torchState == 1){
+    }else if (torchState == 0){
         [[StaticClass instance].dce turnOffTorch];
     }
 }

package/ios/RNDynamsoftCaptureVision/DYSCameraViewManager.m

@@ -33,16 +33,6 @@ RCT_EXPORT_MODULE(DYSCameraView)
     return [[DYSCameraView alloc] init];
 }
 
-- (NSDictionary *)constantsToExport
-{
-    return @{
-             @"TorchState": @{
-                 @"off": @1,
-                 @"on": @0
-             },
-    };
-}
-
 RCT_EXPORT_VIEW_PROPERTY(scanRegionVisible, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(overlayVisible, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(torchState, int)

package/ios/RNDynamsoftCaptureVision/RCTDynamsoftBarcodeReader.m

@@ -32,6 +32,16 @@
     return YES;
 }
 
+- (NSDictionary *)constantsToExport
+{
+    return @{
+             @"TorchState": @{
+                 @"off": @0,
+                 @"on": @1
+             },
+    };
+}
+
 - (NSArray<NSString *> *)supportedEvents
 {
   return @[@"resultEvent"];

package/js/CameraSettings.d.ts

@@ -6,6 +6,6 @@ export interface TorchButton {
     torchOffImageBase64: string;
 }
 export declare enum EnumTorchState {
-    ON = 0,
-    OFF = 1
+    OFF = 0,
+    ON = 1
 }

package/js/CameraSettings.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EnumTorchState = void 0;
 var EnumTorchState;
 (function (EnumTorchState) {
-    EnumTorchState[EnumTorchState["ON"] = 0] = "ON";
-    EnumTorchState[EnumTorchState["OFF"] = 1] = "OFF";
+    EnumTorchState[EnumTorchState["OFF"] = 0] = "OFF";
+    EnumTorchState[EnumTorchState["ON"] = 1] = "ON";
 })(EnumTorchState = exports.EnumTorchState || (exports.EnumTorchState = {}));
 //# sourceMappingURL=CameraSettings.js.map

package/package.json

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