dynamsoft-capture-vision-react-native 3.0.5201 → 3.2.3000

package/android/src/main/java/com/dynamsoft/reactnativelib/utility/ImageManagerModuleImpl.kt

@@ -1,7 +1,11 @@
 package com.dynamsoft.reactnativelib.utility
 
+import android.graphics.Rect
+import com.dynamsoft.core.basic_structures.DSRect
+import com.dynamsoft.core.basic_structures.EnumImageFileFormat
 import com.dynamsoft.core.basic_structures.ImageData
 import com.dynamsoft.core.basic_structures.Quadrilateral
+import com.dynamsoft.utility.EnumFilterType
 import com.dynamsoft.utility.ImageDrawer
 import com.dynamsoft.utility.ImageIO
 import com.dynamsoft.utility.ImageProcessor
@@ -30,18 +34,86 @@ class ImageManagerModuleImpl(private val reactContext: ReactApplicationContext)
         imageIo.saveToFile(imageData, filePath, overWrite)
     }
 
+    fun readFromFileCalledInJsi(filePath: String): ImageData? {
+        return try {
+            imageIo.readFromFile(filePath)
+        } catch (_: UtilityException) {
+            null
+        }
+    }
+
+    fun readFromMemoryCalledInJsi(buffer: ByteArray): ImageData? {
+        return try {
+            imageIo.readFromMemory(buffer)
+        } catch (_: UtilityException) {
+            null
+        }
+    }
+
+
+    fun saveToMemoryCalledInJsi(imageData: ImageData, @EnumImageFileFormat format: Int): ByteArray? {
+        return try {
+            imageIo.saveToMemory(imageData, format)
+        } catch (_: UtilityException) {
+            null
+        }
+    }
+
     fun drawOnImageCalledInJsi(imageData: ImageData, quads: Array<Quadrilateral>, color: Int, thickness: Int): ImageData {
         return imageDrawer.drawOnImage(imageData, quads, color, thickness)
     }
 
-    fun cropImageCalledInJsi(imageData: ImageData, quad: Quadrilateral): ImageData? {
+    fun cropImageCalledInJsi(imageData: ImageData, dsRect: DSRect): ImageData? {
+        val rect = if (dsRect.measuredInPercentage) {
+            Rect(
+                (dsRect.left * imageData.width).toInt(),
+                (dsRect.top * imageData.height).toInt(),
+                (dsRect.right * imageData.width).toInt(),
+                (dsRect.bottom * imageData.height).toInt()
+            )
+        } else {
+            Rect(dsRect.left.toInt(), dsRect.top.toInt(), dsRect.right.toInt(), dsRect.bottom.toInt())
+        }
+        return try {
+            imageProcessor.cropImage(imageData, rect)
+        } catch (e: UtilityException) {
+            null
+        }
+    }
+
+    fun cropAndDeskewImageCalledInJsi(imageData: ImageData, quad: Quadrilateral, dstWidth: Int, dstHeight: Int, padding: Int): ImageData? {
         return try {
-            imageProcessor.cropAndDeskewImage(imageData, quad)
+            imageProcessor.cropAndDeskewImage(imageData, quad, dstWidth, dstHeight, padding)
         } catch (e: UtilityException) {
-            null;
+            null
         }
     }
 
+    fun adjustBrightnessCalledInJsi(imageData: ImageData, brightness: Int) : ImageData {
+        return imageProcessor.adjustBrightness(imageData, brightness)
+    }
+
+    fun adjustContrastCalledInJsi(imageData: ImageData, contrast: Int) : ImageData {
+        return imageProcessor.adjustContrast(imageData, contrast)
+    }
+
+    fun filterImageCalledInJsi(imageData: ImageData, @EnumFilterType filterType: Int) : ImageData {
+        return imageProcessor.filterImage(imageData, filterType)
+    }
+
+    fun convertToGrayCalledInJsi(imageData: ImageData, r: Float, g: Float, b: Float) : ImageData {
+        return imageProcessor.convertToGray(imageData, r, g, b)
+    }
+
+    fun convertToBinaryGlobalCalledInJsi(imageData: ImageData, threshold: Int, invert: Boolean): ImageData {
+        return imageProcessor.convertToBinaryGlobal(imageData, threshold, invert)
+    }
+
+    fun convertToBinaryLocalCalledInJsi(imageData: ImageData, blockSize: Int, compensation: Int, invert: Boolean): ImageData {
+        return imageProcessor.convertToBinaryLocal(imageData, blockSize, compensation, invert)
+    }
+
+
 
     private external fun nativeInstall(jsiPtr: Long)
 

package/android/src/main/java/com/dynamsoft/reactnativelib/utility/MultiCrossFilterModuleImpl.kt

@@ -45,7 +45,7 @@ class MultiCrossFilterModuleImpl(context: ReactApplicationContext) {
 
     @ReactMethod
     fun enableResultDeduplication(filterId: String, resultItemTypes: Int, enable: Boolean) {
-        getMultiCrossFilterById(filterId)?.enableResultDeduplication(resultItemTypes, enable);
+        getMultiCrossFilterById(filterId)?.enableResultDeduplication(resultItemTypes, enable)
     }
 
     @ReactMethod
@@ -55,7 +55,7 @@ class MultiCrossFilterModuleImpl(context: ReactApplicationContext) {
 
     @ReactMethod
     fun setDuplicateForgetTime(filterId: String, resultItemTypes: Int, time: Int) {
-        getMultiCrossFilterById(filterId)?.setDuplicateForgetTime(resultItemTypes, time);
+        getMultiCrossFilterById(filterId)?.setDuplicateForgetTime(resultItemTypes, time)
     }
 
     @ReactMethod

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

@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
   s.private_header_files = "ios/**/*.h"
   s.requires_arc = true
 
-  s.dependency "DynamsoftCaptureVisionBundle", ">= 3.0.5200", "< 4.0"
+  s.dependency "DynamsoftCaptureVisionBundle", ">= 3.2.3000", "< 4.0"
 
  install_modules_dependencies(s)
 end

package/ios/CPP/ImageDataHostObject.cpp

@@ -11,7 +11,7 @@
 ImageDataHostObject::ImageDataHostObject(int width, int height, int stride, int format, int orientation, uint8_t *buffer, int bufferSize)
     : width(width), height(height), stride(stride), format(format), orientation(orientation), buffer(buffer), bufferSize(bufferSize) {}
 
-ImageDataHostObject ImageDataHostObject::getHOFromObject(Runtime &runtime, Object jsObj) {
+ImageDataHostObject ImageDataHostObject::getHOFromObject(Runtime &runtime, Object &jsObj) {
     if (jsObj.isHostObject<ImageDataHostObject>(runtime)) {
         return *((ImageDataHostObject *) (jsObj.asHostObject(runtime).get()));
     }

package/ios/CPP/ImageDataHostObject.hpp

@@ -29,7 +29,7 @@ class JSI_EXPORT ImageDataHostObject : public HostObject {
     void set(Runtime &, const PropNameID &name, const Value &value) override;
     std::vector<PropNameID> getPropertyNames(Runtime &rt) override;
 
-    static ImageDataHostObject getHOFromObject(Runtime &runtime, Object jsObj);
+    static ImageDataHostObject getHOFromObject(Runtime &runtime, Object &jsObj);
 };
 
 #endif /* ImageDataHostObject_hpp */

package/ios/CPP/RNDynamsoft+JSI.h

@@ -4,6 +4,7 @@
 
 #import <DynamsoftCaptureVisionBundle/DSCapturedResult.h>
 #import <DynamsoftCaptureVisionBundle/DSQuadrilateral.h>
+#import <DynamsoftCaptureVisionBundle/DSRect.h>
 #import <jsi/jsi.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -17,3 +18,5 @@ NS_ASSUME_NONNULL_BEGIN
 NS_ASSUME_NONNULL_END
 
 DSQuadrilateral * _Nullable convertJSIValueToDSQuadrilateral(facebook::jsi::Runtime &runtime, const facebook::jsi::Object &value);
+
+DSRect * _Nullable convertJSIValueToDSRect(facebook::jsi::Runtime &runtime, const facebook::jsi::Object &value);

package/ios/CPP/RNDynamsoft+JSI.mm

@@ -12,6 +12,24 @@ NSArray<NSNumber *> *CGAffineTransformToArray(CGAffineTransform transform) {
     return @[@(transform.a), @(transform.b), @(transform.c), @(transform.d), @(transform.tx), @(transform.ty)];
 }
 
+@implementation NSData (DSNumber)
+
+- (nullable NSArray<NSNumber *> *)toNumberArray {
+    if (!self) return nil;
+    
+    const uint8_t *bytes = (const uint8_t *)self.bytes;
+    NSUInteger length = self.length;
+    
+    NSMutableArray *result = [NSMutableArray arrayWithCapacity:length];
+    for (NSUInteger i = 0; i < length; i++) {
+        [result addObject:@(bytes[i])];
+    }
+    
+    return result;
+}
+
+@end
+
 @implementation DSCapturedResultItem (JSI)
 
 - (Object)convertToJSIObject:(Runtime& )runtime {
@@ -28,7 +46,8 @@ NSArray<NSNumber *> *CGAffineTransformToArray(CGAffineTransform transform) {
         case DSCapturedResultItemTypeBarcode:
             {
                 DSBarcodeResultItem *item = (DSBarcodeResultItem *)self;
-                obj.setProperty(runtime, "format", convertNSNumberToJSINumber(runtime, @(item.format)));
+                obj.setProperty(runtime, "format", BigInt::fromUint64(runtime, item.format));
+                obj.setProperty(runtime, "_formatNumberString", convertNSStringToJSIString(runtime, [NSNumber numberWithUnsignedInteger:item.format].stringValue));
                 obj.setProperty(runtime, "formatString", convertNSStringToJSIString(runtime, item.formatString));
                 obj.setProperty(runtime, "text", convertNSStringToJSIString(runtime, item.text));
                 obj.setProperty(runtime, "location", convertNSDictionaryToJSIObject(runtime, [item.location toJson]));
@@ -37,12 +56,90 @@ NSArray<NSNumber *> *CGAffineTransformToArray(CGAffineTransform transform) {
                 obj.setProperty(runtime, "moduleSize", convertNSNumberToJSINumber(runtime, @(item.moduleSize)));
                 obj.setProperty(runtime, "isDPM", convertNSNumberToJSIBoolean(runtime, @(item.isDPM)));
                 obj.setProperty(runtime, "isMirrored", convertNSNumberToJSIBoolean(runtime, @(item.isMirrored)));
+                if (item.details) {
+                    if (item.format == DSBarcodeFormatQRCode) {
+                        DSQRCodeDetails *qrDetails = (DSQRCodeDetails *)item.details;
+                        NSMutableDictionary *qrDict = [NSMutableDictionary dictionaryWithDictionary:@{
+                            @"rows": @(qrDetails.rows),
+                            @"columns": @(qrDetails.columns),
+                            @"errorCorrectionLevel": @(qrDetails.errorCorrectionLevel),
+                            @"version": @(qrDetails.version),
+                            @"model": @(qrDetails.model),
+                            @"mode": @(qrDetails.mode),
+                            @"page": @(qrDetails.page),
+                            @"totalPage": @(qrDetails.totalPage),
+                            @"parityData": @(qrDetails.parityData),
+                            @"dataMaskPattern": @(qrDetails.dataMaskPattern)
+                        }];
+                        
+                        if (qrDetails.codewords) {
+                            qrDict[@"codewords"] = [qrDetails.codewords toNumberArray];
+                        }
+                        obj.setProperty(runtime, "qrCodeDetails", convertNSDictionaryToJSIObject(runtime, [qrDict copy]));
+                    } else if (item.format == DSBarcodeFormatAztec) {
+                        DSAztecDetails *aztecDetails = (DSAztecDetails *)item.details;
+                        NSDictionary *aztecDict = @{
+                            @"rows": @(aztecDetails.rows),
+                            @"columns": @(aztecDetails.columns),
+                            @"layerNumber": @(aztecDetails.layerNumber)
+                        };
+                        obj.setProperty(runtime, "aztecDetails", convertNSDictionaryToJSIObject(runtime, [aztecDict copy]));
+                    } else if (item.format == DSBarcodeFormatDataMatrix) {
+                        DSDataMatrixDetails *dmDetails = (DSDataMatrixDetails *)item.details;
+                        NSDictionary *dmDict = @{
+                            @"rows": @(dmDetails.rows),
+                            @"columns": @(dmDetails.columns),
+                            @"dataRegionRows": @(dmDetails.dataRegionRows),
+                            @"dataRegionColumns": @(dmDetails.dataRegionColumns),
+                            @"dataRegionNumber": @(dmDetails.dataRegionNumber)
+                        };
+                        obj.setProperty(runtime, "dataMatrixDetails", convertNSDictionaryToJSIObject(runtime, [dmDict copy]));
+                    } else if ((item.format & DSBarcodeFormatOneD) != 0) {
+                        DSOneDCodeDetails *onedDetails = (DSOneDCodeDetails *)item.details;
+                        NSMutableDictionary *onedDict = [NSMutableDictionary dictionary];
+                        
+                        if (onedDetails.startCharsBytes) {
+                            onedDict[@"startCharsBytes"] = [onedDetails.startCharsBytes toNumberArray];
+                        }
+                        if (onedDetails.stopCharsBytes) {
+                            onedDict[@"stopCharsBytes"] = [onedDetails.stopCharsBytes toNumberArray];
+                        }
+                        if (onedDetails.checkDigitBytes) {
+                            onedDict[@"checkDigitBytes"] = [onedDetails.checkDigitBytes toNumberArray];
+                        }
+                        
+                        onedDict[@"startPatternRange_lower"] = @(onedDetails.startPatternRange.minimum);
+                        onedDict[@"middlePatternRange_lower"] = @(onedDetails.middlePatternRange.minimum);
+                        onedDict[@"endPatternRange_lower"] = @(onedDetails.endPatternRange.minimum);
+                        onedDict[@"startPatternRange_upper"] = @(onedDetails.startPatternRange.maximum);
+                        onedDict[@"middlePatternRange_upper"] = @(onedDetails.middlePatternRange.maximum);
+                        onedDict[@"endPatternRange_upper"] = @(onedDetails.endPatternRange.maximum);
+                        
+                        obj.setProperty(runtime, "oneDCodeDetails", convertNSDictionaryToJSIObject(runtime, [onedDict copy]));
+                    } else if (item.format == DSBarcodeFormatPDF417) {
+                        DSPDF417Details *pdf417Details = (DSPDF417Details *)item.details;
+                        NSMutableDictionary *pdf417Dict = [NSMutableDictionary dictionaryWithDictionary:@{
+                            @"rows": @(pdf417Details.rows),
+                            @"columns": @(pdf417Details.columns),
+                            @"errorCorrectionLevel": @(pdf417Details.errorCorrectionLevel),
+                            @"hasLeftRowIndicator": @(pdf417Details.hasLeftRowIndicator),
+                            @"hasRightRowIndicator": @(pdf417Details.hasRightRowIndicator)
+                        }];
+                        
+                        if (pdf417Details.codewords) {
+                            pdf417Dict[@"codewords"] = pdf417Details.codewords;
+                        }
+                        
+                        obj.setProperty(runtime, "pdf417Details", convertNSDictionaryToJSIObject(runtime, [pdf417Dict copy]));
+                    }
+                }
             }
             break;
         case DSCapturedResultItemTypeTextLine:
             {
                 DSTextLineResultItem *item = (DSTextLineResultItem *)self;
                 obj.setProperty(runtime, "text", convertNSStringToJSIString(runtime, item.text));
+                obj.setProperty(runtime, "rawText", convertNSStringToJSIString(runtime, item.rawText));
                 obj.setProperty(runtime, "location", convertNSDictionaryToJSIObject(runtime, [item.location toJson]));
                 obj.setProperty(runtime, "confidence",convertNSNumberToJSINumber(runtime, @(item.confidence)));
                 int count = item.charResult.count;
@@ -51,8 +148,9 @@ NSArray<NSNumber *> *CGAffineTransformToArray(CGAffineTransform transform) {
                     for (size_t i = 0; i < count; i++) {
                         array.setValueAtIndex(runtime, i, convertNSDictionaryToJSIObject(runtime, [[item.charResult objectAtIndex:i] toJson]));
                     }
-                    obj.setProperty(runtime, "charResult", array);
+                    obj.setProperty(runtime, "characterResults", array);
                 }
+                obj.setProperty(runtime, "specificationName", convertNSStringToJSIString(runtime, item.specificationName));
             }
             break;
         case DSCapturedResultItemTypeDetectedQuad:
@@ -151,3 +249,22 @@ DSQuadrilateral * convertJSIValueToDSQuadrilateral(
     }
     return nil;
 }
+
+DSRect * convertJSIValueToDSRect(
+                                 jsi::Runtime &runtime,
+                                 const jsi::Object &value)
+{
+    if (value.hasProperty(runtime, "top") &&
+        value.hasProperty(runtime, "bottom") &&
+        value.hasProperty(runtime, "right") &&
+        value.hasProperty(runtime, "left") &&
+        value.hasProperty(runtime, "measuredInPercentage")) {
+        double top = value.getProperty(runtime, "top").getNumber();
+        double bottom = value.getProperty(runtime, "bottom").getNumber();
+        double right = value.getProperty(runtime, "right").getNumber();
+        double left = value.getProperty(runtime, "left").getNumber();
+        BOOL measuredInPercentage = value.getProperty(runtime, "measuredInPercentage").getBool();
+        return [[DSRect alloc] initWithLeft:left top:top right:right bottom:bottom measuredInPercentage:measuredInPercentage];
+    }
+    return nil;
+}

package/ios/CPP/RNDynamsoft+Json.m

@@ -316,6 +316,24 @@ void runOnMainThread(void (^block)(void))
 
 @end
 
+@implementation NSData (DSNumber)
+
+- (nullable NSArray<NSNumber *> *)toNumberArray {
+    if (!self) return nil;
+    
+    const uint8_t *bytes = (const uint8_t *)self.bytes;
+    NSUInteger length = self.length;
+    
+    NSMutableArray *result = [NSMutableArray arrayWithCapacity:length];
+    for (NSUInteger i = 0; i < length; i++) {
+        [result addObject:@(bytes[i])];
+    }
+    
+    return result;
+}
+
+@end
+
 @implementation DSCapturedResultItem (Json)
 
 - (nullable NSDictionary *)toJson {
@@ -327,19 +345,99 @@ void runOnMainThread(void (^block)(void))
         case DSCapturedResultItemTypeBarcode:
             {
                 DSBarcodeResultItem *item = (DSBarcodeResultItem *)self;
-                dictionary = @{ @"type":@(item.type),
-                                @"targetROIDefName":item.targetROIDefName,
-                                @"taskName":item.taskName,
-                                @"_formatNumberString": [NSNumber numberWithUnsignedInteger:item.format].stringValue,
-                                @"formatString":item.formatString,
-                                @"text":item.text,
-                                @"location":[item.location toJson],
-                                @"confidence":@(item.confidence),
-                                @"angle":@(item.angle),
-                                @"moduleSize":@(item.moduleSize),
-                                @"isDPM":@(item.isDPM),
-                                @"isMirrored":@(item.isMirrored)
-                };
+                NSMutableDictionary *mutableDictionary = [NSMutableDictionary dictionaryWithDictionary:@{
+                    @"type":@(item.type),
+                    @"targetROIDefName":item.targetROIDefName,
+                    @"taskName":item.taskName,
+                    @"_formatNumberString": [NSNumber numberWithUnsignedInteger:item.format].stringValue,
+                    @"formatString":item.formatString,
+                    @"text":item.text,
+                    @"location":[item.location toJson],
+                    @"confidence":@(item.confidence),
+                    @"angle":@(item.angle),
+                    @"moduleSize":@(item.moduleSize),
+                    @"isDPM":@(item.isDPM),
+                    @"isMirrored":@(item.isMirrored)
+                }];
+                if (item.details) {
+                    if (item.format == DSBarcodeFormatQRCode) {
+                        DSQRCodeDetails *qrDetails = (DSQRCodeDetails *)item.details;
+                        NSMutableDictionary *qrDict = [NSMutableDictionary dictionaryWithDictionary:@{
+                            @"rows": @(qrDetails.rows),
+                            @"columns": @(qrDetails.columns),
+                            @"errorCorrectionLevel": @(qrDetails.errorCorrectionLevel),
+                            @"version": @(qrDetails.version),
+                            @"model": @(qrDetails.model),
+                            @"mode": @(qrDetails.mode),
+                            @"page": @(qrDetails.page),
+                            @"totalPage": @(qrDetails.totalPage),
+                            @"parityData": @(qrDetails.parityData),
+                            @"dataMaskPattern": @(qrDetails.dataMaskPattern)
+                        }];
+                        
+                        if (qrDetails.codewords) {
+                            qrDict[@"codewords"] = [qrDetails.codewords toNumberArray];
+                        }
+                        
+                        mutableDictionary[@"qrCodeDetails"] = qrDict;
+                    } else if (item.format == DSBarcodeFormatAztec) {
+                        DSAztecDetails *aztecDetails = (DSAztecDetails *)item.details;
+                        NSDictionary *aztecDict = @{
+                            @"rows": @(aztecDetails.rows),
+                            @"columns": @(aztecDetails.columns),
+                            @"layerNumber": @(aztecDetails.layerNumber)
+                        };
+                        mutableDictionary[@"aztecDetails"] = aztecDict;
+                    } else if (item.format == DSBarcodeFormatDataMatrix) {
+                        DSDataMatrixDetails *dmDetails = (DSDataMatrixDetails *)item.details;
+                        NSDictionary *dmDict = @{
+                            @"rows": @(dmDetails.rows),
+                            @"columns": @(dmDetails.columns),
+                            @"dataRegionRows": @(dmDetails.dataRegionRows),
+                            @"dataRegionColumns": @(dmDetails.dataRegionColumns),
+                            @"dataRegionNumber": @(dmDetails.dataRegionNumber)
+                        };
+                        mutableDictionary[@"dataMatrixDetails"] = dmDict;
+                    } else if ((item.format & DSBarcodeFormatOneD) != 0) {
+                        DSOneDCodeDetails *onedDetails = (DSOneDCodeDetails *)item.details;
+                        NSMutableDictionary *onedDict = [NSMutableDictionary dictionary];
+                        
+                        if (onedDetails.startCharsBytes) {
+                            onedDict[@"startCharsBytes"] = [onedDetails.startCharsBytes toNumberArray];
+                        }
+                        if (onedDetails.stopCharsBytes) {
+                            onedDict[@"stopCharsBytes"] = [onedDetails.stopCharsBytes toNumberArray];
+                        }
+                        if (onedDetails.checkDigitBytes) {
+                            onedDict[@"checkDigitBytes"] = [onedDetails.checkDigitBytes toNumberArray];
+                        }
+                        
+                        onedDict[@"startPatternRange_lower"] = @(onedDetails.startPatternRange.minimum);
+                        onedDict[@"middlePatternRange_lower"] = @(onedDetails.middlePatternRange.minimum);
+                        onedDict[@"endPatternRange_lower"] = @(onedDetails.endPatternRange.minimum);
+                        onedDict[@"startPatternRange_upper"] = @(onedDetails.startPatternRange.maximum);
+                        onedDict[@"middlePatternRange_upper"] = @(onedDetails.middlePatternRange.maximum);
+                        onedDict[@"endPatternRange_upper"] = @(onedDetails.endPatternRange.maximum);
+                        
+                        mutableDictionary[@"oneDCodeDetails"] = onedDict;
+                    } else if (item.format == DSBarcodeFormatPDF417) {
+                        DSPDF417Details *pdf417Details = (DSPDF417Details *)item.details;
+                        NSMutableDictionary *pdf417Dict = [NSMutableDictionary dictionaryWithDictionary:@{
+                            @"rows": @(pdf417Details.rows),
+                            @"columns": @(pdf417Details.columns),
+                            @"errorCorrectionLevel": @(pdf417Details.errorCorrectionLevel),
+                            @"hasLeftRowIndicator": @(pdf417Details.hasLeftRowIndicator),
+                            @"hasRightRowIndicator": @(pdf417Details.hasRightRowIndicator)
+                        }];
+                        
+                        if (pdf417Details.codewords) {
+                            pdf417Dict[@"codewords"] = pdf417Details.codewords;
+                        }
+                        
+                        mutableDictionary[@"pdf417Details"] = pdf417Dict;
+                    }
+                }
+                dictionary = [mutableDictionary copy];
             }
             break;
         case DSCapturedResultItemTypeTextLine:
@@ -360,9 +458,11 @@ void runOnMainThread(void (^block)(void))
                                 @"targetROIDefName":item.targetROIDefName,
                                 @"taskName":item.taskName,
                                 @"text":item.text,
+                                @"rawText":item.rawText,
                                 @"location":[item.location toJson],
                                 @"confidence":@(item.confidence),
-                                @"charResult":charResult
+                                @"characterResults":charResult,
+                                @"specificationName": item.specificationName
                 };
             }
             break;

package/ios/CPP/YeetJSIUtils.h

@@ -36,6 +36,8 @@ RCTResponseSenderBlock convertJSIFunctionToCallback(
 
 NSData* convertArrayBufferToNSData(jsi::Runtime &runtime, const jsi::ArrayBuffer &buffer);
 
+jsi::ArrayBuffer converNSDataToArrayBuffer(jsi::Runtime &runtime, NSData *data);
+
 struct Promise {
     Promise(jsi::Runtime &rt, jsi::Function resolve, jsi::Function reject);
 

package/ios/CPP/YeetJSIUtils.mm

@@ -154,6 +154,21 @@ NSData* convertArrayBufferToNSData(jsi::Runtime &runtime, const jsi::ArrayBuffer
                          length:buffer.size(runtime)];
 }
 
+jsi::ArrayBuffer converNSDataToArrayBuffer(jsi::Runtime &runtime, NSData *data) {
+    size_t length = [data length];
+    const void *bytes = [data bytes];
+    
+    jsi::ArrayBuffer arrayBuffer = runtime.global()
+        .getPropertyAsFunction(runtime, "ArrayBuffer")
+        .callAsConstructor(runtime, (double)length)
+        .getObject(runtime)
+        .getArrayBuffer(runtime);
+
+    memcpy(arrayBuffer.data(runtime), bytes, length);
+
+    return arrayBuffer;
+}
+
 Promise::Promise(jsi::Runtime &rt, jsi::Function resolve, jsi::Function reject)
 : runtime_(rt), resolve_(std::move(resolve)), reject_(std::move(reject)) {}
 

package/ios/RNDynamsoftCameraView.h

@@ -22,6 +22,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, strong) DSCameraView *cameraView;
 
+@property (nonatomic, strong) NSDictionary *cameraToggleButton;
+
+@property (nonatomic, assign) BOOL cameraToggleButtonVisible;
+
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/RNDynamsoftCameraView.m

@@ -80,4 +80,29 @@
     self.cameraView.torchButtonVisible = torchButtonVisible;
 }
 
+- (void)setCameraToggleButton:(NSDictionary *)cameraToggleButton {
+    if (cameraToggleButton != nil) {
+        _cameraToggleButton = cameraToggleButton;
+        NSDictionary *location = [cameraToggleButton valueForKey:@"location"];
+        NSString *cameraToggleImageBase64 = [cameraToggleButton valueForKey:@"cameraToggleImageBase64"];
+        if (location != nil) {
+            NSNumber *x = [location valueForKey:@"x"];
+            NSNumber *y = [location valueForKey:@"y"];
+            NSNumber *width = [location valueForKey:@"width"];
+            NSNumber *height = [location valueForKey:@"height"];
+            CGRect rect = CGRectMake(x.floatValue, y.floatValue, width.floatValue, height.floatValue);
+            UIImage *image;
+            if (cameraToggleImageBase64 != nil) {
+                image = [UIImage imageWithData: [[NSData alloc]initWithBase64EncodedString:cameraToggleImageBase64 options:(NSDataBase64DecodingIgnoreUnknownCharacters)]];
+            }
+            [self.cameraView setCameraToggleButtonWithFrame:rect cameraToggleImage:image];
+        }
+    }
+}
+
+- (void)setCameraToggleButtonVisible:(BOOL)cameraToggleButtonVisible {
+    _cameraToggleButtonVisible = cameraToggleButtonVisible;
+    self.cameraView.cameraToggleButtonVisible = cameraToggleButtonVisible;
+}
+
 @end

package/ios/RNDynamsoftCameraViewManager.m

@@ -38,6 +38,8 @@ RCT_EXPORT_VIEW_PROPERTY(scanRegionMaskVisible, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(scanLaserVisible, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(torchButton, NSDictionary)
 RCT_EXPORT_VIEW_PROPERTY(torchButtonVisible, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(cameraToggleButton, NSDictionary)
+RCT_EXPORT_VIEW_PROPERTY(cameraToggleButtonVisible, BOOL)
 
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(createInstance) {
     RNDynamsoftImageSourceAdapter *rnAdapter = [self.bridge moduleForClass:[RNDynamsoftImageSourceAdapter class]];
@@ -58,8 +60,12 @@ RCT_EXPORT_METHOD(close) {
     [self.dce close];
 }
 
-RCT_EXPORT_METHOD(setCameraView:(nonnull NSNumber *)tag) {
-    [self trySetCameraViewWithTag:tag attempt:1];
+RCT_EXPORT_METHOD(setCameraView:(nullable NSNumber *)tag) {
+    if (tag && tag.integerValue != 0) {
+        [self trySetCameraViewWithTag:tag attempt:1];
+    } else {
+        self.dce.cameraView = nil;
+    }
 }
 
 - (void)trySetCameraViewWithTag:(nonnull NSNumber *)tag attempt:(NSInteger)attempt {