dynamsoft-capture-vision-react-native 2.6.1016 → 3.0.3100

package/ios/RNDynamsoftCaptureVisionRouter.mm

@@ -3,11 +3,7 @@
  */
 
 #import "RNDynamsoftCaptureVisionRouter.h"
-#import <DynamsoftCaptureVisionRouter/DynamsoftCaptureVisionRouter.h>
-#import <DynamsoftBarcodeReader/DynamsoftBarcodeReader.h>
-#import <DynamsoftLabelRecognizer/DynamsoftLabelRecognizer.h>
-#import <DynamsoftDocumentNormalizer/DynamsoftDocumentNormalizer.h>
-#import <DynamsoftUtility/DynamsoftUtility.h>
+#import <DynamsoftCaptureVisionBundle/DynamsoftCaptureVisionBundle.h>
 #import <React/RCTUIManager.h>
 #import "RNDynamsoftImageSourceAdapter.h"
 #import "RNDynamsoft+Json.h"
@@ -25,7 +21,9 @@ using namespace std;
 
 @property (nonatomic, strong) DSCaptureVisionRouter *cvr;
 
-@property (nonatomic, strong) NSMutableArray<DSImageData *> *imageDataArray;
+@property (nonatomic, strong) NSMutableArray<DSImageData *> *deskewedImageDataArray;
+
+@property (nonatomic, strong) NSMutableArray<DSImageData *> *enhancedImageDataArray;
 
 @property (nonatomic, strong) NSMutableDictionary<NSString *, NSNumber *> *receiveDictionary;
 
@@ -55,7 +53,7 @@ RCT_EXPORT_MODULE(DynamsoftCaptureVisionRouterModule)
 
 RCT_EXPORT_METHOD(startCapturing:(NSString *)templateName
                   resolve:(RCTPromiseResolveBlock)resolve
-                  rejecter: (RCTPromiseRejectBlock)reject) 
+                  rejecter: (RCTPromiseRejectBlock)reject)
 {
     [self.cvr startCapturing:templateName completionHandler:^(BOOL isSuccess, NSError * _Nullable error) {
         if (!isSuccess && error) {
@@ -88,7 +86,7 @@ RCT_EXPORT_METHOD(setInput:(NSString *)key) {
     }
 }
 
-RCT_EXPORT_METHOD(getSettings:(NSString *)name
+RCT_EXPORT_METHOD(getSimplifiedSettings:(NSString *)name
                   resolve:(RCTPromiseResolveBlock)resolve
                   rejecter: (RCTPromiseRejectBlock)reject)
 {
@@ -105,7 +103,7 @@ RCT_EXPORT_METHOD(getSettings:(NSString *)name
 RCT_EXPORT_METHOD(updateSettings:(NSDictionary *)dictionary
                   templateName:(NSString *)templateName
                   resolve:(RCTPromiseResolveBlock)resolve
-                  rejecter: (RCTPromiseRejectBlock)reject) 
+                  rejecter: (RCTPromiseRejectBlock)reject)
 {
     NSError *error;
     DSSimplifiedCaptureVisionSettings *settings = [self.cvr getSimplifiedSettings:templateName error:nil];
@@ -120,7 +118,7 @@ RCT_EXPORT_METHOD(updateSettings:(NSDictionary *)dictionary
 }
 
 RCT_EXPORT_METHOD(resetSettings:(RCTPromiseResolveBlock)resolve
-                  rejecter: (RCTPromiseRejectBlock)reject) 
+                  rejecter: (RCTPromiseRejectBlock)reject)
 {
     NSError *error;
     BOOL isSuccess = [self.cvr resetSettings:&error];
@@ -159,11 +157,12 @@ RCT_EXPORT_METHOD(initSettingsFromFile:(NSString *)path
 }
 
 RCT_EXPORT_METHOD(outputSettings:(NSString *)name
+                  includeDefaultValues:(BOOL)includeDefaultValues
                   resolve:(RCTPromiseResolveBlock)resolve
                   rejecter: (RCTPromiseRejectBlock)reject)
 {
     NSError *error;
-    NSString *setting = [self.cvr outputSettings:name error:&error];
+    NSString *setting = [self.cvr outputSettings:name includeDefaultValues:includeDefaultValues error:&error];
     if (error) {
         NSString *code = [NSString stringWithFormat:@"%ld",(long)error.code];
         reject(code, error.localizedDescription, error);
@@ -172,13 +171,14 @@ RCT_EXPORT_METHOD(outputSettings:(NSString *)name
     }
 }
 
-RCT_EXPORT_METHOD(outputSettingsToFile:(NSString *)name 
+RCT_EXPORT_METHOD(outputSettingsToFile:(NSString *)name
                   file:(NSString *)path
+                  includeDefaultValues:(BOOL)includeDefaultValues
                   resolve:(RCTPromiseResolveBlock)resolve
-                  rejecter: (RCTPromiseRejectBlock)reject) 
+                  rejecter: (RCTPromiseRejectBlock)reject)
 {
     NSError *error;
-    BOOL isSuccess = [self.cvr outputSettingsToFile:name file:path error:&error];
+    BOOL isSuccess = [self.cvr outputSettingsToFile:name filePath:path includeDefaultValues:includeDefaultValues error:&error];
     if (!isSuccess && error) {
         NSString *code = [NSString stringWithFormat:@"%ld",(long)error.code];
         reject(code, error.localizedDescription, error);
@@ -216,8 +216,7 @@ RCT_EXPORT_METHOD(removeFilter:(NSString *)key) {
 {
   return @[@"onCapturedResultReceived",
            @"onDecodedBarcodesReceived",
-           @"onDetectedQuadsReceived",
-           @"onNormalizedImagesReceived", 
+           @"onProcessedDocumentResultReceived",
            @"onRecognizedTextLinesReceived",
            @"onParsedResultsReceived"];
 }
@@ -234,12 +233,19 @@ RCT_EXPORT_METHOD(removeFilter:(NSString *)key) {
 
 - (void)onCapturedResultReceived:(DSCapturedResult *)result {
     if (hasListeners && [self.receiveDictionary valueForKey:@"onCapturedResultReceived"].boolValue) {
-        [self.imageDataArray removeAllObjects];
-        DSNormalizedImagesResult *imageResult = result.normalizedImagesResult;
-        for (DSNormalizedImageResultItem *item in imageResult.items) {
+        DSProcessedDocumentResult *imageResult = result.processedDocumentResult;
+        [self.deskewedImageDataArray removeAllObjects];
+        for (DSDeskewedImageResultItem *item in imageResult.deskewedImageResultItems) {
+            DSImageData *data = item.imageData;
+            if (data) {
+                [self.deskewedImageDataArray addObject:data];
+            }
+        }
+        [self.enhancedImageDataArray removeAllObjects];
+        for (DSEnhancedImageResultItem *item in imageResult.enhancedImageResultItems) {
             DSImageData *data = item.imageData;
             if (data) {
-                [self.imageDataArray addObject:data];
+                [self.enhancedImageDataArray addObject:data];
             }
         }
         [self sendEventWithName:@"onCapturedResultReceived" body:[result toJson]];
@@ -256,24 +262,23 @@ RCT_EXPORT_METHOD(removeFilter:(NSString *)key) {
     }
 }
 
-- (void)onDetectedQuadsReceived:(DSDetectedQuadsResult *)result {
-    if (hasListeners && [self.receiveDictionary valueForKey:@"onDetectedQuadsReceived"].boolValue) {
-        [self sendEventWithName:@"onDetectedQuadsReceived" body:[result toJson]];
-        dispatch_time_t timeout = dispatch_time(DISPATCH_TIME_NOW, 10 * NSEC_PER_SEC);
-        __unused long result = dispatch_semaphore_wait(semaphore, timeout);
-    }
-}
-
-- (void)onNormalizedImagesReceived:(DSNormalizedImagesResult *)result {
-    if (hasListeners && [self.receiveDictionary valueForKey:@"onNormalizedImagesReceived"].boolValue) {
-        [self.imageDataArray removeAllObjects];
-        for (DSNormalizedImageResultItem *item in result.items) {
+- (void)onProcessedDocumentResultReceived:(DSProcessedDocumentResult *)result {
+    if (hasListeners && [self.receiveDictionary valueForKey:@"onProcessedDocumentResultReceived"].boolValue) {
+        [self.deskewedImageDataArray removeAllObjects];
+        for (DSDeskewedImageResultItem *item in result.deskewedImageResultItems) {
+            DSImageData *data = item.imageData;
+            if (data) {
+                [self.deskewedImageDataArray addObject:data];
+            }
+        }
+        [self.enhancedImageDataArray removeAllObjects];
+        for (DSEnhancedImageResultItem *item in result.enhancedImageResultItems) {
             DSImageData *data = item.imageData;
             if (data) {
-                [self.imageDataArray addObject:data];
+                [self.enhancedImageDataArray addObject:data];
             }
         }
-        [self sendEventWithName:@"onNormalizedImagesReceived" body:[result toJson]];
+        [self sendEventWithName:@"onProcessedDocumentResultReceived" body:[result toJson]];
         dispatch_time_t timeout = dispatch_time(DISPATCH_TIME_NOW, 10 * NSEC_PER_SEC);
         __unused long result = dispatch_semaphore_wait(semaphore, timeout);
     }
@@ -296,11 +301,18 @@ RCT_EXPORT_METHOD(removeFilter:(NSString *)key) {
 }
 
 #pragma mark - Private
-- (NSMutableArray<DSImageData *> *)imageDataArray {
-    if (!_imageDataArray) {
-        _imageDataArray = [NSMutableArray array];
+- (NSMutableArray<DSImageData *> *)deskewedImageDataArray {
+    if (!_deskewedImageDataArray) {
+        _deskewedImageDataArray = [NSMutableArray array];
     }
-    return _imageDataArray;
+    return _deskewedImageDataArray;
+}
+
+- (NSMutableArray<DSImageData *> *)enhancedImageDataArray {
+    if (!_enhancedImageDataArray) {
+        _enhancedImageDataArray = [NSMutableArray array];
+    }
+    return _enhancedImageDataArray;
 }
 
 - (NSMutableDictionary<NSString *,DSMultiFrameResultCrossFilter *> *)filterDictionary {
@@ -382,23 +394,42 @@ static void install(jsi::Runtime &jsiRuntime, RNDynamsoftCaptureVisionRouter *rn
                                                                              const Value &thisValue,
                                                                              const Value *arguments,
                                                                              size_t count) -> Value {
-         NSString *bytes = convertJSIStringToNSString(runtime, arguments[0].getString(runtime));
+        ArrayBuffer buffer = arguments[0].asObject(runtime).getArrayBuffer(runtime);
+        NSData *data = convertArrayBufferToNSData(runtime, buffer);
          NSString *name = convertJSIStringToNSString(runtime, arguments[1].getString(runtime));
-         NSData *data = [[NSData alloc] initWithBase64EncodedString:bytes options:(NSDataBase64DecodingIgnoreUnknownCharacters)];
          DSCapturedResult *result = [rnCapture.cvr captureFromFileBytes:data templateName:name];
          return [result convertToJSIObject:runtime];
      });
      jsiRuntime.global().setProperty(jsiRuntime, captureFileBytes, std::move(captureFileBytesFunc));
     
-    const char* getCurrentNormalizedImages = "getCurrentNormalizedImages";
-    auto getCurrentNormalizedImagesFunc = Function::createFromHostFunction(jsiRuntime,
-                                                                           PropNameID::forAscii(jsiRuntime, getCurrentNormalizedImages),
+    const char* getCurrentDeskewedImages = "getCurrentDeskewedImages";
+    auto getCurrentDeskewedImagesFunc = Function::createFromHostFunction(jsiRuntime,
+                                                                           PropNameID::forAscii(jsiRuntime, getCurrentDeskewedImages),
+                                                                           0,
+                                                                           [rnCapture](Runtime &runtime,
+                                                                                       const Value &thisValue,
+                                                                                       const Value *arguments,
+                                                                                       size_t count) -> Value {
+        NSMutableArray<DSImageData *> *imageDataArray = rnCapture.deskewedImageDataArray;
+        Array array(runtime, imageDataArray.count);
+        for (int i = 0; i < imageDataArray.count; i++) {
+            ImageDataHostObject hostObject = [[imageDataArray objectAtIndex:i] hostObject];
+            Object obj = Object::createFromHostObject(runtime, std::make_shared<ImageDataHostObject>(hostObject));
+            array.setValueAtIndex(runtime, i, obj);
+        }
+        return array;
+    });
+    jsiRuntime.global().setProperty(jsiRuntime, getCurrentDeskewedImages, std::move(getCurrentDeskewedImagesFunc));
+    
+    const char* getCurrentEnhancedImages = "getCurrentEnhancedImages";
+    auto getCurrentEnhancedImagesFunc = Function::createFromHostFunction(jsiRuntime,
+                                                                           PropNameID::forAscii(jsiRuntime, getCurrentEnhancedImages),
                                                                            0,
                                                                            [rnCapture](Runtime &runtime,
                                                                                        const Value &thisValue,
                                                                                        const Value *arguments,
                                                                                        size_t count) -> Value {
-        NSMutableArray<DSImageData *> *imageDataArray = rnCapture.imageDataArray;
+        NSMutableArray<DSImageData *> *imageDataArray = rnCapture.enhancedImageDataArray;
         Array array(runtime, imageDataArray.count);
         for (int i = 0; i < imageDataArray.count; i++) {
             ImageDataHostObject hostObject = [[imageDataArray objectAtIndex:i] hostObject];
@@ -407,7 +438,7 @@ static void install(jsi::Runtime &jsiRuntime, RNDynamsoftCaptureVisionRouter *rn
         }
         return array;
     });
-    jsiRuntime.global().setProperty(jsiRuntime, getCurrentNormalizedImages, std::move(getCurrentNormalizedImagesFunc));
+    jsiRuntime.global().setProperty(jsiRuntime, getCurrentEnhancedImages, std::move(getCurrentEnhancedImagesFunc));
     
     const char* getOriginalImage = "cvr_getOriginalImage";
     auto getOriginalImageFunc = Function::createFromHostFunction(jsiRuntime,

package/ios/RNDynamsoftImageEditorView.m

@@ -3,7 +3,7 @@
  */
 
 #import "RNDynamsoftImageEditorView.h"
-#import <DynamsoftCameraEnhancer/DynamsoftCameraEnhancer.h>
+#import <DynamsoftCaptureVisionBundle/DynamsoftCaptureVisionBundle.h>
 
 @implementation RNDynamsoftImageEditorView
 

package/ios/RNDynamsoftImageEditorViewManager.mm

@@ -4,7 +4,7 @@
 
 #import "RNDynamsoftImageEditorViewManager.h"
 #import "RNDynamsoftImageEditorView.h"
-#import <DynamsoftCameraEnhancer/DynamsoftCameraEnhancer.h>
+#import <DynamsoftCaptureVisionBundle/DynamsoftCaptureVisionBundle.h>
 #import <React/RCTBridge+Private.h>
 #import "DSImageData+HostObject.h"
 #import <React/RCTUIManager.h>
@@ -23,11 +23,24 @@ RCT_EXPORT_MODULE(DynamsoftImageEditorView)
 }
 
 RCT_EXPORT_METHOD(setQuads:(nonnull NSNumber *)tag quadArray:(NSArray *)array layerId:(NSInteger)layerId) {
+    [self trySetQuadsWithTag:tag quadArray:array layerId:layerId attempt:1];
+}
+
+- (void)trySetQuadsWithTag:(nonnull NSNumber *)tag quadArray:(NSArray *)array layerId:(NSInteger)layerId attempt:(NSInteger)attempt {
+    const NSInteger maxAttempts = 10;
+    const NSTimeInterval retryDelay = 0.1; // 100ms
+
     [self.bridge.uiManager addUIBlock:
      ^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
          id view = viewRegistry[tag];
          if (!view || ![view isKindOfClass:[RNDynamsoftImageEditorView class]]) {
-             RCTLogError(@"Cannot find RNDynamsoftImageEditorView with tag #%@", tag);
+             if (attempt < maxAttempts) {
+                 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(retryDelay * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                     [self trySetQuadsWithTag:tag quadArray:array layerId:layerId attempt:attempt + 1];
+                 });
+             } else {
+                 RCTLogError(@"Cannot find RNDynamsoftImageEditorView with tag #%@ after %ld attempts", tag, (long)attempt);
+             }
          } else {
              if (array && array.count > 0) {
                  NSMutableArray<DSQuadDrawingItem *> *items = [NSMutableArray array];
@@ -46,7 +59,7 @@ RCT_EXPORT_METHOD(setQuads:(nonnull NSNumber *)tag quadArray:(NSArray *)array la
 
 RCT_EXPORT_METHOD(getSelectedQuad:(nonnull NSNumber *)tag
                   resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject) 
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
     [self.bridge.uiManager addUIBlock:
      ^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
@@ -100,7 +113,7 @@ static void install(jsi::Runtime &jsiRuntime, RNDynamsoftImageEditorViewManager
         if (obj.isHostObject<ImageDataHostObject>(runtime)) {
             ImageDataHostObject hostObject = ImageDataHostObject::getHOFromObject(runtime, std::move(obj));
             DSImageData *data = [DSImageData imageDataFromHostObject:hostObject];
-            [rnEditorViewManager setImageData:data toView:@(tag)];
+            [rnEditorViewManager trySetImageDataWithTag:@(tag) data:data attempt:1];
             return Value(true);
         }
         return Value(false);
@@ -109,15 +122,25 @@ static void install(jsi::Runtime &jsiRuntime, RNDynamsoftImageEditorViewManager
     jsiRuntime.global().setProperty(jsiRuntime, setOriginalImage, std::move(setOriginalImageFunc));
 }
 
-- (void)setImageData:(DSImageData *)data toView:(nonnull NSNumber *)tag {
-    dispatch_async(dispatch_get_main_queue(), ^{
-        UIView *view = [self.bridge.uiManager viewForReactTag:tag];
-        if (!view || ![view isKindOfClass:[RNDynamsoftImageEditorView class]]) {
-            RCTLogError(@"Cannot find RNDynamsoftImageEditorView with tag #%@", tag);
-        } else {
-            ((RNDynamsoftImageEditorView *)view).editorView.imageData = data;
-        }
-    });
+- (void)trySetImageDataWithTag:(nonnull NSNumber *)tag data:(DSImageData *)data attempt:(NSInteger)attempt {
+    const NSInteger maxAttempts = 10;
+    const NSTimeInterval retryDelay = 0.1; // 100ms
+
+    [self.bridge.uiManager addUIBlock:
+     ^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+         id view = viewRegistry[tag];
+         if (!view || ![view isKindOfClass:[RNDynamsoftImageEditorView class]]) {
+             if (attempt < maxAttempts) {
+                 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(retryDelay * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                     [self trySetImageDataWithTag:tag data:data attempt:1];
+                 });
+             } else {
+                 RCTLogError(@"Cannot find RNDynamsoftImageEditorView with tag #%@ after %ld attempts", tag, (long)attempt);
+             }
+         } else {
+             ((RNDynamsoftImageEditorView *)view).editorView.imageData = data;
+         }
+     }];
 }
 
 @end

package/ios/RNDynamsoftImageManager.mm

@@ -3,7 +3,7 @@
  */
 
 #import "RNDynamsoftImageManager.h"
-#import <DynamsoftUtility/DynamsoftUtility.h>
+#import <DynamsoftCaptureVisionBundle/DynamsoftCaptureVisionBundle.h>
 #import <React/RCTBridge+Private.h>
 #import <React/RCTUtils.h>
 #import <jsi/jsi.h>
@@ -19,7 +19,9 @@ using namespace std;
 
 @interface RNDynamsoftImageManager ()
 
-@property (nonatomic, strong) DSImageManager *manager;
+@property (nonatomic, strong) DSImageIO *manager;
+@property (nonatomic, strong) DSImageDrawer *drawer;
+@property (nonatomic, strong) DSImageProcessor *processor;
 
 @end
 
@@ -29,7 +31,9 @@ using namespace std;
 {
     self = [super init];
     if (self) {
-        _manager = [[DSImageManager alloc] init];
+        _manager = [[DSImageIO alloc] init];
+        _drawer = [[DSImageDrawer alloc] init];
+        _processor = [[DSImageProcessor alloc] init];
     }
     return self;
 }
@@ -107,7 +111,7 @@ static void install(jsi::Runtime &jsiRuntime, RNDynamsoftImageManager *rnManager
                                              green:((hexColor >> 8) & 0xFF) / 255.0
                                               blue:(hexColor & 0xFF) / 255.0
                                              alpha:((hexColor >> 24) & 0xFF) / 255.0];
-            DSImageData *imageData = [rnManager.manager drawOnImage:data quads:[mutableArray copy] colour:color thickness:thickness];
+            DSImageData *imageData = [rnManager.drawer drawOnImage:data quads:[mutableArray copy] colour:color thickness:thickness];
             ImageDataHostObject outImageData = [imageData hostObject];
             Object outObj = Object::createFromHostObject(runtime, std::make_shared<ImageDataHostObject>(outImageData));
             return outObj;
@@ -115,6 +119,31 @@ static void install(jsi::Runtime &jsiRuntime, RNDynamsoftImageManager *rnManager
         return Value(false);
     });
     jsiRuntime.global().setProperty(jsiRuntime, drawOnImageName, std::move(drawOnImageFunc));
+    
+    const char* cropImageName = "imageManager_cropImage";
+    auto cropImageFunc = Function::createFromHostFunction(jsiRuntime,
+                                                    PropNameID::forAscii(jsiRuntime,
+                                                                         cropImageName),
+                                                    2,
+                                                    [rnManager](Runtime &runtime,
+                                                             const Value& /*thisValue*/,
+                                                             const Value* arguments,
+                                                             size_t count) -> Value {
+        Object obj = arguments[0].getObject(runtime);
+        if (obj.isHostObject<ImageDataHostObject>(runtime)) {
+            ImageDataHostObject hostObject = ImageDataHostObject::getHOFromObject(runtime, std::move(obj));
+            DSImageData *data = [DSImageData imageDataFromHostObject:hostObject];
+            Object obj = arguments[1].getObject(runtime);
+            DSQuadrilateral *quad = convertJSIValueToDSQuadrilateral(runtime, obj);
+            NSError *error;
+            DSImageData *imageData = [rnManager.processor cropImage:data quad:quad error:&error];
+            ImageDataHostObject outImageData = [imageData hostObject];
+            Object outObj = Object::createFromHostObject(runtime, std::make_shared<ImageDataHostObject>(outImageData));
+            return outObj;
+        }
+        return Value(false);
+    });
+    jsiRuntime.global().setProperty(jsiRuntime, cropImageName, std::move(cropImageFunc));
 }
 
 @end

package/ios/RNDynamsoftImageSourceAdapter.mm

@@ -8,7 +8,7 @@
 #import <jsi/jsi.h>
 #import <sys/utsname.h>
 #import "YeetJSIUtils.h"
-#import <DynamsoftCore/DynamsoftCore.h>
+#import <DynamsoftCaptureVisionBundle/DynamsoftCaptureVisionBundle.h>
 #import "DSImageData+HostObject.h"
 
 using namespace facebook::jsi;

package/ios/RNDynamsoftLicense.m

@@ -3,7 +3,7 @@
  */
 
 #import "RNDynamsoftLicense.h"
-#import <DynamsoftLicense/DynamsoftLicense.h>
+#import <DynamsoftCaptureVisionBundle/DynamsoftCaptureVisionBundle.h>
 
 @interface RNDynamsoftLicense () <DSLicenseVerificationListener>
 

package/ios/RNDynamsoftMultiCrossFilter.m

@@ -3,7 +3,7 @@
  */
 
 #import "RNDynamsoftMultiCrossFilter.h"
-#import <DynamsoftUtility/DynamsoftUtility.h>
+#import <DynamsoftCaptureVisionBundle/DynamsoftCaptureVisionBundle.h>
 #import "RNDynamsoftCaptureVisionRouter.h"
 
 @implementation RNDynamsoftMultiCrossFilter
@@ -29,10 +29,10 @@ RCT_EXPORT_METHOD(enableResultCrossVerification:(NSString *)key type:(NSInteger)
     [filter enableResultCrossVerification:type isEnabled:isEnabled];
 }
 
-RCT_EXPORT_METHOD(isResultCrossVerificationEnabled:(NSString *)key 
+RCT_EXPORT_METHOD(isResultCrossVerificationEnabled:(NSString *)key
                   type:(NSInteger)type
                   resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject) 
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
     RNDynamsoftCaptureVisionRouter *router = [self.bridge moduleForClass:[RNDynamsoftCaptureVisionRouter class]];
     DSMultiFrameResultCrossFilter *filter = [router.filterDictionary objectForKey:key];
@@ -61,10 +61,10 @@ RCT_EXPORT_METHOD(setDuplicateForgetTime:(NSString *)key type:(NSInteger)type ti
     [filter setDuplicateForgetTime:type duplicateForgetTime:time];
 }
 
-RCT_EXPORT_METHOD(getDuplicateForgetTime:(NSString *)key 
+RCT_EXPORT_METHOD(getDuplicateForgetTime:(NSString *)key
                   type:(NSInteger)type
                   resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject) 
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
     RNDynamsoftCaptureVisionRouter *router = [self.bridge moduleForClass:[RNDynamsoftCaptureVisionRouter class]];
     DSMultiFrameResultCrossFilter *filter = [router.filterDictionary objectForKey:key];
@@ -77,10 +77,10 @@ RCT_EXPORT_METHOD(enableLatestOverlapping:(NSString *)key type:(NSInteger)type i
     [filter enableLatestOverlapping:type isEnabled:isEnabled];
 }
 
-RCT_EXPORT_METHOD(isLatestOverlappingEnabled:(NSString *)key 
+RCT_EXPORT_METHOD(isLatestOverlappingEnabled:(NSString *)key
                   type:(NSInteger)type
                   resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject) 
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
     RNDynamsoftCaptureVisionRouter *router = [self.bridge moduleForClass:[RNDynamsoftCaptureVisionRouter class]];
     DSMultiFrameResultCrossFilter *filter = [router.filterDictionary objectForKey:key];
@@ -93,10 +93,10 @@ RCT_EXPORT_METHOD(setMaxOverlappingFrames:(NSString *)key type:(NSInteger)type m
     [filter setMaxOverlappingFrames:type maxOverlappingFrames:maxOverlappingFrames];
 }
 
-RCT_EXPORT_METHOD(getMaxOverlappingFrames:(NSString *)key 
+RCT_EXPORT_METHOD(getMaxOverlappingFrames:(NSString *)key
                   type:(NSInteger)type
                   resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject) 
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
     RNDynamsoftCaptureVisionRouter *router = [self.bridge moduleForClass:[RNDynamsoftCaptureVisionRouter class]];
     DSMultiFrameResultCrossFilter *filter = [router.filterDictionary objectForKey:key];

package/ios/RNDynamsoftVersions.m

@@ -3,19 +3,7 @@
  */
 
 #import "RNDynamsoftVersions.h"
-#import <DynamsoftCore/DynamsoftCore.h>
-#import <DynamsoftLicense/DynamsoftLicense.h>
-#import <DynamsoftImageProcessing/DynamsoftImageProcessing.h>
-#import <DynamsoftCaptureVisionRouter/DynamsoftCaptureVisionRouter.h>
-#import <DynamsoftBarcodeReader/DynamsoftBarcodeReader.h>
-#import <DynamsoftLabelRecognizer/DynamsoftLabelRecognizer.h>
-#import <DynamsoftDocumentNormalizer/DynamsoftDocumentNormalizer.h>
-#import <DynamsoftCameraEnhancer/DynamsoftCameraEnhancer.h>
-#import <DynamsoftNeuralNetwork/DynamsoftNeuralNetwork.h>
-#import <DynamsoftUtility/DynamsoftUtility.h>
-#import <DynamsoftCodeParser/DynamsoftCodeParser.h>
-#import <DynamsoftCodeParserDedicator/DynamsoftCodeParserDedicator.h>
-#import <DynamsoftImageProcessing/DynamsoftImageProcessing.h>
+#import <DynamsoftCaptureVisionBundle/DynamsoftCaptureVisionBundle.h>
 
 @implementation RNDynamsoftVersions
 

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "dynamsoft-capture-vision-react-native",
   "title": "Dynamsoft Capture Vision React Native",
-  "version": "2.6.1016",
-  "description": "Dynamsoft Capture Vision React Native SDK. The SDK supports barcode decoding, document scanning and MRZ reading.",
+  "version": "3.0.3100",
+  "description": "The Dynamsoft Capture Vision React Native SDK provides a wrapper for building barcode scanning, document scanning and MRZ scanning applications with React Native.",
   "homepage": "https://github.com/Dynamsoft/capture-vision-react-native-samples",
   "main": "src/index.tsx",
   "files": [
@@ -37,7 +37,7 @@
     "url": "https://www.dynamsoft.com",
     "email": "support@dynamsoft.com"
   },
-  "license": "MIT",
+  "license": "Apache-2.0",
   "licenseFilename": "LICENSE",
   "readmeFilename": "README.md",
   "peerDependencies": {
@@ -58,13 +58,5 @@
     "react-native": "0.75.2",
     "typedoc": "^0.27.7",
     "typescript": "5.2.2"
-  },
-  "codegenConfig": {
-    "name": "DynamsoftSpecs",
-    "type": "all",
-    "jsSrcsDir": "src",
-    "android": {
-      "javaPackageName": "com.dynamsoft.reactnativelib"
-    }
   }
 }

package/src/core/CapturedResultBase.tsx

@@ -0,0 +1,18 @@
+import {IntermediateResultManager} from "../cvr";
+
+export interface CapturedResultBase {
+  /**
+   * The hash ID of the original image.
+   * @see {@link IntermediateResultManager.getOriginalImage}
+   * */
+  originalImageHashId: string;
+
+  /**Error code associated with the capture result.*/
+  errorCode: number;
+
+  /**Error string providing details about the error.*/
+  errorMessage: string;
+
+  /**the rotation transformation matrix of the original image relative to the rotated image.*/
+  rotationTransformMatrix: Array<number>;
+}

package/src/core/EnumCaptureResultItemType.tsx

@@ -1,9 +1,9 @@
 import type {BarcodeResultItem} from "../dbr";
 import type {TextLineResultItem} from "../dlr";
-import type {DetectedQuadResultItem, NormalizedImageResultItem} from "../ddn";
+import type {DetectedQuadResultItem, EnhancedImageResultItem, DeskewedImageResultItem} from "../ddn";
 import type {ParsedResultItem} from "../dcp";
 
-/**{@link BarcodeResultItem} {@link TextLineResultItem} {@link DetectedQuadResultItem} {@link NormalizedImageResultItem} {@link ParsedResultItem}* */
+/**{@link BarcodeResultItem} {@link TextLineResultItem} {@link DetectedQuadResultItem} {@link DeskewedImageResultItem} {@link ParsedResultItem}  {@link EnhancedImageResultItem}* */
 
 /**
  * Defines the various categories of items that can be recognized and captured.
@@ -33,14 +33,20 @@ export enum EnumCapturedResultItemType {
   CRIT_DETECTED_QUAD = 0x8,
 
   /**
-   * The type of the CapturedResultItem is "normalized image".
-   * @see {@link NormalizedImageResultItem}
+   * The type of the CapturedResultItem is "deskewed image".
+   * @see {@link DeskewedImageResultItem}
    * */
-  CRIT_NORMALIZED_IMAGE = 0x10,
+  CRIT_DESKEWED_IMAGE = 0x10,
 
   /**
    * The type of the CapturedResultItem is "parsed result".
    * @see {@link ParsedResultItem}
    * */
-  CRIT_PARSED_RESULT = 0x20
+  CRIT_PARSED_RESULT = 0x20,
+
+  /**
+   * The type of the CapturedResultItem is "enhanced image".
+   * @see {@link EnhancedImageResultItem}
+   * */
+  CRIT_ENHANCED_IMAGE = 0x40,
 }

package/src/core/EnumCrossVerificationStatus.tsx

@@ -1,4 +1,4 @@
-import type {DetectedQuadResultItem, NormalizedImageResultItem} from "../ddn";
+import {type DetectedQuadResultItem, type DeskewedImageResultItem} from "../ddn";
 import {CaptureVisionRouter} from "../cvr";
 import {MultiFrameResultCrossFilter} from "../utility";
 /**
@@ -12,11 +12,11 @@ import {MultiFrameResultCrossFilter} from "../utility";
  * router.addFilter(filter)
  *
  * router.addResultReceiver({
- *    onDetectedQuadsReceived: result => {
- *        if(result.items && result.items.length > 0) {
+ *    onProcessedDocumentResultReceived: result => {
+ *        if(result.detectedQuadResultItems && result.detectedQuadResultItems.length > 0) {
  *            //Because result cross verification of DETECT_QUAD is enabled,
  *            //crossVerificationStatus of item will be CVS_PASSED or CVS_FAILED.
- *            let crossVerificationStatus = result.items[0].crossVerificationStatus
+ *            let crossVerificationStatus = result.detectedQuadResultItems[0].crossVerificationStatus
  *        }
  *    },
  * })
@@ -28,11 +28,11 @@ import {MultiFrameResultCrossFilter} from "../utility";
  * or added {@link MultiFrameResultCrossFilter} doesn't enable verification for the corresponding type,
  * the crossVerificationStatus property of the item for that type will always remain {@link CVS_NOT_VERIFIED}.
  * <p>
- * Currently, only {@link DetectedQuadResultItem} and {@link NormalizedImageResultItem} have the crossVerificationStatus property.
+ * Currently, only {@link DetectedQuadResultItem} and {@link DeskewedImageResultItem} have the crossVerificationStatus property.
  *
  * @see {@link MultiFrameResultCrossFilter.enableResultCrossVerification}
  * @see {@link DetectedQuadResultItem.crossVerificationStatus}
- * @see {@link NormalizedImageResultItem.crossVerificationStatus}
+ * @see {@link DeskewedImageResultItem.crossVerificationStatus}
  * */
 export enum EnumCrossVerificationStatus {
   /** The cross verification has not been performed yet. */

package/src/core/ImageData.tsx

@@ -20,7 +20,7 @@ declare global {
  * */
 export interface ImageData {
   /**
-   * The raw bytes of the image, of type {@link ArrayBuffer}.
+   * The raw bytes of the image, of type {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/ArrayBuffer ArrayBuffer}.
    * */
   buffer: ArrayBuffer;