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

package/LICENSE

@@ -1,5 +1,5 @@
 License Notice
  
-The source code of the Dynamsoft Capture Vision (DCV) React Native Edition published here is released under the Apache 2.0 license: http://www.apache.org/licenses/LICENSE-2.0. Dynamsoft Barcode Reader (DBR) and Dynamsoft Camera Enhancer (DCE) SDK upon which Dynamsoft Capture Vision (DCV) depends are provided under a commercial license from https://www.dynamsoft.com/company/license-agreement/.  This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- 
+The source code of the Dynamsoft Capture Vision (DCV) React Native Edition published here is released under the Apache 2.0 license: http://www.apache.org/licenses/LICENSE-2.0. Dynamsoft Barcode Reader (DBR), Dynamsoft Label Recognizer (DLR), Dynamsoft Document Normalizer (DDN), Dynamsoft Code Parser (DCP) and Dynamsoft Camera Enhancer (DCE) SDK upon which Dynamsoft Capture Vision (DCV) React Native Edition depends are provided under a commercial license from https://www.dynamsoft.com/company/license-agreement/.  This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
 Copyright © 2003–2025 Dynamsoft. All Rights Reserved.

package/README.md

@@ -32,7 +32,7 @@ DCV enables you to develop highly customizable applications for barcode reading,
 
 ### iOS
 
-- Supported OS: iOS 11+ (iOS 13+ recommended).
+- Supported OS: iOS 13+.
 - Supported ABI: arm64 and x86_64.
 - Development Environment: Xcode 13+ (Xcode 14.1+ recommended).
 
@@ -41,20 +41,18 @@ DCV enables you to develop highly customizable applications for barcode reading,
 - Node: 18 or higher
 
 ## User Guide
-- [Foundation Barcode Reader Integration Guide](https://github.com/Dynamsoft/capture-vision-react-native-samples/blob/main/foundation-barcode-reader-guide.md)
-- [Ready-to-use Barcode Scanner Integration Guide](https://github.com/Dynamsoft/capture-vision-react-native-samples/blob/main/ready-to-use-barcode-scanner-guide.md)
-- [Document Scanner Integration Guide](https://github.com/Dynamsoft/capture-vision-react-native-samples/blob/main/document-scanner-guide.md)
-- [MRZ Scanner Integration Guide](https://github.com/Dynamsoft/capture-vision-react-native-samples/blob/main/mrz-scanner-guide.md)
-- [Divers' License Scanner Integration Guide](https://github.com/Dynamsoft/capture-vision-react-native-samples/blob/main/drivers-license-scanner-guide.md)
+
+- [MRZ Scanner Integration Guide](https://github.com/Dynamsoft/capture-vision-react-native-samples/blob/main/guide-scan-mrz.md)
+- [Document Scanner Integration Guide](https://github.com/Dynamsoft/capture-vision-react-native-samples/blob/main/guide-scan-document.md)
+- [VIN Scanner Integration Guide](https://github.com/Dynamsoft/capture-vision-react-native-samples/blob/main/guide-scan-vin.md)
 
 ## Samples
 
 You can view all the DCV React Native samples via the following links:
 
-- [ScanBarcodes](https://github.com/Dynamsoft/capture-vision-react-native-samples/tree/main/ScanBarcodes)
-- [DetectAndDeskewDocument](https://github.com/Dynamsoft/capture-vision-react-native-samples/tree/main/DetectAndDeskewDocument)
 - [ScanMRZ](https://github.com/Dynamsoft/capture-vision-react-native-samples/tree/main/ScanMRZ)
-- [ReadDriverLicense](https://github.com/Dynamsoft/capture-vision-react-native-samples/tree/main/ReadDriverLicense)
+- [ScanDocument](https://github.com/Dynamsoft/capture-vision-react-native-samples/tree/main/ScanDocument)
+- [ScanVIN](https://github.com/Dynamsoft/capture-vision-react-native-samples/tree/main/ScanVIN)
 
 ## License
 

package/android/build.gradle

@@ -8,10 +8,7 @@ def safeExtGet(prop, fallback) {
 
 apply plugin: 'com.android.library'
 apply plugin: "kotlin-android"
-def isNewArchitectureEnabled = rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
-if (isNewArchitectureEnabled) {
-    apply plugin: "com.facebook.react"
-}
+
 buildscript {
     def kotlinVersion = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["kotlinVersion"]
     repositories {
@@ -24,32 +21,20 @@ buildscript {
     }
 }
 
-def resolveBuildType() {
-    Gradle gradle = getGradle()
-    String tskReqStr = gradle.getStartParameter().getTaskRequests()['args'].toString()
-
-    return tskReqStr.contains('Release') ? 'release' : 'debug'
-}
-
-def supportsNamespace() {
+static def supportsNamespace() {
     def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
     def major = parsed[0].toInteger()
     def minor = parsed[1].toInteger()
-
-    // Namespace support was added in 7.3.0
     return (major == 7 && minor >= 3) || major >= 8
 }
 
 android {
     if (supportsNamespace()) {
         namespace "com.dynamsoft.reactnativelib"
-    }
-    sourceSets {
-        main {
-            manifest.srcFile supportsNamespace()?
-                    "src/main/withoutNamespace/AndroidManifest.xml":
-                    "src/main/withNamespace/AndroidManifest.xml"
-            java.srcDirs += isNewArchitectureEnabled? ["src/newarch"] : ["src/oldarch"]
+        sourceSets {
+            main {
+                manifest.srcFile "src/main/AndroidManifest_noPackage.xml"
+            }
         }
     }
 
@@ -59,17 +44,27 @@ android {
         targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
         versionCode 1
         versionName "1.0"
-//        externalNativeBuild {
-//            cmake {
-//                cppFlags "-O2 -frtti -fexceptions -Wall -Wno-unused-variable -fstack-protector-all"
-//                arguments "-DANDROID_STL=c++_shared"
-//            }
-//        }
-        buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString())
     }
     lintOptions {
         abortOnError false
     }
+
+    buildTypes {
+        release {
+            sourceSets {
+                main {
+                    jniLibs.srcDirs = ["src/main/jniLibs/release"]
+                }
+            }
+        }
+        debug {
+            sourceSets {
+                main {
+                    jniLibs.srcDirs = ["src/main/jniLibs/debug"]
+                }
+            }
+        }
+    }
 }
 
 repositories {
@@ -91,8 +86,13 @@ rootProject.allprojects {
             url "https://download2.dynamsoft.com/maven/aar"
         }
     }
+
+    configurations.all {
+        resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+    }
 }
 
+
 dependencies {
     def kotlinVersion = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["kotlinVersion"]
 
@@ -105,18 +105,5 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
 
-    implementation("com.dynamsoft:dynamsoftcapturevisionbundle:2.6.1003") {
-        exclude(group: "com.dynamsoft", module: "dynamsoftcameraenhancer")
-    }
-
-    implementation "com.dynamsoft:mrzscannerbundle:2.0.1@aar"
-
-    implementation "com.dynamsoft:dynamsoftbarcodereaderbundle:10.4.3003-beta1@aar"
-    implementation "com.dynamsoft:dynamsoftcameraenhancer:4.2.23-beta1@aar"
-
-    def camerax_version = '1.4.0'
-    api "androidx.camera:camera-core:$camerax_version"
-    api "androidx.camera:camera-camera2:$camerax_version"
-    api "androidx.camera:camera-lifecycle:$camerax_version"
-    api "androidx.camera:camera-view:$camerax_version"
+    implementation "com.dynamsoft:capturevisionbundle:3.0.3100"
 }

package/android/src/{oldarch → main/java}/com/dynamsoft/reactnativelib/CVRModule.kt

@@ -81,13 +81,13 @@ class CVRModule(reactApplicationContext: ReactApplicationContext) : ReactContext
     }
 
     @ReactMethod
-    fun outputSettings(templateName: String, promise: Promise) {
-        impl.outputSettings(templateName, promise)
+    fun outputSettings(templateName: String, includeDefaultValues: Boolean, promise: Promise) {
+        impl.outputSettings(templateName, includeDefaultValues, promise)
     }
 
     @ReactMethod
-    fun outputSettingsToFile(file: String, templateName: String, promise: Promise) {
-        impl.outputSettingsToFile(file, templateName, promise)
+    fun outputSettingsToFile(file: String, templateName: String, includeDefaultValues: Boolean, promise: Promise) {
+        impl.outputSettingsToFile(file, templateName, includeDefaultValues, promise)
     }
 
     @ReactMethod

package/android/src/main/java/com/dynamsoft/reactnativelib/ReactNativeDcvPackage.kt

@@ -1,23 +1,12 @@
 // ReactNativeDcvPackage.java
 package com.dynamsoft.reactnativelib
 
-import com.dynamsoft.reactnativelib.core.ImageSourceAdapterModuleImpl
-import com.dynamsoft.reactnativelib.cvr.CaptureVisionRouterModuleImpl
-import com.dynamsoft.reactnativelib.dce.CameraEnhancerModuleImpl
-import com.dynamsoft.reactnativelib.dce.ImageEditorViewModuleImpl
-import com.dynamsoft.reactnativelib.license.LicenseModuleImpl
-import com.dynamsoft.reactnativelib.rtu.BarcodeScannerModuleImpl
-import com.dynamsoft.reactnativelib.rtu.MRZScannerModuleImpl
-import com.dynamsoft.reactnativelib.utility.ImageManagerModuleImpl
-import com.dynamsoft.reactnativelib.utility.MultiCrossFilterModuleImpl
-import com.facebook.react.TurboReactPackage
+import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.module.model.ReactModuleInfo
-import com.facebook.react.module.model.ReactModuleInfoProvider
 import com.facebook.react.uimanager.ViewManager
 
-class ReactNativeDcvPackage : TurboReactPackage() {
+class ReactNativeDcvPackage : ReactPackage {
     companion object {
         init {
             System.loadLibrary("rn_dys")
@@ -28,77 +17,16 @@ class ReactNativeDcvPackage : TurboReactPackage() {
         return listOf(CameraViewManager(), ImageEditorViewManager())
     }
 
-    override fun getModule(name: String, context: ReactApplicationContext): NativeModule? {
-        return when (name) {
-            CaptureVisionRouterModuleImpl.NAME -> CVRModule(context)
-            CameraEnhancerModuleImpl.NAME -> DCEModule(context)
-            ImageSourceAdapterModuleImpl.NAME -> ISAModule(context)
-            LicenseModuleImpl.NAME -> LicenseModule(context)
-            MultiCrossFilterModuleImpl.NAME -> MultiCrossFilterModule(context)
-            VersionsModule.NAME -> VersionsModule(context)
-            ImageEditorViewModuleImpl.NAME -> ImageEditorViewModule(context)
-            ImageManagerModuleImpl.NAME -> ImageManagerModule(context)
-            BarcodeScannerModuleImpl.NAME -> BarcodeScannerModule(context)
-            MRZScannerModuleImpl.NAME -> MRZScannerModule(context)
-            else -> null
-        }
-    }
-
-    override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
-        val isEnableNewArch = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
-        return ReactModuleInfoProvider {
-            mapOf(
-                CaptureVisionRouterModuleImpl.NAME to ReactModuleInfo(
-                    CaptureVisionRouterModuleImpl.NAME,
-                    CaptureVisionRouterModuleImpl.NAME,
-                    false, false, true, false, isEnableNewArch
-                ),
-                CameraEnhancerModuleImpl.NAME to ReactModuleInfo(
-                    CameraEnhancerModuleImpl.NAME,
-                    CameraEnhancerModuleImpl.NAME,
-                    false, false, true, false, isEnableNewArch
-                ),
-                ImageSourceAdapterModuleImpl.NAME to ReactModuleInfo(
-                    ImageSourceAdapterModuleImpl.NAME,
-                    ImageSourceAdapterModuleImpl.NAME,
-                    false, false, true, false, isEnableNewArch
-                ),
-                LicenseModuleImpl.NAME to ReactModuleInfo(
-                    LicenseModuleImpl.NAME,
-                    LicenseModuleImpl.NAME,
-                    false, false, true, false, isEnableNewArch
-                ),
-                MultiCrossFilterModuleImpl.NAME to ReactModuleInfo(
-                    MultiCrossFilterModuleImpl.NAME,
-                    MultiCrossFilterModuleImpl.NAME,
-                    false, false, true, false, isEnableNewArch
-                ),
-                VersionsModule.NAME to ReactModuleInfo(
-                    VersionsModule.NAME,
-                    VersionsModule.NAME,
-                    false, false, true, false, isEnableNewArch
-                ),
-                ImageEditorViewModuleImpl.NAME to ReactModuleInfo(
-                    ImageEditorViewModuleImpl.NAME,
-                    ImageEditorViewModuleImpl.NAME,
-                    false, false, true, false, isEnableNewArch
-                ),
-                ImageManagerModuleImpl.NAME to ReactModuleInfo(
-                    ImageManagerModuleImpl.NAME,
-                    ImageManagerModuleImpl.NAME,
-                    false, false, true, false, isEnableNewArch
-                ),
-                BarcodeScannerModuleImpl.NAME to ReactModuleInfo(
-                    BarcodeScannerModuleImpl.NAME,
-                    BarcodeScannerModuleImpl.NAME,
-                    false, false, true, false, isEnableNewArch
-                ),
-                MRZScannerModuleImpl.NAME to ReactModuleInfo(
-                    MRZScannerModuleImpl.NAME,
-                    MRZScannerModuleImpl.NAME,
-                    false, false, true, false, isEnableNewArch
-                )
-            )
-        }
+    override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
+        return mutableListOf(
+            CVRModule(reactContext),
+            DCEModule(reactContext),
+            ISAModule(reactContext),
+            LicenseModule(reactContext),
+            MultiCrossFilterModule(reactContext),
+            VersionsModule(reactContext),
+            ImageEditorViewModule(reactContext),
+            ImageManagerModule(reactContext),
+        )
     }
 }

package/android/src/{oldarch → main/java}/com/dynamsoft/reactnativelib/VersionsModule.kt

@@ -5,7 +5,7 @@ import com.dynamsoft.cvr.CaptureVisionRouterModule
 import com.dynamsoft.dbr.BarcodeReaderModule
 import com.dynamsoft.dce.CameraEnhancerModule
 import com.dynamsoft.dcp.CodeParserModule
-import com.dynamsoft.dcp.dedicator.CodePaserDedicatorModule
+import com.dynamsoft.dcp.dedicator.CodeParserDedicatorModule
 import com.dynamsoft.ddn.DocumentNormalizerModule
 import com.dynamsoft.dip.ImageProcessingModule
 import com.dynamsoft.dlr.LabelRecognizerModule
@@ -34,7 +34,7 @@ class VersionsModule(reactContext: ReactApplicationContext) : ReactContextBaseJa
             "dnn" to NeuralNetworkModule.getVersion(),
             "utility" to UtilityModule.getVersion(),
             "dcp" to CodeParserModule.getVersion(),
-            "dcpd" to CodePaserDedicatorModule.getVersion(),
+            "dcpd" to CodeParserDedicatorModule.getVersion(),
             "dip" to ImageProcessingModule.getVersion()
         )
     )

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,9 @@ 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) {
+                    emitResultAndWaitForResponse(onProcessedDocumentResultReceived_Event, result.toWritableMap())
                 }
             },
             onRecognizedTextLinesReceived_Event to object : CapturedResultReceiver {
@@ -136,7 +134,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 +212,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 +222,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 +256,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

@@ -160,12 +160,12 @@ class CameraEnhancerModuleImpl(private val reactContext: ReactApplicationContext
 
     @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? {
+        try {
+            return imageProcessor.cropImage(imageData, quad)
+        } catch (e: UtilityException) {
+            return 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
         )!!
     }