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

package/ios/CPP/RNDynamsoft+Json.m

@@ -72,9 +72,9 @@ void runOnMainThread(void (^block)(void))
 @implementation DSSimplifiedCaptureVisionSettings (Json)
 
 - (void)updateWithDicitionary:(NSDictionary *)dictionary {
-    NSNumber *capturedResultItemTypes = [dictionary valueForKey:@"capturedResultItemTypes"];
-    if (capturedResultItemTypes) {
-        self.capturedResultItemTypes = capturedResultItemTypes.integerValue;
+    NSNumber *outputOriginalImage = [dictionary valueForKey:@"outputOriginalImage"];
+    if (outputOriginalImage) {
+        self.outputOriginalImage = outputOriginalImage.boolValue;
     }
     NSDictionary *roi = [dictionary valueForKey:@"roi"];
     if (roi) {
@@ -112,7 +112,7 @@ void runOnMainThread(void (^block)(void))
 
 - (NSObject *)toJson {
     if (self) {
-        NSDictionary *dictionary = @{@"capturedResultItemTypes":@(self.capturedResultItemTypes),
+        NSDictionary *dictionary = @{@"outputOriginalImage":@(self.outputOriginalImage),
                                      @"roi":self.roi ? [self.roi toJson] : [NSNull null],
                                      @"roiMeasuredInPercentage":@(self.roiMeasuredInPercentage),
                                      @"maxParallelTasks":@(self.maxParallelTasks),
@@ -134,7 +134,8 @@ void runOnMainThread(void (^block)(void))
 - (void)updateWithDicitionary:(NSDictionary *)dictionary {
     NSString *_barcodeFormatIdsNumberString = [dictionary valueForKey:@"_barcodeFormatIdsNumberString"];
     if (_barcodeFormatIdsNumberString) {
-        self.barcodeFormatIds = _barcodeFormatIdsNumberString.integerValue;
+        NSUInteger unsignedIntegerValue = strtoull([_barcodeFormatIdsNumberString UTF8String], NULL, 10);
+        self.barcodeFormatIds = unsignedIntegerValue;
     }
     NSNumber *expectedBarcodesCount = [dictionary valueForKey:@"expectedBarcodesCount"];
     if (expectedBarcodesCount) {
@@ -377,17 +378,27 @@ void runOnMainThread(void (^block)(void))
                 };
             }
             break;
-        case DSCapturedResultItemTypeNormalizedImage:
+        case DSCapturedResultItemTypeDeskewedImage:
             {
-                DSNormalizedImageResultItem *item = (DSNormalizedImageResultItem *)self;
+                DSDeskewedImageResultItem *item = (DSDeskewedImageResultItem *)self;
                 dictionary = @{ @"type":@(item.type),
                                 @"targetROIDefName":item.targetROIDefName,
                                 @"taskName":item.taskName,
-                                @"location":[item.location toJson],
-                                @"crossVerificationStatus":@(item.crossVerificationStatus)
+                                @"sourceDeskewQuad":[item.sourceDeskewQuad toJson],
+                                @"crossVerificationStatus":@(item.crossVerificationStatus),
+                                @"originalToLocalMatrix":CGAffineTransformToArray(item.originalToLocalMatrix)
                 };
             }
             break;
+        case DSCapturedResultItemTypeEnhancedImage: {
+            DSEnhancedImageResultItem *item = (DSEnhancedImageResultItem *)self;
+            dictionary = @{ @"type":@(item.type),
+                            @"targetROIDefName":item.targetROIDefName,
+                            @"taskName":item.taskName,
+                            @"originalToLocalMatrix":CGAffineTransformToArray(item.originalToLocalMatrix)
+            };
+            break;
+        }
         case DSCapturedResultItemTypeParsedResult:
             {
                 DSParsedResultItem *item = (DSParsedResultItem *)self;
@@ -475,56 +486,54 @@ void runOnMainThread(void (^block)(void))
 
 @end
 
-@implementation DSDetectedQuadsResult (Json)
+@implementation DSProcessedDocumentResult (Json)
 
 - (NSObject *)toJson {
     if (self) {
-        id items;
-        if (self.items.count > 0) {
+        id detectedQuadResultItems;
+        if (self.detectedQuadResultItems.count > 0) {
             NSMutableArray *array = [NSMutableArray array];
-            for (DSDetectedQuadResultItem *item in self.items) {
+            for (DSDetectedQuadResultItem *item in self.detectedQuadResultItems) {
                 NSDictionary *obj = [item toJson];
                 if (obj) {
                     [array addObject:obj];
                 }
             }
-            items = [array copy];
+            detectedQuadResultItems = [array copy];
         } else {
-            items = [NSNull null];
+            detectedQuadResultItems = [NSNull null];
         }
-        NSDictionary *dictionary = @{@"originalImageHashId":self.originalImageHashId,
-                                     @"items":items,
-                                     @"rotationTransformMatrix":CGAffineTransformToArray(self.rotationTransformMatrix),
-                                     @"errorCode":@(self.errorCode),
-                                     @"errorMessage":self.errorMessage ? self.errorMessage : [NSNull null]
-        };
-        return dictionary;
-    } else {
-        return [NSNull null];
-    }
-}
-
-@end
-
-@implementation DSNormalizedImagesResult (Json)
-
-- (NSObject *)toJson {
-    if (self) {
-        id items;
-        if (self.items.count > 0) {
+        id deskewedImageResultItems;
+        if (self.deskewedImageResultItems.count > 0) {
             NSMutableArray *array = [NSMutableArray array];
-            for (DSNormalizedImageResultItem *item in self.items) {
+            for (DSDeskewedImageResultItem *item in self.deskewedImageResultItems) {
                 NSDictionary *obj = [item toJson];
                 if (obj) {
                     [array addObject:obj];
                 }
             }
-            items = [array copy];
+            deskewedImageResultItems = [array copy];
         } else {
-            items = [NSNull null];
+            deskewedImageResultItems = [NSNull null];
         }
+        id enhancedImageResultItems;
+        if (self.enhancedImageResultItems.count > 0) {
+            NSMutableArray *array = [NSMutableArray array];
+            for (DSEnhancedImageResultItem *item in self.enhancedImageResultItems) {
+                NSDictionary *obj = [item toJson];
+                if (obj) {
+                    [array addObject:obj];
+                }
+            }
+            enhancedImageResultItems = [array copy];
+        } else {
+            enhancedImageResultItems = [NSNull null];
+        }
+        
         NSDictionary *dictionary = @{@"originalImageHashId":self.originalImageHashId,
-                                     @"items":items,
+                                     @"detectedQuadResultItems":detectedQuadResultItems,
+                                     @"deskewedImageResultItems":deskewedImageResultItems,
+                                     @"enhancedImageResultItems":enhancedImageResultItems,
                                      @"rotationTransformMatrix":CGAffineTransformToArray(self.rotationTransformMatrix),
                                      @"errorCode":@(self.errorCode),
                                      @"errorMessage":self.errorMessage ? self.errorMessage : [NSNull null]

package/ios/CPP/YeetJSIUtils.h

@@ -6,7 +6,7 @@
 #import <jsi/jsi.h>
 #import <React/RCTBridgeModule.h>
 #include "ImageDataHostObject.hpp"
-#import <DynamsoftCore/DSImageData.h>
+#import <DynamsoftCaptureVisionBundle/DSImageData.h>
 
 using namespace facebook;
 /**
@@ -34,6 +34,8 @@ RCTResponseSenderBlock convertJSIFunctionToCallback(
                                                     jsi::Runtime &runtime,
                                                     const jsi::Function &value);
 
+NSData* convertArrayBufferToNSData(jsi::Runtime &runtime, const jsi::ArrayBuffer &buffer);
+
 struct Promise {
     Promise(jsi::Runtime &rt, jsi::Function resolve, jsi::Function reject);
 

package/ios/CPP/YeetJSIUtils.mm

@@ -149,6 +149,11 @@ RCTResponseSenderBlock convertJSIFunctionToCallback(
     };
 }
 
+NSData* convertArrayBufferToNSData(jsi::Runtime &runtime, const jsi::ArrayBuffer &buffer) {
+    return [NSData dataWithBytes:buffer.data(runtime)
+                         length:buffer.size(runtime)];
+}
+
 Promise::Promise(jsi::Runtime &rt, jsi::Function resolve, jsi::Function reject)
 : runtime_(rt), resolve_(std::move(resolve)), reject_(std::move(reject)) {}
 

package/ios/RNDynamsoftCameraView.m

@@ -3,7 +3,7 @@
  */
 
 #import "RNDynamsoftCameraView.h"
-#import <DynamsoftCameraEnhancer/DynamsoftCameraEnhancer.h>
+#import <DynamsoftCaptureVisionBundle/DynamsoftCaptureVisionBundle.h>
 
 @interface RNDynamsoftCameraView ()
 

package/ios/RNDynamsoftCameraViewManager.m

@@ -4,8 +4,7 @@
 
 #import "RNDynamsoftCameraViewManager.h"
 #import "RNDynamsoftCameraView.h"
-#import <DynamsoftCameraEnhancer/DynamsoftCameraEnhancer.h>
-#import <DynamsoftCore/DynamsoftCore.h>
+#import <DynamsoftCaptureVisionBundle/DynamsoftCaptureVisionBundle.h>
 #import <React/RCTUIManager.h>
 #import "RNDynamsoftImageSourceAdapter.h"
 
@@ -60,11 +59,24 @@ RCT_EXPORT_METHOD(close) {
 }
 
 RCT_EXPORT_METHOD(setCameraView:(nonnull NSNumber *)tag) {
+    [self trySetCameraViewWithTag:tag attempt:1];
+}
+
+- (void)trySetCameraViewWithTag:(nonnull NSNumber *)tag 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:[RNDynamsoftCameraView class]]) {
-             RCTLogError(@"Cannot find RNDynamsoftCameraView with tag #%@", tag);
+             if (attempt < maxAttempts) {
+                 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(retryDelay * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                     [self trySetCameraViewWithTag:tag attempt:attempt + 1];
+                 });
+             } else {
+                 RCTLogError(@"Cannot find RNDynamsoftCameraView with tag #%@ after %ld attempts", tag, (long)attempt);
+             }
          } else {
              self.dce.cameraView = ((RNDynamsoftCameraView *)view).cameraView;
          }
@@ -72,8 +84,7 @@ RCT_EXPORT_METHOD(setCameraView:(nonnull NSNumber *)tag) {
 }
 
 RCT_EXPORT_METHOD(selectCamera:(NSInteger)position) {
-    NSError *error;
-    [self.dce selectCameraWithPosition:position error:&error];
+    [self.dce selectCameraWithPosition:position completion:nil];
 }
 
 RCT_EXPORT_METHOD(getCameraPosition:(RCTPromiseResolveBlock)resolve
@@ -87,7 +98,7 @@ RCT_EXPORT_METHOD(setFocus:(CGFloat)x y:(CGFloat)y mode:(NSInteger)mode) {
 }
 
 RCT_EXPORT_METHOD(getFocusMode:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject) 
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
     resolve(@([self.dce getFocusMode]));
 }
@@ -110,9 +121,9 @@ RCT_EXPORT_METHOD(disableEnhancedFeatures:(NSInteger)features) {
     [self.dce disableEnhancedFeatures:features];
 }
 
-RCT_EXPORT_METHOD(setScanRegion:(NSDictionary *)region 
+RCT_EXPORT_METHOD(setScanRegion:(NSDictionary *)region
                   resolve:(RCTPromiseResolveBlock)resolve
-                  rejecter: (RCTPromiseRejectBlock)reject) 
+                  rejecter: (RCTPromiseRejectBlock)reject)
 {
     if (region) {
         NSNumber *top = [region valueForKey:@"top"];
@@ -164,4 +175,8 @@ RCT_EXPORT_METHOD(vibrate) {
     [DSFeedback vibrate];
 }
 
+RCT_EXPORT_METHOD(setResolution:(NSInteger)resolution) {
+    [self.dce setResolution:resolution];
+}
+
 @end

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