capacitor-plugin-camera-forked 2.0.10 → 2.0.12

package/android/src/main/java/com/tonyxlh/capacitor/camera/CameraPreviewPlugin.java

@@ -322,23 +322,36 @@ public class CameraPreviewPlugin extends Plugin {
 
     @PluginMethod
     public void setFocus(PluginCall call) {
-        if (call.hasOption("x") && call.hasOption("y")) {
-            Float x = call.getFloat("x");
-            Float y = call.getFloat("y");
-            try {
-                MeteringPointFactory factory = new SurfaceOrientedMeteringPointFactory(previewView.getWidth(), previewView.getHeight());
-                MeteringPoint point = factory.createPoint(x, y);
-                FocusMeteringAction.Builder builder = new FocusMeteringAction.Builder(point, FocusMeteringAction.FLAG_AF);
-                // auto calling cancelFocusAndMetering in 5 seconds
-                builder.setAutoCancelDuration(5, TimeUnit.SECONDS);
-                FocusMeteringAction action = builder.build();
-                camera.getCameraControl().startFocusAndMetering(action);
-            } catch (Exception e) {
-                e.printStackTrace();
-                call.reject(e.getMessage());
-            }
+      if (call.hasOption("x") && call.hasOption("y")) {
+        Float x = call.getFloat("x");
+        Float y = call.getFloat("y");
+
+        if (previewView == null || camera == null) {
+          call.reject("Camera preview is not initialized");
+          return;
         }
-        call.resolve();
+
+        try {
+          // Convert normalized coordinates to absolute pixel coordinates
+          float absoluteX = x * previewView.getWidth();
+          float absoluteY = y * previewView.getHeight();
+
+          MeteringPointFactory factory = new SurfaceOrientedMeteringPointFactory(previewView.getWidth(), previewView.getHeight());
+          MeteringPoint point = factory.createPoint(absoluteX, absoluteY);
+
+          FocusMeteringAction.Builder builder = new FocusMeteringAction.Builder(point, FocusMeteringAction.FLAG_AF);
+          builder.setAutoCancelDuration(5, TimeUnit.SECONDS);
+          FocusMeteringAction action = builder.build();
+          camera.getCameraControl().startFocusAndMetering(action);
+
+          call.resolve();
+        } catch (Exception e) {
+          call.reject("Error setting focus: " + e.getMessage());
+        }
+
+      } else {
+        call.reject("Invalid focus coordinates");
+      }
     }
 
     @PluginMethod

package/ios/Plugin/CameraPreviewPlugin.swift

@@ -545,23 +545,28 @@ public class CameraPreviewPlugin: CAPPlugin, AVCaptureVideoDataOutputSampleBuffe
             
             // 1. Check if focus point is supported
             guard device.isFocusPointOfInterestSupported else {
+                device.unlockForConfiguration()
                 call.reject("Focus point of interest not supported on this device")
                 return
             }
             
             // 2. Set focus point
             device.focusPointOfInterest = CGPoint(x: CGFloat(x), y: CGFloat(y))
-            
             // 3. Set focus mode (choose one supported by your use case)
-            if device.isFocusModeSupported(.autoFocus) {
-                device.focusMode = .autoFocus
-            } else if device.isFocusModeSupported(.continuousAutoFocus) {
+            if device.isFocusModeSupported(.continuousAutoFocus) {
                 device.focusMode = .continuousAutoFocus
+            } else if device.isFocusModeSupported(.autoFocus) {
+                device.focusMode = .autoFocus
             } else {
                 call.reject("No supported focus mode available")
                 return
             }
-            call.resolve()
+
+            DispatchQueue.main.asyncAfter(deadline: .now() + 5.0) {
+                device.unlockForConfiguration()
+            }
+
+            call.resolve()            
         } catch {
             call.reject("Failed to lock device for configuration: \(error.localizedDescription)")
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-plugin-camera-forked",
-  "version": "2.0.10",
+  "version": "2.0.12",
   "description": "A capacitor camera plugin - A custom Capacitor camera plugin with additional features.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",