dynamsoft-capture-vision-react-native 1.1.13 → 1.1.15

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

@@ -79,7 +79,7 @@ public class RNDCECameraView extends DCECameraView implements LifecycleEventList
                 Field declaredField = DCECameraView.class.getDeclaredField("imgTorchClose");
                 declaredField.setAccessible(true);
                 Drawable closeDrawable = (Drawable)declaredField.get(this);
-                View btnTorch = findViewById(R.id.btn_torch);
+                View btnTorch = findViewById(com.dynamsoft.dce.R.id.btn_torch);
                 if(btnTorch != null) {
                     btnTorch.setBackground(closeDrawable);
                 }

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

@@ -74,10 +74,10 @@ public class RNDCECameraViewManager extends ViewGroupManager<RNDCECameraView> {
     @ReactProp(name = "cameraPosition")
     public void setCameraPosition(RNDCECameraView view, int cameraPosition) {
         EnumCameraPosition position = null;
-        if(cameraPosition == 0) {
-            position = EnumCameraPosition.CP_BACK;
-        } else {
+        if(cameraPosition == 1) {
             position = EnumCameraPosition.CP_FRONT;
+        } else {
+            position = EnumCameraPosition.CP_BACK;
         }
         try {
             mCamera.selectCamera(position);
@@ -243,4 +243,4 @@ public class RNDCECameraViewManager extends ViewGroupManager<RNDCECameraView> {
                 break;
         }
     }
-}
+}

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

@@ -1,31 +1,28 @@
 
 package com.dynamsoft.reactlibrary;
 
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import com.dynamsoft.dce.CameraEnhancer;
 import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
-import com.facebook.react.bridge.JavaScriptModule;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 public class RNDynamsoftCaptrueVisionPackage implements ReactPackage {
-    CameraEnhancer mCamera;
     RNDynamsoftBarcodeReaderModule mDbrModule;
     RNDCECameraViewManager mDCEViewManager;
 
     @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
         mDbrModule = new RNDynamsoftBarcodeReaderModule(reactContext);
-        return Arrays.<NativeModule>asList(mDbrModule);
+        return Arrays.<NativeModule>asList(mDbrModule, new DCVFeedbackModule(reactContext));
     }
 
     // Deprecated from RN 0.47
     public List<Class<? extends JavaScriptModule>> createJSModules() {
-      return Collections.emptyList();
+        return Collections.emptyList();
     }
 
     @Override
@@ -33,4 +30,4 @@ public class RNDynamsoftCaptrueVisionPackage implements ReactPackage {
         mDCEViewManager = new RNDCECameraViewManager(reactContext, mDbrModule);
         return Arrays.<ViewManager>asList(mDCEViewManager);
     }
-}
+}

package/dynamsoft-capture-vision-react-native.podspec

@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
   s.requires_arc            = true
   s.module_name             = "RNDynamsoftCaptureVision"
   s.header_dir              = "RNDynamsoftCaptureVision"
-  s.dependency 'DynamsoftCameraEnhancer', '= 2.3.20'
+  s.dependency 'DynamsoftCameraEnhancer', '= 2.3.22'
   s.dependency 'DynamsoftBarcodeReader', '= 9.6.21'
 
   s.dependency "React"

package/ios/RNDynamsoftCaptureVision/DYSCameraView.m

@@ -127,12 +127,12 @@
 }
 
 - (void)setCameraPosition:(int)cameraPosition{
-    _cameraPosition = cameraPosition;
     NSError *error;
-    if (cameraPosition == 0) {
-        [[StaticClass instance].dce selectCameraWithPosition:EnumCameraPositionBack error:&error];
-    }else if (cameraPosition == 1){
-        [[StaticClass instance].dce selectCameraWithPosition:EnumCameraPositionFront error:&error];
+    [[StaticClass instance].dce selectCameraWithPosition:cameraPosition error:&error];
+    if (error) {
+        NSLog(@"selectCameraWithPosition error: %@", error);
+    } else {
+        _cameraPosition = cameraPosition;
     }
 }
 

package/ios/RNDynamsoftCaptureVision/StaticClass.h

@@ -13,11 +13,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface StaticClass : NSObject
 
-@property (nonatomic, strong) DynamsoftBarcodeReader *dbr;
+@property (nonatomic, strong, nullable) DynamsoftBarcodeReader *dbr;
 
-@property (nonatomic, strong) DynamsoftCameraEnhancer *dce;
+@property (nonatomic, strong, nullable) DynamsoftCameraEnhancer *dce;
 
-@property (nonatomic, strong) DCECameraView *view;
+@property (nonatomic, strong, nullable) DCECameraView *view;
 
 + (StaticClass *)instance;
 

package/ios/RNDynamsoftCaptureVision.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		6810C0592C3CDCC80037457B /* RCTDynamsoftFeedback.m in Sources */ = {isa = PBXBuildFile; fileRef = 6810C0582C3CDCC80037457B /* RCTDynamsoftFeedback.m */; };
 		841E4B6727E9B890006D0011 /* RCTDynamsoftBarcodeReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 841E4B6627E9B890006D0011 /* RCTDynamsoftBarcodeReader.m */; };
 		841E4B6827E9B890006D0011 /* RCTDynamsoftBarcodeReader.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 841E4B6527E9B890006D0011 /* RCTDynamsoftBarcodeReader.h */; };
 		841E4B7027E9B8EE006D0011 /* DYSCameraView.m in Sources */ = {isa = PBXBuildFile; fileRef = 841E4B6F27E9B8EE006D0011 /* DYSCameraView.m */; };
@@ -30,6 +31,8 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		6810C0572C3CDCC80037457B /* RCTDynamsoftFeedback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTDynamsoftFeedback.h; sourceTree = "<group>"; };
+		6810C0582C3CDCC80037457B /* RCTDynamsoftFeedback.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDynamsoftFeedback.m; sourceTree = "<group>"; };
 		841E4B6227E9B890006D0011 /* libRNDynamsoftCaptureVision.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNDynamsoftCaptureVision.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		841E4B6527E9B890006D0011 /* RCTDynamsoftBarcodeReader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTDynamsoftBarcodeReader.h; sourceTree = "<group>"; };
 		841E4B6627E9B890006D0011 /* RCTDynamsoftBarcodeReader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTDynamsoftBarcodeReader.m; sourceTree = "<group>"; };
@@ -82,6 +85,8 @@
 				841E4B6F27E9B8EE006D0011 /* DYSCameraView.m */,
 				841E4B7127E9B905006D0011 /* DYSCameraViewManager.h */,
 				841E4B7227E9B905006D0011 /* DYSCameraViewManager.m */,
+				6810C0572C3CDCC80037457B /* RCTDynamsoftFeedback.h */,
+				6810C0582C3CDCC80037457B /* RCTDynamsoftFeedback.m */,
 				8489B57727EB2042001314E0 /* StaticClass.h */,
 				8489B57827EB2042001314E0 /* StaticClass.m */,
 			);
@@ -158,6 +163,7 @@
 				841E4B7327E9B905006D0011 /* DYSCameraViewManager.m in Sources */,
 				8489B57927EB2042001314E0 /* StaticClass.m in Sources */,
 				841E4B6727E9B890006D0011 /* RCTDynamsoftBarcodeReader.m in Sources */,
+				6810C0592C3CDCC80037457B /* RCTDynamsoftFeedback.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

package/js/CameraSettings.d.ts

@@ -1,44 +1,46 @@
 import { Rect } from "./BasicStructures";
 export interface TorchButton {
     /**
-    * Defines the location of the torch button.
-    */
+     * Defines the location of the torch button.
+     */
     location: Rect;
     /**
-    * True: the torch will be displayed.
-    * False: the torch will be hide.
-    */
+     * True: the torch will be displayed.
+     * False: the torch will be hide.
+     */
     visible: boolean;
     /**
-    * A base 64 string that specify the torch on image.
-    * When the torch is on, this image will be displayed as the torch image.
-    */
+     * A base 64 string that specify the torch on image.
+     * When the torch is on, this image will be displayed as the torch image.
+     */
     torchOnImageBase64: string;
     /**
-    * A base 64 string that specify the torch off image.
-    * When the torch is off, this image will be displayed as the torch image.
-    */
+     * A base 64 string that specify the torch off image.
+     * When the torch is off, this image will be displayed as the torch image.
+     */
     torchOffImageBase64: string;
 }
 export declare enum EnumTorchState {
     /**
-    * Set the torch state to off.
-    */
+     * Set the torch state to off.
+     */
     OFF = 0,
     /**
-    * Set the torch state to on.
-    */
+     * Set the torch state to on.
+     */
     ON = 1
 }
 export declare enum EnumCameraPosition {
     /**
-    * Use the back-facing camera.
-    */
+     * Use the back-facing camera.
+     */
     CP_BACK = 0,
     /**
-    * Use the front-facing camera.
-    */
-    CP_FRONT = 1
+     * Use the front-facing camera.
+     */
+    CP_FRONT = 1,
+    CP_BACK_ULTRA_WIDE = 2, //IOS only
+    CP_BACK_DUAL_WIDE_AUTO = 3 //IOS only
 }
 export declare enum EnumEnhancedFeatures {
     EF_FRAME_FILTER = 1,

package/js/CameraSettings.js

@@ -4,24 +4,26 @@ exports.EnumEnhancedFeatures = exports.EnumCameraPosition = exports.EnumTorchSta
 var EnumTorchState;
 (function (EnumTorchState) {
     /**
-    * Set the torch state to off.
-    */
+     * Set the torch state to off.
+     */
     EnumTorchState[EnumTorchState["OFF"] = 0] = "OFF";
     /**
-    * Set the torch state to on.
-    */
+     * Set the torch state to on.
+     */
     EnumTorchState[EnumTorchState["ON"] = 1] = "ON";
 })(EnumTorchState = exports.EnumTorchState || (exports.EnumTorchState = {}));
 var EnumCameraPosition;
 (function (EnumCameraPosition) {
     /**
-    * Use the back-facing camera.
-    */
+     * Use the back-facing camera.
+     */
     EnumCameraPosition[EnumCameraPosition["CP_BACK"] = 0] = "CP_BACK";
     /**
-    * Use the front-facing camera.
-    */
+     * Use the front-facing camera.
+     */
     EnumCameraPosition[EnumCameraPosition["CP_FRONT"] = 1] = "CP_FRONT";
+    EnumCameraPosition[EnumCameraPosition["CP_BACK_ULTRA_WIDE"] = 2] = "CP_BACK_ULTRA_WIDE";
+    EnumCameraPosition[EnumCameraPosition["CP_BACK_DUAL_WIDE_AUTO"] = 3] = "CP_BACK_DUAL_WIDE_AUTO";
 })(EnumCameraPosition = exports.EnumCameraPosition || (exports.EnumCameraPosition = {}));
 var EnumEnhancedFeatures;
 (function (EnumEnhancedFeatures) {

package/js/CameraSettings.js.map

@@ -1 +1 @@
-{"version":3,"file":"CameraSettings.js","sourceRoot":"","sources":["CameraSettings.tsx"],"names":[],"mappings":";;;AAyBA,IAAY,cASX;AATD,WAAY,cAAc;IACtB;;MAEE;IACF,iDAAG,CAAA;IACH;;MAEE;IACF,+CAAE,CAAA;AACN,CAAC,EATW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QASzB;AAED,IAAY,kBASX;AATD,WAAY,kBAAkB;IAC1B;;MAEE;IACF,iEAAO,CAAA;IACP;;MAEE;IACF,mEAAQ,CAAA;AACZ,CAAC,EATW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAS7B;AAED,IAAY,oBAQX;AARD,WAAY,oBAAoB;IAC5B,qFAAmB,CAAA;IACnB,yFAAqB,CAAA;IACrB,yFAAqB,CAAA;IACrB,+EAAe,CAAA;IACf,gFAAiB,CAAA;IACjB,oFAAmB,CAAA;IACnB,oEAAW,CAAA;AACf,CAAC,EARW,oBAAoB,GAApB,4BAAoB,KAApB,4BAAoB,QAQ/B"}
+{"version":3,"file":"CameraSettings.js","sourceRoot":"","sources":["CameraSettings.tsx"],"names":[],"mappings":";;;AAyBA,IAAY,cASX;AATD,WAAY,cAAc;IACtB;;OAEG;IACH,iDAAG,CAAA;IACH;;OAEG;IACH,+CAAE,CAAA;AACN,CAAC,EATW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QASzB;AAED,IAAY,kBAcX;AAdD,WAAY,kBAAkB;IAC1B;;OAEG;IACH,iEAAO,CAAA;IACP;;OAEG;IACH,mEAAQ,CAAA;IACR,6EAAa,CAAA;IACb,6EAAa,CAAA;IACb,2EAAY,CAAA;IACZ,2EAAY,CAAA;IACZ,qEAAS,CAAA,CAAC,UAAU;AACxB,CAAC,EAdW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAc7B;AAED,IAAY,oBAQX;AARD,WAAY,oBAAoB;IAC5B,qFAAmB,CAAA;IACnB,yFAAqB,CAAA;IACrB,yFAAqB,CAAA;IACrB,+EAAgB,CAAA;IAChB,gFAAiB,CAAA;IACjB,oFAAmB,CAAA;IACnB,oEAAW,CAAA;AACf,CAAC,EARW,oBAAoB,GAApB,4BAAoB,KAApB,4BAAoB,QAQ/B"}

package/js/CameraSettings.tsx

@@ -1,55 +1,57 @@
-import { Rect } from "./BasicStructures";
+import {Rect} from "./BasicStructures";
 
 export interface TorchButton {
     /**
-    * Defines the location of the torch button.
-    */
+     * Defines the location of the torch button.
+     */
     location: Rect;
     /**
-    * True: the torch will be displayed.
-    * False: the torch will be hide.
-    */
+     * True: the torch will be displayed.
+     * False: the torch will be hide.
+     */
     visible: boolean;
     /**
-    * A base 64 string that specify the torch on image.
-    * When the torch is on, this image will be displayed as the torch image.
-    */
+     * A base 64 string that specify the torch on image.
+     * When the torch is on, this image will be displayed as the torch image.
+     */
     torchOnImageBase64: string;
     /**
-    * A base 64 string that specify the torch off image.
-    * When the torch is off, this image will be displayed as the torch image.
-    */
+     * A base 64 string that specify the torch off image.
+     * When the torch is off, this image will be displayed as the torch image.
+     */
     torchOffImageBase64: string;
 }
 
 
 export enum EnumTorchState {
     /**
-    * Set the torch state to off.
-    */
+     * Set the torch state to off.
+     */
     OFF,
     /**
-    * Set the torch state to on.
-    */
+     * Set the torch state to on.
+     */
     ON
 }
 
 export enum EnumCameraPosition {
     /**
-    * Use the back-facing camera.
-    */
-    CP_BACK,
+     * Use the back-facing camera.
+     */
+    CP_BACK = 0,
     /**
-    * Use the front-facing camera.
-    */
-    CP_FRONT
+     * Use the front-facing camera.
+     */
+    CP_FRONT = 1,
+    CP_BACK_ULTRA_WIDE = 2, //IOS only
+    CP_BACK_DUAL_WIDE_AUTO = 3 //IOS only
 }
 
 export enum EnumEnhancedFeatures {
     EF_FRAME_FILTER = 1,
     EF_SENSOR_CONTROL = 2,
     EF_ENHANCED_FOCUS = 4,
-    EF_FAST_MODE= 8,
+    EF_FAST_MODE = 8,
     EF_AUTO_ZOOM = 16,
     EF_SMART_TORCH = 32,
     EF_ALL = 63

package/js/index.d.ts

@@ -4,3 +4,4 @@ export * from './DynamsoftBarcodeReader';
 export * from './DynamsoftCameraView';
 export * from './BarcodeResult';
 export * from './BasicStructures';
+export * from './DCVFeedback';

package/js/index.js

@@ -20,4 +20,5 @@ __exportStar(require("./DynamsoftBarcodeReader"), exports);
 __exportStar(require("./DynamsoftCameraView"), exports);
 __exportStar(require("./BarcodeResult"), exports);
 __exportStar(require("./BasicStructures"), exports);
+__exportStar(require("./DCVFeedback"), exports);
 //# sourceMappingURL=index.js.map

package/js/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAgC;AAChC,oDAAiC;AACjC,2DAAwC;AACxC,wDAAqC;AACrC,kDAA+B;AAC/B,oDAAiC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAgC;AAChC,oDAAiC;AACjC,2DAAwC;AACxC,wDAAqC;AACrC,kDAA+B;AAC/B,oDAAiC;AACjC,gDAA6B"}

package/js/index.tsx

@@ -3,4 +3,5 @@ export * from './BarcodeSettings'
 export * from './DynamsoftBarcodeReader'
 export * from './DynamsoftCameraView'
 export * from './BarcodeResult'
-export * from './BasicStructures'
+export * from './BasicStructures'
+export * from './DCVFeedback'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dynamsoft-capture-vision-react-native",
-  "version": "1.1.13",
+  "version": "1.1.15",
   "description": "Dynamsoft Capture Vision React Native SDK",
   "homepage": "https://www.dynamsoft.com/capture-vision/docs/introduction",
   "main": "./js/index.js",
@@ -38,5 +38,8 @@
     "@types/react-native": "^0.68.0",
     "@types/react-test-renderer": "^18.0.0",
     "typescript": "^4.7.4"
+  },
+  "dependencies": {
+    "dynamsoft-capture-vision-react-native": "^1.1.15"
   }
 }