Compare commits
	
		
			5 Commits
		
	
	
		
			695e317a77
			...
			ivan/ensur
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 3319e48f7d | |||
| 58714f9dac | |||
| 8991779851 | |||
| f8efa172ba | |||
| 66f840eecb | 
| @@ -16,7 +16,7 @@ buildscript { | |||||||
|   } |   } | ||||||
|  |  | ||||||
|   dependencies { |   dependencies { | ||||||
|     classpath "com.android.tools.build:gradle:8.5.2" |     classpath "com.android.tools.build:gradle:7.4.2" | ||||||
|     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" |     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" | ||||||
|   } |   } | ||||||
| } | } | ||||||
| @@ -133,8 +133,8 @@ android { | |||||||
|   } |   } | ||||||
|  |  | ||||||
|   compileOptions { |   compileOptions { | ||||||
|     sourceCompatibility JavaVersion.VERSION_17 |     sourceCompatibility JavaVersion.VERSION_1_8 | ||||||
|     targetCompatibility JavaVersion.VERSION_17 |     targetCompatibility JavaVersion.VERSION_1_8 | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   externalNativeBuild { |   externalNativeBuild { | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| distributionBase=GRADLE_USER_HOME | distributionBase=GRADLE_USER_HOME | ||||||
| distributionPath=wrapper/dists | distributionPath=wrapper/dists | ||||||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip | distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip | ||||||
| zipStoreBase=GRADLE_USER_HOME | zipStoreBase=GRADLE_USER_HOME | ||||||
| zipStorePath=wrapper/dists | zipStorePath=wrapper/dists | ||||||
|   | |||||||
| @@ -1,3 +1,4 @@ | |||||||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android"> | <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||||||
|  |           package="com.mrousavy.camera"> | ||||||
|  |  | ||||||
| </manifest> | </manifest> | ||||||
|   | |||||||
| @@ -7,14 +7,12 @@ import com.facebook.jni.HybridData | |||||||
| import com.facebook.proguard.annotations.DoNotStrip | import com.facebook.proguard.annotations.DoNotStrip | ||||||
| import com.facebook.react.bridge.ReactApplicationContext | import com.facebook.react.bridge.ReactApplicationContext | ||||||
| import com.facebook.react.bridge.UiThreadUtil | import com.facebook.react.bridge.UiThreadUtil | ||||||
| import com.facebook.react.common.annotations.FrameworkAPI |  | ||||||
| import com.facebook.react.turbomodule.core.CallInvokerHolderImpl | import com.facebook.react.turbomodule.core.CallInvokerHolderImpl | ||||||
| import com.facebook.react.uimanager.UIManagerHelper | import com.facebook.react.uimanager.UIManagerHelper | ||||||
| import com.mrousavy.camera.CameraView | import com.mrousavy.camera.CameraView | ||||||
| import com.mrousavy.camera.core.ViewNotFoundError | import com.mrousavy.camera.core.ViewNotFoundError | ||||||
| import java.lang.ref.WeakReference | import java.lang.ref.WeakReference | ||||||
|  |  | ||||||
| @OptIn(FrameworkAPI::class) |  | ||||||
| @Suppress("KotlinJniMissingFunction") // we use fbjni. | @Suppress("KotlinJniMissingFunction") // we use fbjni. | ||||||
| class VisionCameraProxy(private val reactContext: ReactApplicationContext) { | class VisionCameraProxy(private val reactContext: ReactApplicationContext) { | ||||||
|   companion object { |   companion object { | ||||||
|   | |||||||
| @@ -50,4 +50,12 @@ extension CameraView: AVCaptureVideoDataOutputSampleBufferDelegate, AVCaptureAud | |||||||
|   func resumeRecording(promise: Promise) { |   func resumeRecording(promise: Promise) { | ||||||
|     cameraSession.resumeRecording(promise: promise) |     cameraSession.resumeRecording(promise: promise) | ||||||
|   } |   } | ||||||
|  |    | ||||||
|  |   func lockExposure(promise: Promise) { | ||||||
|  |     cameraSession.lockCurrentExposure(promise: promise) | ||||||
|  |   } | ||||||
|  |    | ||||||
|  |   func unlockExposure(promise: Promise) { | ||||||
|  |     cameraSession.unlockCurrentExposure(promise: promise) | ||||||
|  |   } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -86,5 +86,13 @@ RCT_EXTERN_METHOD(focus | |||||||
|                   : (NSDictionary*)point resolve |                   : (NSDictionary*)point resolve | ||||||
|                   : (RCTPromiseResolveBlock)resolve reject |                   : (RCTPromiseResolveBlock)resolve reject | ||||||
|                   : (RCTPromiseRejectBlock)reject); |                   : (RCTPromiseRejectBlock)reject); | ||||||
|  | RCT_EXTERN_METHOD(lockCurrentExposure | ||||||
|  |                   : (nonnull NSNumber*)node resolve | ||||||
|  |                   : (RCTPromiseResolveBlock)resolve reject | ||||||
|  |                   : (RCTPromiseRejectBlock)reject); | ||||||
|  | RCT_EXTERN_METHOD(unlockCurrentExposure | ||||||
|  |                   : (nonnull NSNumber*)node resolve | ||||||
|  |                   : (RCTPromiseResolveBlock)resolve reject | ||||||
|  |                   : (RCTPromiseRejectBlock)reject); | ||||||
|  |  | ||||||
| @end | @end | ||||||
|   | |||||||
| @@ -111,6 +111,18 @@ final class CameraViewManager: RCTViewManager { | |||||||
|     } |     } | ||||||
|   } |   } | ||||||
|    |    | ||||||
|  |   @objc | ||||||
|  |   final func lockCurrentExposure(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) { | ||||||
|  |     let component = getCameraView(withTag: node) | ||||||
|  |     component.lockExposure(promise: Promise(resolver: resolve, rejecter: reject)) | ||||||
|  |   } | ||||||
|  |    | ||||||
|  |   @objc | ||||||
|  |   final func unlockCurrentExposure(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) { | ||||||
|  |     let component = getCameraView(withTag: node) | ||||||
|  |     component.unlockExposure(promise: Promise(resolver: resolve, rejecter: reject)) | ||||||
|  |   } | ||||||
|  |  | ||||||
|   // MARK: Private |   // MARK: Private | ||||||
|  |  | ||||||
|   private func getCameraView(withTag tag: NSNumber) -> CameraView { |   private func getCameraView(withTag tag: NSNumber) -> CameraView { | ||||||
|   | |||||||
| @@ -191,4 +191,68 @@ extension CameraSession { | |||||||
|       } |       } | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
|  |  | ||||||
|  |   func lockCurrentExposure(promise: Promise) { | ||||||
|  |     CameraQueues.cameraQueue.async { | ||||||
|  |       withPromise(promise) { | ||||||
|  |         guard let captureDevice = AVCaptureDevice.default(for: .video) else { | ||||||
|  |           print("No capture device available") | ||||||
|  |           return | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         guard captureDevice.isExposureModeSupported(.custom) else { | ||||||
|  |           ReactLogger.log(level: .info, message: "Custom exposure mode not supported") | ||||||
|  |           return | ||||||
|  |         } | ||||||
|  |         do { | ||||||
|  |           // Lock the device for configuration | ||||||
|  |           try captureDevice.lockForConfiguration() | ||||||
|  |  | ||||||
|  |           // Get the current exposure duration and ISO | ||||||
|  |           let currentExposureDuration = captureDevice.exposureDuration | ||||||
|  |           let currentISO = captureDevice.iso | ||||||
|  |  | ||||||
|  |           // Check if the device supports custom exposure settings | ||||||
|  |           if captureDevice.isExposureModeSupported(.custom) { | ||||||
|  |             // Lock the current exposure and ISO by setting custom exposure mode | ||||||
|  |             captureDevice.setExposureModeCustom(duration: currentExposureDuration, iso: currentISO, completionHandler: nil) | ||||||
|  |             ReactLogger.log(level: .info, message: "Exposure and ISO locked at current values") | ||||||
|  |           } else { | ||||||
|  |             ReactLogger.log(level: .info, message:"Custom exposure mode not supported") | ||||||
|  |           } | ||||||
|  |  | ||||||
|  |           // Unlock the device after configuration | ||||||
|  |           captureDevice.unlockForConfiguration() | ||||||
|  |  | ||||||
|  |         } catch { | ||||||
|  |           ReactLogger.log(level: .warning, message:"Error locking exposure: \(error)") | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         return nil | ||||||
|  |       } | ||||||
|  |     } | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   func unlockCurrentExposure(promise: Promise) { | ||||||
|  |     CameraQueues.cameraQueue.async { | ||||||
|  |       withPromise(promise) { | ||||||
|  |         guard let captureDevice = AVCaptureDevice.default(for: .video) else { | ||||||
|  |           print("No capture device available") | ||||||
|  |           return | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         do { | ||||||
|  |           if captureDevice.isExposureModeSupported(.autoExpose) { | ||||||
|  |             try captureDevice.lockForConfiguration() | ||||||
|  |             captureDevice.exposureMode = .continuousAutoExposure | ||||||
|  |             captureDevice.unlockForConfiguration() | ||||||
|  |           } | ||||||
|  |         } catch { | ||||||
|  |           ReactLogger.log(level: .warning, message:"Error unlocking exposure: \(error)") | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         return nil | ||||||
|  |       } | ||||||
|  |     } | ||||||
|  |   } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -319,6 +319,22 @@ export class Camera extends React.PureComponent<CameraProps, CameraState> { | |||||||
|       throw tryParseNativeCameraError(e) |       throw tryParseNativeCameraError(e) | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
|  |  | ||||||
|  |   public async lockCurrentExposure(): Promise<void> { | ||||||
|  |     try { | ||||||
|  |       return await CameraModule.lockCurrentExposure(this.handle) | ||||||
|  |     } catch (e) { | ||||||
|  |       throw tryParseNativeCameraError(e) | ||||||
|  |     } | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   public async unlockCurrentExposure(): Promise<void> { | ||||||
|  |     try { | ||||||
|  |       return await CameraModule.unlockCurrentExposure(this.handle) | ||||||
|  |     } catch (e) { | ||||||
|  |       throw tryParseNativeCameraError(e) | ||||||
|  |     } | ||||||
|  |   } | ||||||
|   //#endregion |   //#endregion | ||||||
|  |  | ||||||
|   //#region Static Functions (NativeModule) |   //#region Static Functions (NativeModule) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user