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

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

@@ -7,9 +7,9 @@ import com.dynamsoft.core.basic_structures.ImageData
 import com.dynamsoft.cvr.*
 import com.dynamsoft.dbr.DecodedBarcodesResult
 import com.dynamsoft.dcp.ParsedResult
-import com.dynamsoft.ddn.DetectedQuadsResult
-import com.dynamsoft.ddn.NormalizedImageResultItem
-import com.dynamsoft.ddn.NormalizedImagesResult
+import com.dynamsoft.ddn.DeskewedImageResultItem
+import com.dynamsoft.ddn.EnhancedImageResultItem
+import com.dynamsoft.ddn.ProcessedDocumentResult
 import com.dynamsoft.dlr.RecognizedTextLinesResult
 import com.dynamsoft.reactnative.basicutils.toWritableMap
 import com.dynamsoft.reactnativelib.core.ImageSourceAdapterModuleImpl
@@ -21,23 +21,24 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
 
 private const val onCapturedResultReceived_Event = "onCapturedResultReceived"
-private const val onDetectedQuadsReceived_Event = "onDetectedQuadsReceived"
 private const val onDecodedBarcodesReceived_Event = "onDecodedBarcodesReceived"
-private const val onNormalizedImagesReceived_Event = "onNormalizedImagesReceived"
+private const val onProcessedDocumentResultReceived_Event = "onProcessedDocumentResultReceived"
 private const val onRecognizedTextLinesReceived_Event = "onRecognizedTextLinesReceived"
 private const val onParsedResultsReceived_Event = "onParsedResultsReceived"
 private const val TAG = "CvrModule"
 
 
 val filterMap = hashMapOf<String, CapturedResultFilter>()
+
 class CaptureVisionRouterModuleImpl(private val reactContext: ReactApplicationContext) {
     companion object {
         const val NAME = "DynamsoftCaptureVisionRouterModule"
     }
 
     private var ifStopCapturing = false
-    private var currentNormalizedImages: Array<ImageData>? = null
-    private val cvr by lazy { CaptureVisionRouter(reactContext) }
+    private var currentDeskewedImages: Array<ImageData>? = null
+    private var currentEnhancedImages: Array<ImageData>? = null
+    private val cvr = CaptureVisionRouter()
     private val emitter by lazy { reactContext.getJSModule(RCTDeviceEventEmitter::class.java) }
 
     private var continueCRR = false
@@ -46,9 +47,12 @@ class CaptureVisionRouterModuleImpl(private val reactContext: ReactApplicationCo
         mapOf(
             onCapturedResultReceived_Event to object : CapturedResultReceiver {
                 override fun onCapturedResultReceived(result: CapturedResult) {
-                    currentNormalizedImages =
-                        result.items.filter { it.type == EnumCapturedResultItemType.CRIT_NORMALIZED_IMAGE }
-                            .map { (it as NormalizedImageResultItem).imageData }.toTypedArray()
+                    currentDeskewedImages =
+                        result.items.filter { it.type == EnumCapturedResultItemType.CRIT_DESKEWED_IMAGE }
+                            .map { (it as DeskewedImageResultItem).imageData }.toTypedArray()
+                    currentEnhancedImages =
+                        result.items.filter { it.type == EnumCapturedResultItemType.CRIT_ENHANCED_IMAGE }
+                            .map { (it as EnhancedImageResultItem).imageData }.toTypedArray()
                     emitResultAndWaitForResponse(onCapturedResultReceived_Event, result.toWritableMap())
                 }
             },
@@ -57,15 +61,11 @@ class CaptureVisionRouterModuleImpl(private val reactContext: ReactApplicationCo
                     emitResultAndWaitForResponse(onDecodedBarcodesReceived_Event, result.toWritableMap())
                 }
             },
-            onDetectedQuadsReceived_Event to object : CapturedResultReceiver {
-                override fun onDetectedQuadsReceived(result: DetectedQuadsResult) {
-                    emitResultAndWaitForResponse(onDetectedQuadsReceived_Event, result.toWritableMap())
-                }
-            },
-            onNormalizedImagesReceived_Event to object : CapturedResultReceiver {
-                override fun onNormalizedImagesReceived(result: NormalizedImagesResult) {
-                    currentNormalizedImages = result.items.map { it.imageData }.toTypedArray()
-                    emitResultAndWaitForResponse(onNormalizedImagesReceived_Event, result.toWritableMap())
+            onProcessedDocumentResultReceived_Event to object : CapturedResultReceiver {
+                override fun onProcessedDocumentResultReceived(result: ProcessedDocumentResult) {
+                    currentDeskewedImages = result.deskewedImageResultItems.map { (it as DeskewedImageResultItem).imageData }.toTypedArray()
+                    currentEnhancedImages = result.enhancedImageResultItems.map { (it as EnhancedImageResultItem).imageData }.toTypedArray()
+                    emitResultAndWaitForResponse(onProcessedDocumentResultReceived_Event, result.toWritableMap())
                 }
             },
             onRecognizedTextLinesReceived_Event to object : CapturedResultReceiver {
@@ -136,7 +136,7 @@ class CaptureVisionRouterModuleImpl(private val reactContext: ReactApplicationCo
     @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)
@@ -214,9 +214,9 @@ class CaptureVisionRouterModuleImpl(private val reactContext: ReactApplicationCo
     }
 
     @ReactMethod
-    fun outputSettingsToFile(template: String, path: String, promise: Promise) {
+    fun outputSettingsToFile(template: String, path: String, includeDefaultValues: Boolean, promise: Promise) {
         try {
-            cvr.outputSettingsToFile(template, path)
+            cvr.outputSettingsToFile(template, path, includeDefaultValues)
             promise.resolve(null)
         } catch (e: CaptureVisionRouterException) {
             promise.reject(e.errorCode.toString(), e.message)
@@ -224,9 +224,9 @@ class CaptureVisionRouterModuleImpl(private val reactContext: ReactApplicationCo
     }
 
     @ReactMethod
-    fun outputSettings(template: String, promise: Promise) {
+    fun outputSettings(template: String, includeDefaultValues: Boolean, promise: Promise) {
         try {
-            promise.resolve(cvr.outputSettings(template))
+            promise.resolve(cvr.outputSettings(template, includeDefaultValues))
         } catch (e: CaptureVisionRouterException) {
             promise.reject(e.errorCode.toString(), e.message)
         }
@@ -258,7 +258,7 @@ class CaptureVisionRouterModuleImpl(private val reactContext: ReactApplicationCo
     //@Native
     private fun getOriginalImageCalledInJSI(imageHashId: String): ImageData {
         var originalImage = cvr.intermediateResultManager.getOriginalImage(imageHashId)
-        if(originalImage == null) {
+        if (originalImage == null) {
             originalImage = ImageData()
             originalImage.bytes = ByteArray(0)
         }

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

@@ -2,16 +2,19 @@ package com.dynamsoft.reactnativelib.dce
 
 import android.graphics.PointF
 import android.util.Log
+import android.util.Size
 import androidx.lifecycle.Lifecycle
 import com.dynamsoft.dce.CameraEnhancer
 import com.dynamsoft.dce.CameraView
 import com.dynamsoft.dce.EnumCameraPosition
 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.utils.toScanRegion
 import com.dynamsoft.reactnativelib.utils.toWritableMap
+import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
@@ -158,14 +161,32 @@ class CameraEnhancerModuleImpl(private val reactContext: ReactApplicationContext
         camera.turnOffTorch()
     }
 
+
+    @ReactMethod
+    fun setResolution(resolution: Int) {
+        if(resolution == 4) {
+            camera.setResolution(EnumResolution.RESOLUTION_4K)
+        } else {
+            camera.setResolution(resolution)
+        }
+    }
+    @ReactMethod
+    fun getResolution(promise: Promise) {
+        val resolution = camera.getResolution() ?: Size(0,0)
+        promise.resolve(Arguments.createMap().apply {
+            putInt("width", resolution.width)
+            putInt("height", resolution.height)
+        })
+    }
+
     @ReactMethod
     fun beep() {
-        Feedback.beep(reactContext)
+        Feedback.beep()
     }
 
     @ReactMethod
     fun vibrate() {
-        Feedback.vibrate(reactContext)
+        Feedback.vibrate()
     }
 
     private fun findAndSetCameraView(viewTag: Int, afterSetCameraView: () -> Unit = {}) {

package/android/src/main/java/com/dynamsoft/reactnativelib/license/LicenseModuleImpl.kt

@@ -18,7 +18,7 @@ class LicenseModuleImpl(private val reactContext: ReactApplicationContext) {
     fun initLicense(license: String?, promise: Promise) {
         @SuppressLint("RestrictedApi")
         InnerData.remark.edition = "android-react-native"
-        LicenseManager.initLicense(license, reactContext) { isSuccessful, error ->
+        LicenseManager.initLicense(license) { isSuccessful, error ->
             if (isSuccessful) {
                 promise.resolve(true)
             } else {

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

@@ -2,7 +2,10 @@ package com.dynamsoft.reactnativelib.utility
 
 import com.dynamsoft.core.basic_structures.ImageData
 import com.dynamsoft.core.basic_structures.Quadrilateral
-import com.dynamsoft.utility.ImageManager
+import com.dynamsoft.utility.ImageDrawer
+import com.dynamsoft.utility.ImageIO
+import com.dynamsoft.utility.ImageProcessor
+import com.dynamsoft.utility.UtilityException
 import com.facebook.react.bridge.ReactApplicationContext
 
 class ImageManagerModuleImpl(private val reactContext: ReactApplicationContext) {
@@ -10,6 +13,10 @@ class ImageManagerModuleImpl(private val reactContext: ReactApplicationContext)
         const val NAME = "DynamsoftImageManagerModule"
     }
 
+    private val imageIo by lazy { ImageIO() }
+    private val imageProcessor by lazy { ImageProcessor() }
+    private val imageDrawer by lazy { ImageDrawer() }
+
     fun getName() = NAME
 
     fun install(): Boolean {
@@ -20,14 +27,22 @@ class ImageManagerModuleImpl(private val reactContext: ReactApplicationContext)
     }
 
     fun saveToFileCalledInJsi(imageData: ImageData, filePath: String, overWrite: Boolean) {
-        ImageManager().saveToFile(imageData, filePath, overWrite)
+        imageIo.saveToFile(imageData, filePath, overWrite)
     }
 
     fun drawOnImageCalledInJsi(imageData: ImageData, quads: Array<Quadrilateral>, color: Int, thickness: Int): ImageData {
-        return ImageManager().drawOnImage(imageData, quads, color, thickness)
+        return imageDrawer.drawOnImage(imageData, quads, color, thickness)
+    }
+
+    fun cropImageCalledInJsi(imageData: ImageData, quad: Quadrilateral): ImageData? {
+        return try {
+            imageProcessor.cropAndDeskewImage(imageData, quad)
+        } catch (e: UtilityException) {
+            null;
+        }
     }
 
 
     private external fun nativeInstall(jsiPtr: Long)
 
-}
+}

package/android/src/main/java/com/dynamsoft/reactnativelib/utils/ForCore.kt

@@ -1,8 +1,10 @@
 package com.dynamsoft.reactnative.basicutils
 
 import android.graphics.Point
+import com.dynamsoft.core.basic_structures.CapturedResultBase
 import com.dynamsoft.core.basic_structures.CapturedResultItem
 import com.dynamsoft.core.basic_structures.Quadrilateral
+import com.dynamsoft.reactnativelib.utils.toWritableArray
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableArray
@@ -35,4 +37,16 @@ fun ReadableMap.toQuad(): Quadrilateral {
 
 fun CapturedResultItem.toSharedWritableMap() : WritableMap = Arguments.createMap().apply {
     putInt("type",type)
+    putString("taskName", taskName)
+    putString("targetROIDefName", targetROIDefName)
+}
+
+fun CapturedResultBase.toSharedWritableMap(): WritableMap = Arguments.createMap().apply {
+    putString("originalImageHashId", originalImageHashId)
+    putInt("errorCode", errorCode)
+    putString("errorMessage", errorMessage)
+    putArray(
+        "rotationTransformMatrix",
+        FloatArray(9).apply { rotationTransformMatrix.getValues(this) }.toWritableArray()
+    )
 }

package/android/src/main/java/com/dynamsoft/reactnativelib/utils/ForCvr.kt

@@ -8,8 +8,10 @@ import com.dynamsoft.cvr.CaptureVisionRouter
 import com.dynamsoft.cvr.CapturedResult
 import com.dynamsoft.cvr.SimplifiedCaptureVisionSettings
 import com.dynamsoft.dbr.BarcodeResultItem
+import com.dynamsoft.dcp.ParsedResultItem
+import com.dynamsoft.ddn.DeskewedImageResultItem
 import com.dynamsoft.ddn.DetectedQuadResultItem
-import com.dynamsoft.ddn.NormalizedImageResultItem
+import com.dynamsoft.ddn.EnhancedImageResultItem
 import com.dynamsoft.dlr.TextLineResultItem
 import com.dynamsoft.reactnative.basicutils.toQuad
 import com.dynamsoft.reactnative.basicutils.toWritableArray
@@ -32,7 +34,7 @@ fun CaptureVisionRouter.startCapturingWithCallback(template: String, logTag: Str
     })
 }
 
-fun Array<out CapturedResultItem>.toWritableArray(): WritableArray = Arguments.createArray().apply {
+private fun Array<out CapturedResultItem>.toWritableArray(): WritableArray = Arguments.createArray().apply {
     forEach {
         when (it.type) {
             EnumCapturedResultItemType.CRIT_BARCODE -> {
@@ -44,8 +46,14 @@ fun Array<out CapturedResultItem>.toWritableArray(): WritableArray = Arguments.c
             EnumCapturedResultItemType.CRIT_DETECTED_QUAD -> {
                 pushMap((it as DetectedQuadResultItem).toWritableMap())
             }
-            EnumCapturedResultItemType.CRIT_NORMALIZED_IMAGE -> {
-                pushMap((it as NormalizedImageResultItem).toWritableMap())
+            EnumCapturedResultItemType.CRIT_DESKEWED_IMAGE -> {
+                pushMap((it as DeskewedImageResultItem).toWritableMap())
+            }
+            EnumCapturedResultItemType.CRIT_ENHANCED_IMAGE -> {
+                pushMap((it as EnhancedImageResultItem).toWritableMap())
+            }
+            EnumCapturedResultItemType.CRIT_PARSED_RESULT -> {
+                pushMap((it as ParsedResultItem).toWritableMap())
             }
         }
     }
@@ -60,7 +68,6 @@ fun CapturedResult.toWritableMap(): WritableMap = Arguments.createMap().apply {
 }
 
 fun SimplifiedCaptureVisionSettings.toWritableMap() = Arguments.createMap().apply {
-    putInt("capturedResultItemTypes", capturedResultItemTypes)
     putMap("roi", roi.toWritableMap())
     putBoolean("roiMeasuredInPercentage", roiMeasuredInPercentage)
     putInt("maxParallelTasks", maxParallelTasks)
@@ -89,8 +96,6 @@ fun SimplifiedCaptureVisionSettings.toWritableMap() = Arguments.createMap().appl
 }
 
 fun SimplifiedCaptureVisionSettings.updateFromReadableMap(newSettings: ReadableMap) {
-    capturedResultItemTypes =
-        if (newSettings.hasKey("capturedResultItemTypes")) newSettings.getInt("capturedResultItemTypes") else capturedResultItemTypes
     roi = if (newSettings.hasKey("roi")) newSettings.getMap("roi")!!.toQuad() else roi
     roiMeasuredInPercentage =
         if (newSettings.hasKey("roiMeasuredInPercentage")) newSettings.getBoolean("roiMeasuredInPercentage") else roiMeasuredInPercentage

package/android/src/main/java/com/dynamsoft/reactnativelib/utils/ForDBR.kt

@@ -32,14 +32,8 @@ fun Array<out BarcodeResultItem>.toWritableArray(): WritableArray = Arguments.cr
 }
 
 fun DecodedBarcodesResult.toWritableMap(): WritableMap = Arguments.createMap().apply {
-    putInt("errorCode", errorCode)
-    putString("originalImageHashId", originalImageHashId)
-    putString("errorMessage", errorMessage)
+    merge(this@toWritableMap.toSharedWritableMap())
     putArray("items", items.toWritableArray())
-    putArray(
-        "rotationTransformMatrix",
-        FloatArray(9).apply { rotationTransformMatrix.getValues(this) }.toWritableArray()
-    )
 }
 
 fun SimplifiedBarcodeReaderSettings.toWritableMap(): WritableMap = Arguments.createMap().apply {

package/android/src/main/java/com/dynamsoft/reactnativelib/utils/ForDCE.kt

@@ -73,14 +73,14 @@ class TorchButtonState(
     fun getTouchOnDrawable(context: Context): Drawable {
         return base64ToDrawable(touchOnBase64, context.resources!!) ?: AppCompatResources.getDrawable(
             context,
-            com.dynamsoft.dce.R.drawable.flash_on
+            com.dynamsoft.R.drawable.flash_on
         )!!
     }
 
     fun getTouchOffDrawable(context: Context): Drawable {
         return base64ToDrawable(touchOffBase64, context.resources!!) ?: AppCompatResources.getDrawable(
             context,
-            com.dynamsoft.dce.R.drawable.flash_off
+            com.dynamsoft.R.drawable.flash_off
         )!!
     }
 

package/android/src/main/java/com/dynamsoft/reactnativelib/utils/ForDDN.kt

@@ -1,10 +1,10 @@
 package com.dynamsoft.reactnative.basicutils
 
 import com.dynamsoft.core.basic_structures.CapturedResultItem
+import com.dynamsoft.ddn.DeskewedImageResultItem
 import com.dynamsoft.ddn.DetectedQuadResultItem
-import com.dynamsoft.ddn.DetectedQuadsResult
-import com.dynamsoft.ddn.NormalizedImageResultItem
-import com.dynamsoft.ddn.NormalizedImagesResult
+import com.dynamsoft.ddn.EnhancedImageResultItem
+import com.dynamsoft.ddn.ProcessedDocumentResult
 import com.dynamsoft.ddn.SimplifiedDocumentNormalizerSettings
 import com.dynamsoft.reactnativelib.utils.toIntArray
 import com.dynamsoft.reactnativelib.utils.toWritableArray
@@ -14,6 +14,13 @@ import com.facebook.react.bridge.WritableArray
 import com.facebook.react.bridge.WritableMap
 
 
+fun ProcessedDocumentResult.toWritableMap(): WritableMap = Arguments.createMap().apply {
+    merge(this@toWritableMap.toSharedWritableMap())
+    putArray("deskewedImageResultItems", deskewedImageResultItems.toWritableArray())
+    putArray("detectedQuadResultItems", detectedQuadResultItems.toWritableArray())
+    putArray("enhancedImageResultItems", enhancedImageResultItems.toWritableArray())
+}
+
 fun DetectedQuadResultItem.toWritableMap(): WritableMap = Arguments.createMap().apply {
     merge((this@toWritableMap as CapturedResultItem).toSharedWritableMap())
     putMap("location", location.toWritableMap())
@@ -26,33 +33,29 @@ fun Array<out DetectedQuadResultItem>.toWritableArray(): WritableArray = Argumen
     forEach { pushMap(it.toWritableMap()) }
 }
 
-fun DetectedQuadsResult.toWritableMap(): WritableMap = Arguments.createMap().apply {
-    putInt("errorCode", errorCode)
-    putString("originalImageHashId", originalImageHashId)
-    putString("errorMessage", errorMessage)
-    putArray("items", items.toWritableArray())
-    putArray("rotationTransformMatrix",FloatArray(9).apply { rotationTransformMatrix.getValues(this) }.toWritableArray())
-}
 
-fun NormalizedImageResultItem.toWritableMap(): WritableMap = Arguments.createMap().apply {
+fun DeskewedImageResultItem.toWritableMap(): WritableMap = Arguments.createMap().apply {
     merge((this@toWritableMap as CapturedResultItem).toSharedWritableMap())
-    putMap("location", location.toWritableMap())
+    putMap("sourceDeskewQuad", sourceDeskewQuad.toWritableMap())
     putInt("crossVerificationStatus", crossVerificationStatus)
+    putArray("originalToLocalMatrix", FloatArray(9).apply { originalToLocalMatrix.getValues(this) }.toWritableArray())
 }
 
-fun Array<out NormalizedImageResultItem>.toWritableArray(): WritableArray = Arguments.createArray().apply {
+fun Array<out DeskewedImageResultItem>.toWritableArray(): WritableArray = Arguments.createArray().apply {
     forEach { pushMap(it.toWritableMap()) }
 }
 
-fun NormalizedImagesResult.toWritableMap(): WritableMap = Arguments.createMap().apply {
-    putInt("errorCode", errorCode)
-    putString("originalImageHashId", originalImageHashId)
-    putString("errorMessage", errorMessage)
-    putArray("items", items.toWritableArray())
-    putArray("rotationTransformMatrix",FloatArray(9).apply { rotationTransformMatrix.getValues(this) }.toWritableArray())
+fun EnhancedImageResultItem.toWritableMap(): WritableMap = Arguments.createMap().apply {
+    merge((this@toWritableMap as CapturedResultItem).toSharedWritableMap())
+    putArray("originalToLocalMatrix", FloatArray(9).apply { originalToLocalMatrix.getValues(this) }.toWritableArray())
+}
+
+fun Array<out EnhancedImageResultItem>.toWritableArray(): WritableArray = Arguments.createArray().apply {
+    forEach { pushMap(it.toWritableMap()) }
 }
 
 
+
 fun SimplifiedDocumentNormalizerSettings.toWritableMap(): WritableMap = Arguments.createMap().apply {
     putArray("grayscaleTransformationModes", grayscaleTransformationModes.toWritableArray())
     putArray("grayscaleEnhancementModes", grayscaleEnhancementModes.toWritableArray())
@@ -62,6 +65,8 @@ fun SimplifiedDocumentNormalizerSettings.toWritableMap(): WritableMap = Argument
     putInt("contrast", contrast)
     putInt("maxThreadsInOneTask", maxThreadsInOneTask)
     putInt("scaleDownThreshold", scaleDownThreshold)
+    putInt("minQuadrilateralAreaRatio", minQuadrilateralAreaRatio)
+    putInt("expectedDocumentsCount", expectedDocumentsCount)
 }
 
 fun SimplifiedDocumentNormalizerSettings.updateFromReadableMap(newSettings: ReadableMap) {
@@ -77,4 +82,7 @@ fun SimplifiedDocumentNormalizerSettings.updateFromReadableMap(newSettings: Read
 
     grayscaleEnhancementModes = if (newSettings.hasKey("grayscaleEnhancementModes"))
         newSettings.getArray("grayscaleEnhancementModes")?.toIntArray() else grayscaleEnhancementModes
+
+    minQuadrilateralAreaRatio = if (newSettings.hasKey("minQuadrilateralAreaRatio")) newSettings.getInt("minQuadrilateralAreaRatio") else minQuadrilateralAreaRatio
+    expectedDocumentsCount = if (newSettings.hasKey("expectedDocumentsCount")) newSettings.getInt("expectedDocumentsCount") else expectedDocumentsCount
 }

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

@@ -1,4 +1,3 @@
-
 require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
@@ -10,13 +9,16 @@ Pod::Spec.new do |s|
   s.homepage     = package["homepage"]
   s.license      = package["license"]
   s.authors      = { package["author"]["name"] => package["author"]["email"] }
-  s.platforms    = { :ios => "11.0" }
-  s.source = { :http => "https://registry.npmjs.org/#{s.name}/-/#{s.name}-#{s.version}.tgz" }
+
+  s.platforms    = { :ios => "13.0" }
+  s.source       = { :http => "https://registry.npmjs.org/#{s.name}/-/#{s.name}-#{s.version}.tgz" }
+
   s.source_files = "ios/**/*.{h,hpp,c,cc,cpp,m,mm,swift}"
+  s.private_header_files = "ios/**/*.h"
   s.requires_arc = true
-  s.dependency "React"
-  s.dependency "DynamsoftCaptureVisionBundle", "= 2.6.1004"
-  s.dependency "DynamsoftBarcodeReaderBundle", "= 10.4.3002"
-  s.dependency "DynamsoftMRZScannerBundle", "= 2.0.1"
+
+  s.dependency "DynamsoftCaptureVisionBundle", ">= 3.0.5100", "< 4.0"
+
+ install_modules_dependencies(s)
 end
 

package/ios/CPP/DSImageData+HostObject.h

@@ -2,7 +2,7 @@
  * Copyright © Dynamsoft Corporation. All rights reserved.
  */
 
-#import <DynamsoftCore/DynamsoftCore.h>
+#import <DynamsoftCaptureVisionBundle/DSImageData.h>
 #include "ImageDataHostObject.hpp"
 
 NS_ASSUME_NONNULL_BEGIN

package/ios/CPP/RNDynamsoft+JSI.h

@@ -2,8 +2,8 @@
  * Copyright © Dynamsoft Corporation. All rights reserved.
  */
 
-#import <DynamsoftCaptureVisionRouter/DSCapturedResult.h>
-#import <DynamsoftCore/DSQuadrilateral.h>
+#import <DynamsoftCaptureVisionBundle/DSCapturedResult.h>
+#import <DynamsoftCaptureVisionBundle/DSQuadrilateral.h>
 #import <jsi/jsi.h>
 
 NS_ASSUME_NONNULL_BEGIN

package/ios/CPP/RNDynamsoft+JSI.mm

@@ -6,12 +6,7 @@
 #import "RNDynamsoft+Json.h"
 #import "DSImageData+HostObject.h"
 #import "YeetJSIUtils.h"
-#import <DynamsoftCore/DynamsoftCore.h>
-#import <DynamsoftCaptureVisionRouter/DynamsoftCaptureVisionRouter.h>
-#import <DynamsoftBarcodeReader/DynamsoftBarcodeReader.h>
-#import <DynamsoftLabelRecognizer/DynamsoftLabelRecognizer.h>
-#import <DynamsoftDocumentNormalizer/DynamsoftDocumentNormalizer.h>
-#import <DynamsoftCodeParser/DynamsoftCodeParser.h>
+#import <DynamsoftCaptureVisionBundle/DynamsoftCaptureVisionBundle.h>
 
 NSArray<NSNumber *> *CGAffineTransformToArray(CGAffineTransform transform) {
     return @[@(transform.a), @(transform.b), @(transform.c), @(transform.d), @(transform.tx), @(transform.ty)];
@@ -67,17 +62,30 @@ NSArray<NSNumber *> *CGAffineTransformToArray(CGAffineTransform transform) {
                 obj.setProperty(runtime, "confidenceAsDocumentBoundary",convertNSNumberToJSINumber(runtime, @(item.confidenceAsDocumentBoundary)));
             }
             break;
-        case DSCapturedResultItemTypeNormalizedImage:
+        case DSCapturedResultItemTypeDeskewedImage:
             {
-                DSNormalizedImageResultItem *item = (DSNormalizedImageResultItem *)self;
+                DSDeskewedImageResultItem *item = (DSDeskewedImageResultItem *)self;
                 if (item.imageData) {
                     ImageDataHostObject hostObject = [item.imageData hostObject];
                     Object object = Object::createFromHostObject(runtime, std::make_shared<ImageDataHostObject>(hostObject));
                     obj.setProperty(runtime, "imageData", object);
                 }
-                obj.setProperty(runtime, "location", convertNSDictionaryToJSIObject(runtime, [item.location toJson]));
+                obj.setProperty(runtime, "sourceDeskewQuad", convertNSDictionaryToJSIObject(runtime, [item.sourceDeskewQuad toJson]));
+                obj.setProperty(runtime, "crossVerificationStatus", convertNSNumberToJSINumber(runtime, @(item.crossVerificationStatus)));
+                obj.setProperty(runtime, "originalToLocalMatrix", convertNSArrayToJSIArray(runtime, CGAffineTransformToArray(item.originalToLocalMatrix)));
+            }
+            break;
+        case DSCapturedResultItemTypeEnhancedImage:
+        {
+            DSEnhancedImageResultItem *item = (DSEnhancedImageResultItem *)self;
+            if (item.imageData) {
+                ImageDataHostObject hostObject = [item.imageData hostObject];
+                Object object = Object::createFromHostObject(runtime, std::make_shared<ImageDataHostObject>(hostObject));
+                obj.setProperty(runtime, "imageData", object);
             }
+            obj.setProperty(runtime, "originalToLocalMatrix", convertNSArrayToJSIArray(runtime, CGAffineTransformToArray(item.originalToLocalMatrix)));
             break;
+        }
         case DSCapturedResultItemTypeParsedResult:
             {
                 DSParsedResultItem *item = (DSParsedResultItem *)self;
@@ -88,7 +96,7 @@ NSArray<NSNumber *> *CGAffineTransformToArray(CGAffineTransform transform) {
                                                    @"mappingStatus":@([item getFieldMappingStatus:key]),
                                                    @"validationStatus":@([item getFieldValidationStatus:key]) } forKey:key];
                 }
-                obj.setProperty(runtime, "", convertNSDictionaryToJSIObject(runtime, [mutableDictionary copy]));
+                obj.setProperty(runtime, "parsedFields", convertNSDictionaryToJSIObject(runtime, [mutableDictionary copy]));
                 obj.setProperty(runtime, "jsonString", convertNSStringToJSIString(runtime, item.jsonString));
                 obj.setProperty(runtime, "codeType", convertNSStringToJSIString(runtime, item.codeType));
             }

package/ios/CPP/RNDynamsoft+Json.h

@@ -2,12 +2,7 @@
  * Copyright © Dynamsoft Corporation. All rights reserved.
  */
 
-#import <DynamsoftCore/DynamsoftCore.h>
-#import <DynamsoftCaptureVisionRouter/DynamsoftCaptureVisionRouter.h>
-#import <DynamsoftBarcodeReader/DynamsoftBarcodeReader.h>
-#import <DynamsoftLabelRecognizer/DynamsoftLabelRecognizer.h>
-#import <DynamsoftDocumentNormalizer/DynamsoftDocumentNormalizer.h>
-#import <DynamsoftCodeParser/DynamsoftCodeParser.h>
+#import <DynamsoftCaptureVisionBundle/DynamsoftCaptureVisionBundle.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -75,13 +70,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-@interface DSDetectedQuadsResult (Json)
-
-- (NSObject *)toJson;
-
-@end
-
-@interface DSNormalizedImagesResult (Json)
+@interface DSProcessedDocumentResult (Json)
 
 - (NSObject *)toJson;