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

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

@@ -1,8 +1,8 @@
 package com.dynamsoft.reactnativelib
 
-import android.util.Log
+import com.dynamsoft.cvr.CaptureVisionRouter
+import com.dynamsoft.cvr.CaptureVisionRouterException
 import com.dynamsoft.reactnativelib.cvr.CaptureVisionRouterModuleImpl
-import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
@@ -110,5 +110,20 @@ class CVRModule(reactApplicationContext: ReactApplicationContext) : ReactContext
         impl.removeListener(type)
     }
 
+    @ReactMethod
+    fun switchCapturingTemplate(template: String, promise: Promise) {
+        impl.switchCapturingTemplate(template, promise)
+    }
+
+    @ReactMethod
+    fun clearDLModelBuffers() {
+        impl.clearDLModelBuffers()
+    }
+
+    @ReactMethod
+    fun setGlobalIntraOpNumThreads(intraOpNumThreads: Int) {
+        impl.setGlobalIntraOpNumThreads(intraOpNumThreads)
+    }
+
 
 }

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

@@ -1,7 +1,9 @@
 package com.dynamsoft.reactnativelib
 
 import com.dynamsoft.dce.CameraView
-import com.dynamsoft.reactnative.dce.CameraViewManagerImpl
+import com.dynamsoft.reactnativelib.basicutils.setCameraToggleButtonState
+import com.dynamsoft.reactnativelib.basicutils.toCameraToggleButtonState
+import com.dynamsoft.reactnativelib.dce.CameraViewManagerImpl
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.uimanager.SimpleViewManager
@@ -47,4 +49,14 @@ class CameraViewManager : SimpleViewManager<CameraView>() {
         view?.let { impl.setTorchButtonVisible(it, value) }
     }
 
+    @ReactProp(name = "cameraToggleButton")
+    fun setCameraToggleButton(view: CameraView, cameraToggleButton: ReadableMap) {
+        view.setCameraToggleButtonState(cameraToggleButton.toCameraToggleButtonState())
+    }
+
+    @ReactProp(name = "cameraToggleButtonVisible")
+    fun setCameraToggleButtonVisible(view: CameraView, isVisible: Boolean) {
+        view.cameraToggleButtonVisible = isVisible
+    }
+
 }

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

@@ -1,7 +1,7 @@
 package com.dynamsoft.reactnativelib
 
 import com.dynamsoft.dce.ImageEditorView
-import com.dynamsoft.reactnative.dce.ImageEditorViewManagerImpl
+import com.dynamsoft.reactnativelib.dce.ImageEditorViewManagerImpl
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
 

package/android/src/main/java/com/dynamsoft/reactnativelib/{utils → basicutils}/Basic.kt

@@ -1,4 +1,4 @@
-package com.dynamsoft.reactnativelib.utils
+package com.dynamsoft.reactnativelib.basicutils
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReadableArray

package/android/src/main/java/com/dynamsoft/reactnativelib/{utils → basicutils}/ForCore.kt

@@ -1,10 +1,9 @@
-package com.dynamsoft.reactnative.basicutils
+package com.dynamsoft.reactnativelib.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

package/android/src/main/java/com/dynamsoft/reactnativelib/{utils → basicutils}/ForCvr.kt

@@ -1,4 +1,4 @@
-package com.dynamsoft.reactnativelib.utils
+package com.dynamsoft.reactnativelib.basicutils
 
 import android.util.Log
 import com.dynamsoft.core.basic_structures.CapturedResultItem
@@ -13,10 +13,6 @@ import com.dynamsoft.ddn.DeskewedImageResultItem
 import com.dynamsoft.ddn.DetectedQuadResultItem
 import com.dynamsoft.ddn.EnhancedImageResultItem
 import com.dynamsoft.dlr.TextLineResultItem
-import com.dynamsoft.reactnative.basicutils.toQuad
-import com.dynamsoft.reactnative.basicutils.toWritableArray
-import com.dynamsoft.reactnative.basicutils.toWritableMap
-import com.dynamsoft.reactnative.basicutils.updateFromReadableMap
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableArray

package/android/src/main/java/com/dynamsoft/reactnativelib/{utils → basicutils}/ForDBR.kt

@@ -1,12 +1,16 @@
-package com.dynamsoft.reactnative.basicutils
+package com.dynamsoft.reactnativelib.basicutils
 
 
 import com.dynamsoft.core.basic_structures.CapturedResultItem
+import com.dynamsoft.dbr.AztecDetails
+import com.dynamsoft.dbr.BarcodeDetails
 import com.dynamsoft.dbr.BarcodeResultItem
+import com.dynamsoft.dbr.DataMatrixDetails
 import com.dynamsoft.dbr.DecodedBarcodesResult
+import com.dynamsoft.dbr.OneDCodeDetails
+import com.dynamsoft.dbr.PDF417Details
+import com.dynamsoft.dbr.QRCodeDetails
 import com.dynamsoft.dbr.SimplifiedBarcodeReaderSettings
-import com.dynamsoft.reactnativelib.utils.toIntArray
-import com.dynamsoft.reactnativelib.utils.toWritableArray
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableArray
@@ -25,6 +29,14 @@ fun BarcodeResultItem.toWritableMap(): WritableMap = Arguments.createMap().apply
     putInt("moduleSize", moduleSize)
     putBoolean("isMirrored", isMirrored)
     putBoolean("isDPM", isDPM)
+    when (details) {
+        is QRCodeDetails -> putMap("qrCodeDetails", details.toWritableMap())
+        is AztecDetails -> putMap("aztecDetails", details.toWritableMap())
+        is OneDCodeDetails -> putMap("oneDCodeDetails", details.toWritableMap())
+        is DataMatrixDetails -> putMap("dataMatrixDetails", details.toWritableMap())
+        is PDF417Details -> putMap("pdf417Details", details.toWritableMap())
+        else -> Unit
+    }
 }
 
 fun Array<out BarcodeResultItem>.toWritableArray(): WritableArray = Arguments.createArray().apply {
@@ -63,9 +75,68 @@ fun SimplifiedBarcodeReaderSettings.updateFromReadableMap(newSettings: ReadableM
     if (newSettings.hasKey("minBarcodeTextLength")) minBarcodeTextLength = newSettings.getInt("minBarcodeTextLength")
     if (newSettings.hasKey("barcodeTextRegExPattern"))
         barcodeTextRegExPattern = newSettings.getString("barcodeTextRegExPattern")
+    if (newSettings.hasKey("localizationModes"))
+        localizationModes = newSettings.getArray("localizationModes")?.toIntArray()
+    if (newSettings.hasKey("deblurModes"))
+        deblurModes = newSettings.getArray("deblurModes")?.toIntArray()
     if (newSettings.hasKey("grayscaleTransformationModes"))
         grayscaleTransformationModes = newSettings.getArray("grayscaleTransformationModes")?.toIntArray()
     if (newSettings.hasKey("grayscaleEnhancementModes"))
         grayscaleEnhancementModes = newSettings.getArray("grayscaleEnhancementModes")?.toIntArray()
     if (newSettings.hasKey("scaleDownThreshold")) scaleDownThreshold = newSettings.getInt("scaleDownThreshold")
+    maxThreadsInOneTask = if (newSettings.hasKey("maxThreadsInOneTask")) newSettings.getInt("maxThreadsInOneTask") else maxThreadsInOneTask
+}
+
+fun BarcodeDetails.toWritableMap(): WritableMap = Arguments.createMap().apply {
+    when (this) {
+        is QRCodeDetails -> {
+            putInt("columns", columns)
+            putInt("errorCorrectionLevel", errorCorrectionLevel)
+            putInt("version", version)
+            putInt("model", model)
+            putInt("mode", mode)
+            putInt("page", page)
+            putInt("totalPage", totalPage)
+            putInt("parityData", parityData.toInt())
+            putInt("dataMaskPattern", dataMaskPattern)
+            putArray("codewords", Arguments.fromArray(codewords))
+        }
+
+        is AztecDetails -> {
+            putInt("rows", rows)
+            putInt("columns", columns)
+            putInt("layerNumber", layerNumber)
+        }
+
+        is OneDCodeDetails -> {
+            putArray("startCharsBytes", Arguments.fromArray(startCharsBytes))
+            putArray("stopCharsBytes", Arguments.fromArray(stopCharsBytes))
+            putArray("checkDigitBytes", Arguments.fromArray(checkDigitBytes))
+            putDouble("startPatternRange_lower", startPatternRange.lower.toDouble())
+            putDouble("middlePatternRange_lower", middlePatternRange.lower.toDouble())
+            putDouble("endPatternRange_lower", endPatternRange.lower.toDouble())
+            putDouble("startPatternRange_upper", startPatternRange.upper.toDouble())
+            putDouble("middlePatternRange_upper", middlePatternRange.upper.toDouble())
+            putDouble("endPatternRange_upper", endPatternRange.upper.toDouble())
+        }
+
+        is DataMatrixDetails -> {
+            putInt("rows", rows)
+            putInt("columns", columns)
+            putInt("dataRegionRows", dataRegionRows)
+            putInt("dataRegionColumns", dataRegionColumns)
+            putInt("dataRegionNumber", dataRegionNumber)
+        }
+
+        is PDF417Details -> {
+            putInt("rows", rows)
+            putInt("columns", columns)
+            putInt("errorCorrectionLevel", errorCorrectionLevel)
+            putBoolean("hasLeftRowIndicator", hasLeftRowIndicator())
+            putBoolean("hasRightRowIndicator", hasRightRowIndicator())
+            putArray("codewords", Arguments.fromArray(codewords))
+        }
+
+        else -> Unit
+    }
 }

package/android/src/main/java/com/dynamsoft/reactnativelib/{utils → basicutils}/ForDCE.kt

@@ -1,4 +1,4 @@
-package com.dynamsoft.reactnativelib.utils
+package com.dynamsoft.reactnativelib.basicutils
 
 import android.content.Context
 import android.graphics.Point
@@ -7,7 +7,6 @@ import android.graphics.drawable.Drawable
 import androidx.appcompat.content.res.AppCompatResources
 import com.dynamsoft.core.basic_structures.DSRect
 import com.dynamsoft.dce.CameraView
-import com.dynamsoft.reactnative.basicutils.base64ToDrawable
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.ReadableType
@@ -44,27 +43,44 @@ fun DSRect.toWritableMap(): WritableMap = Arguments.createMap().apply {
     putBoolean("measuredInPercentage", this@toWritableMap.measuredInPercentage)
 }
 
-fun ReadableMap.toTorchButtonState(): TorchButtonState {
+fun ReadableMap.toTorchButtonState(): CameraViewButtonState {
     val rect = if (hasKey("location")) getMap("location")!!.toRect() else Rect(25,100,70,145)
-    val visible = if (hasKey("visible")) getBoolean("visible") else false
+    val visible = if (hasKey("visible")) getBoolean("visible") else null
     val torchOnImageBase64 = if (hasKey("torchOnImageBase64")) getString("torchOnImageBase64") else null
     val torchOffImageBase64 = if (hasKey("torchOffImageBase64")) getString("torchOffImageBase64") else null
-    return TorchButtonState(rect, visible, torchOnImageBase64, torchOffImageBase64)
+    return CameraViewButtonState(rect, visible, torchOnImageBase64, torchOffImageBase64)
+}
+
+fun ReadableMap.toCameraToggleButtonState(): CameraViewButtonState {
+    val rect = if (hasKey("location")) getMap("location")!!.toRect() else Rect(25,100,70,145)
+    val visible = if (hasKey("visible")) getBoolean("visible") else false
+    val cameraImageBase64 = if (hasKey("cameraToggleImageBase64")) getString("cameraToggleImageBase64") else null
+    return CameraViewButtonState(rect, visible, cameraBase64 = cameraImageBase64)
 }
 
-fun CameraView.setTorchButtonState(torchButtonState: TorchButtonState) {
+fun CameraView.setTorchButtonState(torchButtonState: CameraViewButtonState) {
     setTorchButton(
         torchButtonState.getLeftTopPoint(), torchButtonState.getWidth(), torchButtonState.getHeight(),
         torchButtonState.getTouchOnDrawable(context), torchButtonState.getTouchOffDrawable(context)
     )
-    torchButtonVisible = torchButtonState.visible
+    torchButtonState.visible?.apply {
+        torchButtonVisible = this
+    }
 }
 
-class TorchButtonState(
+fun CameraView.setCameraToggleButtonState(cameraToggleButtonState: CameraViewButtonState) {
+    setCameraToggleButton(
+        cameraToggleButtonState.getLeftTopPoint(), cameraToggleButtonState.getWidth(), cameraToggleButtonState.getHeight(),
+        cameraToggleButtonState.getCameraToggleDrawable(context)
+    )
+}
+
+class CameraViewButtonState(
     val location: Rect,
-    val visible: Boolean,
+    val visible: Boolean? = null,
     val touchOnBase64: String? = null,
-    val touchOffBase64: String? = null
+    val touchOffBase64: String? = null,
+    val cameraBase64: String? = null,
 ) {
     fun getLeftTopPoint() = Point(location.left, location.top)
     fun getWidth() = location.width()
@@ -73,18 +89,22 @@ class TorchButtonState(
     fun getTouchOnDrawable(context: Context): Drawable {
         return base64ToDrawable(touchOnBase64, context.resources!!) ?: AppCompatResources.getDrawable(
             context,
-            com.dynamsoft.R.drawable.flash_on
+            com.dynamsoft.R.drawable.icon_flash_on
         )!!
     }
 
     fun getTouchOffDrawable(context: Context): Drawable {
         return base64ToDrawable(touchOffBase64, context.resources!!) ?: AppCompatResources.getDrawable(
             context,
-            com.dynamsoft.R.drawable.flash_off
+            com.dynamsoft.R.drawable.icon_flash_off
         )!!
     }
 
+    fun getCameraToggleDrawable(context: Context): Drawable {
+        return base64ToDrawable(cameraBase64, context.resources!!) ?: AppCompatResources.getDrawable(context, com.dynamsoft.R.drawable.icon_turn_camera)!!
+    }
+
     override fun toString(): String {
-        return "TorchButtonState(location=$location, visible=$visible, touchOnBase64=$touchOnBase64, touchOffBase64=$touchOffBase64)"
+        return "CameraViewButtonState(location=$location, visible=$visible, touchOnBase64=$touchOnBase64, touchOffBase64=$touchOffBase64)"
     }
 }

package/android/src/main/java/com/dynamsoft/reactnativelib/{utils → basicutils}/ForDCP.kt

@@ -1,4 +1,4 @@
-package com.dynamsoft.reactnative.basicutils
+package com.dynamsoft.reactnativelib.basicutils
 
 import com.dynamsoft.core.basic_structures.CapturedResultItem
 import com.dynamsoft.dcp.ParsedResult

package/android/src/main/java/com/dynamsoft/reactnativelib/{utils → basicutils}/ForDDN.kt

@@ -1,4 +1,4 @@
-package com.dynamsoft.reactnative.basicutils
+package com.dynamsoft.reactnativelib.basicutils
 
 import com.dynamsoft.core.basic_structures.CapturedResultItem
 import com.dynamsoft.ddn.DeskewedImageResultItem
@@ -6,8 +6,6 @@ import com.dynamsoft.ddn.DetectedQuadResultItem
 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
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableArray

package/android/src/main/java/com/dynamsoft/reactnativelib/{utils → basicutils}/ForDLR.kt

@@ -1,12 +1,10 @@
-package com.dynamsoft.reactnative.basicutils
+package com.dynamsoft.reactnativelib.basicutils
 
 import com.dynamsoft.core.basic_structures.CapturedResultItem
 import com.dynamsoft.dlr.CharacterResult
 import com.dynamsoft.dlr.RecognizedTextLinesResult
 import com.dynamsoft.dlr.SimplifiedLabelRecognizerSettings
 import com.dynamsoft.dlr.TextLineResultItem
-import com.dynamsoft.reactnativelib.utils.toIntArray
-import com.dynamsoft.reactnativelib.utils.toWritableArray
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableArray
@@ -23,6 +21,7 @@ fun CharacterResult.toWritableMap() : WritableMap = Arguments.createMap().apply
     putInt("characterHConfidence",characterHConfidence)
     putInt("characterMConfidence",characterMConfidence)
     putInt("characterLConfidence",characterLConfidence)
+    putMap("location", location.toWritableMap())
 }
 
 fun TextLineResultItem.toWritableMap(): WritableMap = Arguments.createMap().apply {
@@ -30,6 +29,7 @@ fun TextLineResultItem.toWritableMap(): WritableMap = Arguments.createMap().appl
     putMap("location", location.toWritableMap())
     putArray("characterResults", characterResults.toWitableArray())
     putString("text", text)
+    putString("rawText", rawText)
     putString("specificationName", specificationName)
     putInt("confidence", confidence)
 }
@@ -52,6 +52,7 @@ fun SimplifiedLabelRecognizerSettings.toWritableMap(): WritableMap = Arguments.c
     putString("characterModelName", characterModelName)
     putString("lineStringRegExPattern", lineStringRegExPattern)
     putInt("scaleDownThreshold", scaleDownThreshold)
+    putInt("maxThreadsInOneTask", maxThreadsInOneTask)
 }
 
 fun SimplifiedLabelRecognizerSettings.updateFromReadableMap(newSettings: ReadableMap) {
@@ -66,4 +67,6 @@ fun SimplifiedLabelRecognizerSettings.updateFromReadableMap(newSettings: Readabl
 
     grayscaleEnhancementModes = if (newSettings.hasKey("grayscaleEnhancementModes"))
         newSettings.getArray("grayscaleEnhancementModes")?.toIntArray() else grayscaleEnhancementModes
+
+    maxThreadsInOneTask = if (newSettings.hasKey("maxThreadsInOneTask")) newSettings.getInt("maxThreadsInOneTask") else maxThreadsInOneTask
 }

package/android/src/main/java/com/dynamsoft/reactnativelib/{utils → basicutils}/ImageUtil.kt

@@ -1,4 +1,4 @@
-package com.dynamsoft.reactnative.basicutils
+package com.dynamsoft.reactnativelib.basicutils
 
 import android.content.res.Resources
 import android.graphics.Bitmap
@@ -10,7 +10,7 @@ import com.dynamsoft.core.basic_structures.ImageData
 import java.io.ByteArrayOutputStream
 
 fun bitmap2Byte(bitmap: Bitmap?): ByteArray? {
-    if (null == bitmap) return null;
+    if (null == bitmap) return null
     val outputStream = ByteArrayOutputStream()
     bitmap.compress(Bitmap.CompressFormat.JPEG, 100, outputStream)
     return outputStream.toByteArray()

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

@@ -11,10 +11,10 @@ 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.basicutils.toWritableMap
+import com.dynamsoft.reactnativelib.basicutils.toWritableMap
 import com.dynamsoft.reactnativelib.core.ImageSourceAdapterModuleImpl
-import com.dynamsoft.reactnativelib.utils.toWritableMap
-import com.dynamsoft.reactnativelib.utils.updateFromReadableMap
+import com.dynamsoft.reactnativelib.basicutils.updateFromReadableMap
 import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter
 import kotlinx.coroutines.delay
@@ -176,7 +176,7 @@ class CaptureVisionRouterModuleImpl(private val reactContext: ReactApplicationCo
         try {
             promise.resolve(cvr.getSimplifiedSettings(template).toWritableMap())
         } catch (e: CaptureVisionRouterException) {
-            promise.reject(e.errorCode.toString(), e.message);
+            promise.reject(e.errorCode.toString(), e.message)
         }
     }
 
@@ -189,7 +189,7 @@ class CaptureVisionRouterModuleImpl(private val reactContext: ReactApplicationCo
             }
             promise.resolve(null)
         } catch (e: CaptureVisionRouterException) {
-            promise.reject(e.errorCode.toString(), e.message);
+            promise.reject(e.errorCode.toString(), e.message)
         }
     }
 
@@ -232,6 +232,26 @@ class CaptureVisionRouterModuleImpl(private val reactContext: ReactApplicationCo
         }
     }
 
+    @ReactMethod
+    fun switchCapturingTemplate(template: String, promise: Promise) {
+        try {
+            cvr.switchCapturingTemplate(template)
+            promise.resolve(null)
+        } catch (e: CaptureVisionRouterException) {
+            promise.reject(e.errorCode.toString(), e.message)
+        }
+    }
+
+    @ReactMethod
+    fun clearDLModelBuffers() {
+        CaptureVisionRouter.clearDLModelBuffers()
+    }
+
+    @ReactMethod
+    fun setGlobalIntraOpNumThreads(intraOpNumThreads: Int) {
+        CaptureVisionRouter.setGlobalIntraOpNumThreads(intraOpNumThreads)
+    }
+
     @ReactMethod(isBlockingSynchronousMethod = true)
     fun install(): Boolean {
         reactContext.javaScriptContextHolder?.apply {

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

@@ -12,8 +12,8 @@ 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.dynamsoft.reactnativelib.basicutils.toScanRegion
+import com.dynamsoft.reactnativelib.basicutils.toWritableMap
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.Promise
@@ -97,6 +97,9 @@ class CameraEnhancerModuleImpl(private val reactContext: ReactApplicationContext
 
     @ReactMethod
     fun setCameraView(viewTag: Int) {
+        if(viewTag == 0) {
+            return
+        }
         currentCameraViewId = viewTag
         findAndSetCameraView(viewTag)
     }
@@ -172,7 +175,7 @@ class CameraEnhancerModuleImpl(private val reactContext: ReactApplicationContext
     }
     @ReactMethod
     fun getResolution(promise: Promise) {
-        val resolution = camera.getResolution() ?: Size(0,0)
+        val resolution = camera.resolution ?: Size(0,0)
         promise.resolve(Arguments.createMap().apply {
             putInt("width", resolution.width)
             putInt("height", resolution.height)

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

@@ -1,9 +1,11 @@
-package com.dynamsoft.reactnative.dce
+package com.dynamsoft.reactnativelib.dce
 
 import com.dynamsoft.dce.CameraView
 import com.dynamsoft.dce.DrawingLayer
-import com.dynamsoft.reactnativelib.utils.setTorchButtonState
-import com.dynamsoft.reactnativelib.utils.toTorchButtonState
+import com.dynamsoft.reactnativelib.basicutils.setCameraToggleButtonState
+import com.dynamsoft.reactnativelib.basicutils.setTorchButtonState
+import com.dynamsoft.reactnativelib.basicutils.toCameraToggleButtonState
+import com.dynamsoft.reactnativelib.basicutils.toTorchButtonState
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.uimanager.ThemedReactContext
@@ -55,6 +57,16 @@ class CameraViewManagerImpl {
         view.torchButtonVisible = isVisible
     }
 
+    @ReactProp(name = "cameraToggleButton")
+    fun setCameraToggleButton(view: CameraView, cameraToggleButton: ReadableMap) {
+        view.setCameraToggleButtonState(cameraToggleButton.toCameraToggleButtonState())
+    }
+
+    @ReactProp(name = "cameraToggleButtonVisible")
+    fun setCameraToggleButtonVisible(view: CameraView, isVisible: Boolean) {
+        view.cameraToggleButtonVisible = isVisible
+    }
+
 //    private fun View.manuallyMeasureAndLayout() {
 //        measure(
 //            View.MeasureSpec.makeMeasureSpec(measuredWidth, View.MeasureSpec.EXACTLY),

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

@@ -1,10 +1,6 @@
-package com.dynamsoft.reactnative.dce
+package com.dynamsoft.reactnativelib.dce
 
-import android.view.Choreographer
-import android.view.View
 import com.dynamsoft.dce.ImageEditorView
-import com.dynamsoft.reactnativelib.dce.RNImageEditorView
-import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
 
 class ImageEditorViewManagerImpl  {

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

@@ -2,13 +2,11 @@ package com.dynamsoft.reactnativelib.dce
 
 import android.util.Log
 import com.dynamsoft.core.basic_structures.ImageData
-import com.dynamsoft.dce.CameraView
 import com.dynamsoft.dce.DrawingItem
 import com.dynamsoft.dce.ImageEditorView
 import com.dynamsoft.dce.QuadDrawingItem
-import com.dynamsoft.reactnative.basicutils.toQuad
-import com.dynamsoft.reactnative.basicutils.toWritableMap
-import com.dynamsoft.reactnativelib.core.ImageSourceAdapterModuleImpl.Companion.nativeInstall
+import com.dynamsoft.reactnativelib.basicutils.toQuad
+import com.dynamsoft.reactnativelib.basicutils.toWritableMap
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod

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

@@ -1,7 +1,6 @@
-package com.dynamsoft.reactnative.dce
+package com.dynamsoft.reactnativelib.dce
 
 import android.content.Context
-import android.view.View
 import com.dynamsoft.dce.CameraView
 
 class RNCameraView(context: Context) : CameraView(context) {