dynamsoft-capture-vision-react-native 3.2.5002 → 3.4.1000

package/android/src/main/java/com/dynamsoft/reactnativelib/cvr/CaptureVisionRouterModuleImpl.kt

@@ -12,7 +12,6 @@ import com.dynamsoft.ddn.EnhancedImageResultItem
 import com.dynamsoft.ddn.ProcessedDocumentResult
 import com.dynamsoft.dlr.RecognizedTextLinesResult
 import com.dynamsoft.reactnativelib.basicutils.toWritableMap
-import com.dynamsoft.reactnativelib.basicutils.toWritableMap
 import com.dynamsoft.reactnativelib.core.ImageSourceAdapterModuleImpl
 import com.dynamsoft.reactnativelib.basicutils.updateFromReadableMap
 import com.facebook.react.bridge.*
@@ -38,7 +37,7 @@ class CaptureVisionRouterModuleImpl(private val reactContext: ReactApplicationCo
     private var ifStopCapturing = false
     private var currentDeskewedImages: Array<ImageData>? = null
     private var currentEnhancedImages: Array<ImageData>? = null
-    private val cvr = CaptureVisionRouter()
+    private var cvr: CaptureVisionRouter? = null
     private val emitter by lazy { reactContext.getJSModule(RCTDeviceEventEmitter::class.java) }
 
     private var continueCRR = false
@@ -94,6 +93,21 @@ class CaptureVisionRouterModuleImpl(private val reactContext: ReactApplicationCo
 
     fun getName() = NAME
 
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    fun createInstance(): Boolean {
+        if(cvr == null) cvr = CaptureVisionRouter()
+        return true
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    fun destroyInstance(): Boolean {
+        cvr?.input = null
+        cvr?.removeAllResultReceivers()
+        cvr?.stopCapturing()
+        cvr = null
+        return true
+    }
+
     @ReactMethod
     fun continueCRR() {
         continueCRR = true
@@ -102,7 +116,7 @@ class CaptureVisionRouterModuleImpl(private val reactContext: ReactApplicationCo
     @ReactMethod
     fun addListener(type: String?) {
         crrRemoved = false
-        crrMap[type]?.let { cvr.addResultReceiver(it) }
+        crrMap[type]?.let { cvr?.addResultReceiver(it) }
     }
 
     @ReactMethod
@@ -112,31 +126,31 @@ class CaptureVisionRouterModuleImpl(private val reactContext: ReactApplicationCo
 
     @ReactMethod
     fun removeListener(type: String?) {
-        crrMap[type]?.let { cvr.removeResultReceiver(it) }
+        crrMap[type]?.let { cvr?.removeResultReceiver(it) }
     }
 
     @ReactMethod
     fun removeAllResultListeners() {
         crrRemoved = true
         crrMap.forEach {
-            cvr.removeResultReceiver(it.value)
+            cvr?.removeResultReceiver(it.value)
         }
     }
 
     @ReactMethod
     fun addFilter(filterId: String?) {
-        cvr.addResultFilter(filterMap[filterId])
+        cvr?.addResultFilter(filterMap[filterId])
     }
 
     @ReactMethod
     fun removeFilter(filterId: String?) {
-        cvr.removeResultFilter(filterMap[filterId])
+        cvr?.removeResultFilter(filterMap[filterId])
     }
 
     @ReactMethod
     fun startCapturing(template: String, promise: Promise) {
         ifStopCapturing = false
-        cvr.startCapturing(template, object : CompletionListener {
+        cvr?.startCapturing(template, object : CompletionListener {
             override fun onSuccess() {
                 Log.i(TAG, "onSuccess: startCapturing($template)")
                 promise.resolve(null)
@@ -152,19 +166,19 @@ class CaptureVisionRouterModuleImpl(private val reactContext: ReactApplicationCo
     @ReactMethod
     fun stopCapturing(promise: Promise) {
         ifStopCapturing = true
-        cvr.stopCapturing()
+        cvr?.stopCapturing()
         promise.resolve(null)
     }
 
     @ReactMethod
     fun setInput(inputId: String) {
-        ImageSourceAdapterModuleImpl.mapISA[inputId]?.apply { cvr.input = this }
+        ImageSourceAdapterModuleImpl.mapISA[inputId]?.apply { cvr?.input = this }
     }
 
     @ReactMethod
     fun resetSettings(promise: Promise) {
         try {
-            cvr.resetSettings()
+            cvr?.resetSettings()
             promise.resolve(true)
         } catch (e: CaptureVisionRouterException) {
             promise.reject(e.errorCode.toString(), e.message)
@@ -174,7 +188,7 @@ class CaptureVisionRouterModuleImpl(private val reactContext: ReactApplicationCo
     @ReactMethod
     fun getSimplifiedSettings(template: String, promise: Promise) {
         try {
-            promise.resolve(cvr.getSimplifiedSettings(template).toWritableMap())
+            promise.resolve(cvr?.getSimplifiedSettings(template)?.toWritableMap())
         } catch (e: CaptureVisionRouterException) {
             promise.reject(e.errorCode.toString(), e.message)
         }
@@ -183,9 +197,9 @@ class CaptureVisionRouterModuleImpl(private val reactContext: ReactApplicationCo
     @ReactMethod
     fun updateSettings(settings: ReadableMap, template: String, promise: Promise) {
         try {
-            cvr.getSimplifiedSettings(template).apply {
+            cvr?.getSimplifiedSettings(template)?.apply {
                 updateFromReadableMap(settings)
-                cvr.updateSettings(template, this)
+                cvr?.updateSettings(template, this)
             }
             promise.resolve(null)
         } catch (e: CaptureVisionRouterException) {
@@ -196,7 +210,7 @@ class CaptureVisionRouterModuleImpl(private val reactContext: ReactApplicationCo
     @ReactMethod
     fun initSettings(content: String, promise: Promise) {
         try {
-            cvr.initSettings(content)
+            cvr?.initSettings(content)
             promise.resolve(null)
         } catch (e: CaptureVisionRouterException) {
             promise.reject(e.errorCode.toString(), e.message)
@@ -206,7 +220,7 @@ class CaptureVisionRouterModuleImpl(private val reactContext: ReactApplicationCo
     @ReactMethod
     fun initSettingsFromFile(path: String, promise: Promise) {
         try {
-            cvr.initSettingsFromFile(path)
+            cvr?.initSettingsFromFile(path)
             promise.resolve(null)
         } catch (e: CaptureVisionRouterException) {
             promise.reject(e.errorCode.toString(), e.message)
@@ -216,7 +230,7 @@ class CaptureVisionRouterModuleImpl(private val reactContext: ReactApplicationCo
     @ReactMethod
     fun outputSettingsToFile(template: String, path: String, includeDefaultValues: Boolean, promise: Promise) {
         try {
-            cvr.outputSettingsToFile(template, path, includeDefaultValues)
+            cvr?.outputSettingsToFile(template, path, includeDefaultValues)
             promise.resolve(null)
         } catch (e: CaptureVisionRouterException) {
             promise.reject(e.errorCode.toString(), e.message)
@@ -226,7 +240,7 @@ class CaptureVisionRouterModuleImpl(private val reactContext: ReactApplicationCo
     @ReactMethod
     fun outputSettings(template: String, includeDefaultValues: Boolean, promise: Promise) {
         try {
-            promise.resolve(cvr.outputSettings(template, includeDefaultValues))
+            promise.resolve(cvr?.outputSettings(template, includeDefaultValues))
         } catch (e: CaptureVisionRouterException) {
             promise.reject(e.errorCode.toString(), e.message)
         }
@@ -235,7 +249,7 @@ class CaptureVisionRouterModuleImpl(private val reactContext: ReactApplicationCo
     @ReactMethod
     fun switchCapturingTemplate(template: String, promise: Promise) {
         try {
-            cvr.switchCapturingTemplate(template)
+            cvr?.switchCapturingTemplate(template)
             promise.resolve(null)
         } catch (e: CaptureVisionRouterException) {
             promise.reject(e.errorCode.toString(), e.message)
@@ -262,22 +276,22 @@ class CaptureVisionRouterModuleImpl(private val reactContext: ReactApplicationCo
 
     //@Native
     private fun captureImageDataCalledInJSI(imageData: ImageData, template: String): CapturedResult {
-        return cvr.capture(imageData, template)
+        return cvr?.capture(imageData, template) ?: CapturedResult()
     }
 
     //@Native
     private fun captureFileCalledInJSI(filePath: String, template: String): CapturedResult {
-        return cvr.capture(filePath, template)
+        return cvr?.capture(filePath, template) ?: CapturedResult()
     }
 
     //@Native
     private fun captureFileBytesCalledInJSI(fileBytes: ByteArray, template: String): CapturedResult {
-        return cvr.capture(fileBytes, template)
+        return cvr?.capture(fileBytes, template) ?: CapturedResult()
     }
 
     //@Native
     private fun getOriginalImageCalledInJSI(imageHashId: String): ImageData {
-        var originalImage = cvr.intermediateResultManager.getOriginalImage(imageHashId)
+        var originalImage = cvr?.intermediateResultManager?.getOriginalImage(imageHashId)
         if (originalImage == null) {
             originalImage = ImageData()
             originalImage.bytes = ByteArray(0)

package/android/src/main/java/com/dynamsoft/reactnativelib/dce/CameraEnhancerModuleImpl.kt

@@ -11,9 +11,9 @@ import com.dynamsoft.dce.EnumFocusMode
 import com.dynamsoft.dce.EnumResolution
 import com.dynamsoft.dce.Feedback
 import com.dynamsoft.dce.utils.PermissionUtil
-import com.dynamsoft.reactnativelib.core.ImageSourceAdapterModuleImpl.Companion.mapISA
 import com.dynamsoft.reactnativelib.basicutils.toScanRegion
 import com.dynamsoft.reactnativelib.basicutils.toWritableMap
+import com.dynamsoft.reactnativelib.core.ImageSourceAdapterModuleImpl.Companion.mapISA
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.Promise
@@ -39,9 +39,7 @@ class CameraEnhancerModuleImpl(private val reactContext: ReactApplicationContext
 
     private var ifOpenCalled = false
     private var cameraLifecycleOwner = CameraLifeCycleOwner()
-    private var camera: CameraEnhancer = CameraEnhancer(cameraLifecycleOwner).apply {
-        mapISA[this.toString()] = this
-    }
+    private var camera: CameraEnhancer? = null
     private var currentCameraViewId: Int? = null
 
     init {
@@ -77,23 +75,40 @@ class CameraEnhancerModuleImpl(private val reactContext: ReactApplicationContext
 
     @ReactMethod(isBlockingSynchronousMethod = true)
     fun createInstance(): String {
+        if(camera == null) {
+            camera = CameraEnhancer(cameraLifecycleOwner).apply {
+                mapISA[this.toString()] = this
+            }
+        }
         return camera.toString()
     }
 
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    fun destroyInstance(id: String): Boolean {
+        if(camera?.toString() == id) {
+            camera?.close()
+            camera?.cameraView = null
+            currentCameraViewId = null
+            camera = null
+        }
+        mapISA.remove(id)
+        return true
+    }
+
     @ReactMethod
     fun open() {
         ifOpenCalled = true
-        if (currentCameraViewId != null && (camera.cameraView == null || camera.cameraView?.id != currentCameraViewId)) {
-            findAndSetCameraView(currentCameraViewId!!) { camera.open() }
+        if (currentCameraViewId != null && (camera?.cameraView == null || camera?.cameraView?.id != currentCameraViewId)) {
+            findAndSetCameraView(currentCameraViewId!!) { camera?.open() }
         } else {
-            camera.open()
+            camera?.open()
         }
     }
 
     @ReactMethod
     fun close() {
         ifOpenCalled = false
-        camera.close()
+        camera?.close()
     }
 
     @ReactMethod
@@ -107,76 +122,78 @@ class CameraEnhancerModuleImpl(private val reactContext: ReactApplicationContext
 
     @ReactMethod
     fun selectCamera(@EnumCameraPosition position: Int) {
-        camera.selectCamera(position)
+        camera?.selectCamera(position)
     }
 
     @ReactMethod
     fun getCameraPosition(promise: Promise) {
-        promise.resolve(camera.cameraPosition)
+        promise.resolve(camera?.cameraPosition)
     }
 
     @ReactMethod
     fun setFocus(x: Float, y: Float, @EnumFocusMode focusMode: Int) {
-        camera.setFocus(PointF(x, y), focusMode)
+        camera?.setFocus(PointF(x, y), focusMode)
     }
 
     @ReactMethod
     fun getFocusMode(promise: Promise) {
-        promise.resolve(camera.focusMode)
+        promise.resolve(camera?.focusMode)
     }
 
     @ReactMethod
     fun setZoomFactor(factor: Float) {
-        camera.zoomFactor = factor
+        camera?.zoomFactor = factor
     }
 
     @ReactMethod
     fun getZoomFactor(promise: Promise) {
-        promise.resolve(camera.zoomFactor)
+        promise.resolve(camera?.zoomFactor)
     }
 
     @ReactMethod
     fun enableEnhancedFeatures(features: Int) {
-        camera.enableEnhancedFeatures(features)
+        camera?.enableEnhancedFeatures(features)
     }
 
     @ReactMethod
     fun disableEnhancedFeatures(features: Int) {
-        camera.disableEnhancedFeatures(features)
+        camera?.disableEnhancedFeatures(features)
     }
 
     @ReactMethod
     fun setScanRegion(region: ReadableMap?) {
-        camera.scanRegion = region?.toScanRegion()
+        camera?.scanRegion = region?.toScanRegion()
     }
 
     @ReactMethod
     fun getScanRegion(promise: Promise) {
-        promise.resolve(camera.scanRegion?.toWritableMap())
+        promise.resolve(camera?.scanRegion?.toWritableMap())
     }
 
     @ReactMethod
     fun turnOnTorch() {
-        camera.turnOnTorch()
+        camera?.turnOnTorch()
     }
 
     @ReactMethod
     fun turnOffTorch() {
-        camera.turnOffTorch()
+        camera?.turnOffTorch()
     }
 
 
     @ReactMethod
     fun setResolution(resolution: Int) {
         if(resolution == 4) {
-            camera.setResolution(EnumResolution.RESOLUTION_4K)
+            camera?.setResolution(EnumResolution.RESOLUTION_4K)
+        } else if(resolution == 5) {
+            camera?.setResolution(EnumResolution.RESOLUTION_MAX)
         } else {
-            camera.setResolution(resolution)
+            camera?.setResolution(resolution)
         }
     }
     @ReactMethod
     fun getResolution(promise: Promise) {
-        val resolution = camera.resolution ?: Size(0,0)
+        val resolution = camera?.resolution ?: Size(0,0)
         promise.resolve(Arguments.createMap().apply {
             putInt("width", resolution.width)
             putInt("height", resolution.height)
@@ -201,7 +218,8 @@ class CameraEnhancerModuleImpl(private val reactContext: ReactApplicationContext
                 return@launch
             }
             MainScope().launch {
-                camera.cameraView = cameraView
+                Log.e(TAG, "findAndSetCameraView: before setCameraView $camera ${cameraView.id}", )
+                camera?.cameraView = cameraView
                 afterSetCameraView()
             }
         }

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

@@ -1,10 +1,13 @@
 package com.dynamsoft.reactnativelib.utility
 
 import com.dynamsoft.reactnativelib.cvr.filterMap
+import com.dynamsoft.utility.CrossVerificationCriteria
 import com.dynamsoft.utility.MultiFrameResultCrossFilter
+import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.bridge.ReadableMap
 
 class MultiCrossFilterModuleImpl(context: ReactApplicationContext) {
     companion object {
@@ -13,8 +16,8 @@ class MultiCrossFilterModuleImpl(context: ReactApplicationContext) {
 
     fun getName() = NAME
 
-    private fun getMultiCrossFilterById(filterId: String) : MultiFrameResultCrossFilter? {
-        return if(filterMap[filterId] is MultiFrameResultCrossFilter) {
+    private fun getMultiCrossFilterById(filterId: String): MultiFrameResultCrossFilter? {
+        return if (filterMap[filterId] is MultiFrameResultCrossFilter) {
             filterMap[filterId] as MultiFrameResultCrossFilter
         } else {
             null
@@ -82,4 +85,27 @@ class MultiCrossFilterModuleImpl(context: ReactApplicationContext) {
     fun setMaxOverlappingFrames(filterId: String, resultItemTypes: Int, maxFrameToCheck: Int) {
         getMultiCrossFilterById(filterId)?.setMaxOverlappingFrames(resultItemTypes, maxFrameToCheck)
     }
+
+    @ReactMethod
+    fun setResultCrossVerificationCriteria(filterId: String, resultItemTypes: Int, criteria: ReadableMap) {
+        getMultiCrossFilterById(filterId)?.setResultCrossVerificationCriteria(resultItemTypes, criteria.run {
+            CrossVerificationCriteria(
+                criteria.getInt("frameWindow"),
+                criteria.getInt("minConsistentFrames"),
+            )
+        })
+    }
+
+    @ReactMethod
+    fun getResultCrossVerificationCriteria(filterId: String, resultItemType: Int, promise: Promise) {
+        val criteria = getMultiCrossFilterById(filterId)?.getResultCrossVerificationCriteria(resultItemType)
+        if (criteria != null) {
+            promise.resolve(Arguments.createMap().apply {
+                putInt("frameWindow", criteria.frameWindow)
+                putInt("minConsistentFrames", criteria.minConsistentFrames)
+            })
+        } else {
+            promise.resolve(null)
+        }
+    }
 }

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.2.5000", "< 4.0"
+  s.dependency "DynamsoftCaptureVisionBundle", ">= 3.4.1000", "< 4.0"
 
  install_modules_dependencies(s)
 end

package/ios/CPP/ImageDataHostObject.cpp

@@ -47,7 +47,7 @@ Value ImageDataHostObject::get(Runtime &runtime, const PropNameID &propName) {
         return arrayBuffer;
     }
     if (name == "release") {
-        auto release = [=](Runtime & runtime, const Value& thisValue, const Value* arguments, size_t count) -> Value {
+        auto release = [=, this](Runtime & runtime, const Value& thisValue, const Value* arguments, size_t count) -> Value {
             if(buffer != nullptr) {
                 delete[] buffer;
                 buffer = nullptr;

package/ios/CPP/RNDynamsoft+JSI.mm

@@ -30,6 +30,20 @@ NSArray<NSNumber *> *CGAffineTransformToArray(CGAffineTransform transform) {
 
 @end
 
+@implementation DSECISegment (JSI)
+
+- (nullable NSDictionary *)toJson {
+    if (!self) return nil;
+    return @{
+        @"eciValue" : @(self.eciValue),
+        @"charsetEncoding" : self.charsetEncoding,
+        @"startIndex" : @(self.startIndex),
+        @"length" : @(self.length)
+    };
+}
+
+@end
+
 @implementation DSCapturedResultItem (JSI)
 
 - (Object)convertToJSIObject:(Runtime& )runtime {
@@ -50,6 +64,7 @@ NSArray<NSNumber *> *CGAffineTransformToArray(CGAffineTransform transform) {
                 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, "bytes", convertNSStringToJSIString(runtime, [item.bytes base64EncodedStringWithOptions:0]));
                 obj.setProperty(runtime, "location", convertNSDictionaryToJSIObject(runtime, [item.location toJson]));
                 obj.setProperty(runtime, "confidence", convertNSNumberToJSINumber(runtime, @(item.confidence)));
                 obj.setProperty(runtime, "angle", convertNSNumberToJSINumber(runtime, @(item.angle)));
@@ -133,6 +148,16 @@ NSArray<NSNumber *> *CGAffineTransformToArray(CGAffineTransform transform) {
                         obj.setProperty(runtime, "pdf417Details", convertNSDictionaryToJSIObject(runtime, [pdf417Dict copy]));
                     }
                 }
+                NSArray<DSECISegment *> *eciSegments = item.eciSegments;
+                if (eciSegments && eciSegments.count > 0) {
+                    NSMutableArray<NSDictionary *> *mutableArray = [NSMutableArray arrayWithCapacity:eciSegments.count];
+                    for (DSECISegment *eci in eciSegments) {
+                        [mutableArray addObject:[eci toJson]];
+                    }
+                    obj.setProperty(runtime, "eciSegments", convertNSArrayToJSIArray(runtime, [mutableArray copy]));
+                } else {
+                    obj.setProperty(runtime, "eciSegments", jsi::Value::null());
+                }
             }
             break;
         case DSCapturedResultItemTypeTextLine:
@@ -142,13 +167,15 @@ NSArray<NSNumber *> *CGAffineTransformToArray(CGAffineTransform transform) {
                 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;
+                NSUInteger count = item.charResult.count;
                 if (count > 0) {
                     jsi::Array array = jsi::Array(runtime, count);
                     for (size_t i = 0; i < count; i++) {
                         array.setValueAtIndex(runtime, i, convertNSDictionaryToJSIObject(runtime, [[item.charResult objectAtIndex:i] toJson]));
                     }
                     obj.setProperty(runtime, "characterResults", array);
+                } else {
+                    obj.setProperty(runtime, "characterResults", jsi::Value::null());
                 }
                 obj.setProperty(runtime, "specificationName", convertNSStringToJSIString(runtime, item.specificationName));
             }
@@ -167,6 +194,8 @@ NSArray<NSNumber *> *CGAffineTransformToArray(CGAffineTransform transform) {
                     ImageDataHostObject hostObject = [item.imageData hostObject];
                     Object object = Object::createFromHostObject(runtime, std::make_shared<ImageDataHostObject>(hostObject));
                     obj.setProperty(runtime, "imageData", object);
+                } else {
+                    obj.setProperty(runtime, "imageData", jsi::Value::null());
                 }
                 obj.setProperty(runtime, "sourceDeskewQuad", convertNSDictionaryToJSIObject(runtime, [item.sourceDeskewQuad toJson]));
                 obj.setProperty(runtime, "crossVerificationStatus", convertNSNumberToJSINumber(runtime, @(item.crossVerificationStatus)));
@@ -180,6 +209,8 @@ NSArray<NSNumber *> *CGAffineTransformToArray(CGAffineTransform transform) {
                 ImageDataHostObject hostObject = [item.imageData hostObject];
                 Object object = Object::createFromHostObject(runtime, std::make_shared<ImageDataHostObject>(hostObject));
                 obj.setProperty(runtime, "imageData", object);
+            } else {
+                obj.setProperty(runtime, "imageData", jsi::Value::null());
             }
             obj.setProperty(runtime, "originalToLocalMatrix", convertNSArrayToJSIArray(runtime, CGAffineTransformToArray(item.originalToLocalMatrix)));
             break;
@@ -220,6 +251,8 @@ NSArray<NSNumber *> *CGAffineTransformToArray(CGAffineTransform transform) {
             array.setValueAtIndex(runtime, i, [[self.items objectAtIndex:i] convertToJSIObject:runtime]);
         }
         obj.setProperty(runtime, "items", array);
+    } else {
+        obj.setProperty(runtime, "items", jsi::Value::null());
     }
     return obj;
 }

package/ios/CPP/RNDynamsoft+Json.m

@@ -334,6 +334,20 @@ void runOnMainThread(void (^block)(void))
 
 @end
 
+@implementation DSECISegment (JSI)
+
+- (nullable NSDictionary *)toJson {
+    if (!self) return nil;
+    return @{
+        @"eciValue" : @(self.eciValue),
+        @"charsetEncoding" : self.charsetEncoding,
+        @"startIndex" : @(self.startIndex),
+        @"length" : @(self.length)
+    };
+}
+
+@end
+
 @implementation DSCapturedResultItem (Json)
 
 - (nullable NSDictionary *)toJson {
@@ -352,6 +366,7 @@ void runOnMainThread(void (^block)(void))
                     @"_formatNumberString": [NSNumber numberWithUnsignedInteger:item.format].stringValue,
                     @"formatString":item.formatString,
                     @"text":item.text,
+                    @"bytes":[item.bytes base64EncodedStringWithOptions:0],
                     @"location":[item.location toJson],
                     @"confidence":@(item.confidence),
                     @"angle":@(item.angle),
@@ -437,6 +452,16 @@ void runOnMainThread(void (^block)(void))
                         mutableDictionary[@"pdf417Details"] = pdf417Dict;
                     }
                 }
+                NSArray<DSECISegment *> *eciSegments = item.eciSegments;
+                if (eciSegments && eciSegments.count > 0) {
+                    NSMutableArray<NSDictionary *> *mutableArray = [NSMutableArray arrayWithCapacity:eciSegments.count];
+                    for (DSECISegment *eci in eciSegments) {
+                        [mutableArray addObject:[eci toJson]];
+                    }
+                    mutableDictionary[@"eciSegments"] = [mutableArray copy];
+                } else {
+                    mutableDictionary[@"eciSegments"] = [NSNull null];
+                }
                 dictionary = [mutableDictionary copy];
             }
             break;

package/ios/RNDynamsoftCameraViewManager.m

@@ -15,7 +15,7 @@
 @end
 
 @implementation RNDynamsoftCameraViewManager {
-
+    
 }
 
 RCT_EXPORT_MODULE(DynamsoftCameraView)
@@ -52,6 +52,13 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(createInstance) {
     return key;
 }
 
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(destroyInstance:(NSString *)key) {
+    self.dce = nil;
+    RNDynamsoftImageSourceAdapter *rnAdapter = [self.bridge moduleForClass:[RNDynamsoftImageSourceAdapter class]];
+    [rnAdapter.isaDictionary removeObjectForKey:key];
+    return @true;
+}
+
 RCT_EXPORT_METHOD(open) {
     [self.dce open];
 }

package/ios/RNDynamsoftCaptureVisionRouter.mm

@@ -40,7 +40,6 @@ RCT_EXPORT_MODULE(DynamsoftCaptureVisionRouterModule)
 {
     self = [super init];
     if (self) {
-        _cvr = [[DSCaptureVisionRouter alloc] init];
         semaphore = dispatch_semaphore_create(0);
     }
     return self;
@@ -51,6 +50,16 @@ RCT_EXPORT_MODULE(DynamsoftCaptureVisionRouterModule)
     _cvr = nil;
 }
 
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(createInstance) {
+    self.cvr = [[DSCaptureVisionRouter alloc] init];
+    return @true;
+}
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(destroyInstance) {
+    self.cvr = nil;
+    return @true;
+}
+
 RCT_EXPORT_METHOD(setGlobalIntraOpNumThreads:(NSInteger)intraOpNumThreads) {
     [DSCaptureVisionRouter setGlobalIntraOpNumThreads:intraOpNumThreads];
 }
@@ -359,17 +368,23 @@ RCT_EXPORT_METHOD(removeFilter:(NSString *)key) {
 // --- RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install) ---
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install)
 {
-    RCTBridge* bridge = [RCTBridge currentBridge];
-    RCTCxxBridge* cxxBridge = (RCTCxxBridge*)bridge;
-    if (cxxBridge == nil) {
+    RCTBridge *bridge = self.bridge;
+    
+    if ([bridge respondsToSelector:NSSelectorFromString(@"parentBridge")]) {
+        bridge = [bridge valueForKey:@"parentBridge"];
+    }
+
+    RCTCxxBridge *cxxBridge = (RCTCxxBridge *)bridge;
+    if (cxxBridge == nil || cxxBridge.runtime == nil) {
         return @false;
     }
+    
     auto jsiRuntime = (jsi::Runtime*) cxxBridge.runtime;
     if (jsiRuntime == nil) {
         return @false;
     }
     
-    install(*(facebook::jsi::Runtime *)jsiRuntime, self);
+    install(*(facebook::jsi::Runtime *)cxxBridge.runtime, self);
     return @true;
 }
 
@@ -377,7 +392,7 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install)
 static void installHostFunction(
     jsi::Runtime &jsiRuntime,
     const char* name,
-    size_t argCount,
+    unsigned int argCount,
     HostFunctionType hostFunction) {
     
     auto func = Function::createFromHostFunction(