capacitor-camera-module 0.0.33 → 0.0.35

package/android/src/main/java/com/eddieagvictoria/cameramodule/CameraModulePlugin.java

@@ -15,7 +15,6 @@ import com.getcapacitor.annotation.PermissionCallback;
 
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
 import androidx.camera.core.CameraSelector;
 import androidx.camera.core.Preview;
@@ -67,7 +66,11 @@ import com.google.mlkit.vision.barcode.common.Barcode;
 import com.google.mlkit.vision.barcode.BarcodeScanner;
 import com.google.mlkit.vision.barcode.BarcodeScanning;
 
+import android.graphics.YuvImage;
+import android.graphics.Rect;
+import java.util.concurrent.Executors;
 
+import java.util.concurrent.ExecutorService;
 
 
 @CapacitorPlugin(
@@ -92,7 +95,6 @@ public class CameraModulePlugin extends Plugin {
 
     private PreviewView previewView;
     private ProcessCameraProvider cameraProvider;
-    private CameraSelector cameraSelector;
 
     private Camera camera;
 
@@ -101,12 +103,17 @@ public class CameraModulePlugin extends Plugin {
 
     private ImageCapture imageCapture;
 
-    private PluginCall pendingCaptureCall;
-
     private ImageAnalysis imageAnalysis;
     private boolean isScanning = false;
     private PluginCall scanCall;
 
+    private CameraSelector cameraSelector = CameraSelector.DEFAULT_BACK_CAMERA;
+
+    private BarcodeScanner barcodeScanner;
+
+    private final ExecutorService barcodeExecutor = Executors.newSingleThreadExecutor();
+
+
 
     @Override
     public void load() {
@@ -236,6 +243,12 @@ public class CameraModulePlugin extends Plugin {
     @PluginMethod
     public void startPreview(PluginCall call) {
         getActivity().runOnUiThread(() -> {
+
+            if (previewView != null) {
+                call.resolve();
+                return;
+            }
+
             previewView = new PreviewView(getContext());
             previewView.setLayoutParams(
                 new FrameLayout.LayoutParams(
@@ -269,7 +282,7 @@ public class CameraModulePlugin extends Plugin {
                         .setCaptureMode(ImageCapture.CAPTURE_MODE_MINIMIZE_LATENCY)
                         .build();
 
-                cameraSelector = CameraSelector.DEFAULT_BACK_CAMERA;
+
 
                 cameraProvider.unbindAll();
 
@@ -306,6 +319,11 @@ public class CameraModulePlugin extends Plugin {
                 previewView = null;
             }
 
+            if (barcodeScanner != null) {
+                barcodeScanner.close();
+                barcodeScanner = null;
+            }
+
             call.resolve();
         });
     }
@@ -355,6 +373,10 @@ public class CameraModulePlugin extends Plugin {
             return;
         }
 
+        if (savedCall != null) {
+            call.reject("Gallery already open");
+            return;
+        }
         savedCall = call;
 
         Intent intent = new Intent(
@@ -404,11 +426,19 @@ public class CameraModulePlugin extends Plugin {
         float ratio = (float) width / height;
 
         if (width > height) {
-            if (width <= maxSize) return bitmap;
+            if (width <= maxSize && height <= maxSize) {
+                Bitmap.Config config =
+                    bitmap.getConfig() != null ? bitmap.getConfig() : Bitmap.Config.ARGB_8888;
+                return bitmap.copy(config, false);
+            }
             width = maxSize;
             height = Math.round(width / ratio);
         } else {
-            if (height <= maxSize) return bitmap;
+            if (height <= maxSize && width <= maxSize) {
+                Bitmap.Config config =
+                    bitmap.getConfig() != null ? bitmap.getConfig() : Bitmap.Config.ARGB_8888;
+                return bitmap.copy(config, false);
+            }
             height = maxSize;
             width = Math.round(height * ratio);
         }
@@ -548,107 +578,63 @@ public class CameraModulePlugin extends Plugin {
             return;
         }
 
-        imageCapture.takePicture(
-            ContextCompat.getMainExecutor(getContext()),
-            new ImageCapture.OnImageCapturedCallback() {
-
-                @Override
-                public void onCaptureSuccess(
-                    @NonNull ImageProxy image
-                ) {
-                    try {
-                        Bitmap bitmap = imageProxyToBitmap(image);
-                        int rotation = image.getImageInfo().getRotationDegrees();
-                        bitmap = rotateBitmap(bitmap, rotation);
-                        image.close();
-
-                        Bitmap resized = resizeBitmap(bitmap, 1024);
-
-                        ByteArrayOutputStream outputStream =
-                            new ByteArrayOutputStream();
-                        resized.compress(
-                            Bitmap.CompressFormat.JPEG,
-                            80,
-                            outputStream
-                        );
-
-                        byte[] bytes = outputStream.toByteArray();
-                        String base64 =
-                            Base64.encodeToString(bytes, Base64.NO_WRAP);
-
-                        bitmap.recycle();
-                        resized.recycle();
-
-                        JSObject ret = new JSObject();
-                        ret.put("base64", base64);
-                        ret.put("mimeType", "image/jpeg");
-                        call.resolve(ret);
-
-                    } catch (Exception e) {
-                        call.reject("Error capturing image", e);
+        try {
+            File photoFile = File.createTempFile(
+                "photo_",
+                ".jpg",
+                getContext().getCacheDir()
+            );
+
+            ImageCapture.OutputFileOptions options =
+                new ImageCapture.OutputFileOptions.Builder(photoFile).build();
+
+            imageCapture.takePicture(
+                options,
+                ContextCompat.getMainExecutor(getContext()),
+                new ImageCapture.OnImageSavedCallback() {
+
+                    @Override
+                    public void onImageSaved(
+                        @NonNull ImageCapture.OutputFileResults output
+                    ) {
+                        try {
+                            Bitmap bitmap = BitmapFactory.decodeFile(photoFile.getAbsolutePath());
+                            Bitmap resized = resizeBitmap(bitmap, 1024);
+
+                            ByteArrayOutputStream out = new ByteArrayOutputStream();
+                            resized.compress(Bitmap.CompressFormat.JPEG, 80, out);
+
+                            String base64 = Base64.encodeToString(
+                                out.toByteArray(),
+                                Base64.NO_WRAP
+                            );
+
+                            bitmap.recycle();
+                            resized.recycle();
+                            photoFile.delete();
+
+                            JSObject ret = new JSObject();
+                            ret.put("base64", base64);
+                            ret.put("mimeType", "image/jpeg");
+                            call.resolve(ret);
+
+                        } catch (Exception e) {
+                            call.reject("Error processing image", e);
+                        }
                     }
-                }
 
-                @Override
-                public void onError(
-                    @NonNull ImageCaptureException exception
-                ) {
-                    call.reject("Capture failed", exception);
+                    @Override
+                    public void onError(@NonNull ImageCaptureException exception) {
+                        call.reject("Capture failed", exception);
+                    }
                 }
-            }
-        );
-    }
-
-    private Bitmap imageProxyToBitmap(ImageProxy image) {
-        ImageProxy.PlaneProxy[] planes = image.getPlanes();
-        ByteBuffer buffer = planes[0].getBuffer();
-        byte[] bytes = new byte[buffer.remaining()];
-        buffer.get(bytes);
-
-        return BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
-    }
-
-
-    private Bitmap rotateBitmap(Bitmap bitmap, int rotationDegrees) {
-        if (rotationDegrees == 0) return bitmap;
-
-        Matrix matrix = new Matrix();
-        matrix.postRotate(rotationDegrees);
-
-        return Bitmap.createBitmap(
-            bitmap,
-            0,
-            0,
-            bitmap.getWidth(),
-            bitmap.getHeight(),
-            matrix,
-            true
-        );
-    }
-
-
-
-    private Bitmap mirrorBitmap(Bitmap bitmap) {
-        Matrix matrix = new Matrix();
-        matrix.preScale(-1, 1);
+            );
 
-        return Bitmap.createBitmap(
-            bitmap,
-            0,
-            0,
-            bitmap.getWidth(),
-            bitmap.getHeight(),
-            matrix,
-            true
-        );
+        } catch (Exception e) {
+            call.reject("Error creating file", e);
+        }
     }
 
-    private String bitmapToBase64(Bitmap bitmap) {
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        bitmap.compress(Bitmap.CompressFormat.JPEG, 80, outputStream);
-        byte[] bytes = outputStream.toByteArray();
-        return Base64.encodeToString(bytes, Base64.NO_WRAP);
-    }
 
     @PluginMethod
     public void startBarcodeScan(PluginCall call) {
@@ -673,6 +659,10 @@ public class CameraModulePlugin extends Plugin {
             return;
         }
 
+         barcodeScanner = BarcodeScanning.getClient();
+
+        call.setKeepAlive(true);
+
         scanCall = call;
         isScanning = true;
 
@@ -684,7 +674,7 @@ public class CameraModulePlugin extends Plugin {
                 .build();
 
         imageAnalysis.setAnalyzer(
-            ContextCompat.getMainExecutor(getContext()),
+            barcodeExecutor,
             this::processBarcode
         );
 
@@ -698,6 +688,10 @@ public class CameraModulePlugin extends Plugin {
                 .setCaptureMode(ImageCapture.CAPTURE_MODE_MINIMIZE_LATENCY)
                 .build();
 
+        if (cameraSelector == null) {
+            cameraSelector = CameraSelector.DEFAULT_BACK_CAMERA;
+        }
+
         camera = cameraProvider.bindToLifecycle(
             getActivity(),
             cameraSelector,
@@ -705,9 +699,13 @@ public class CameraModulePlugin extends Plugin {
             imageCapture,
             imageAnalysis
         );
+
+        call.resolve();
+
     }
 
     private void processBarcode(ImageProxy imageProxy) {
+
         if (!isScanning) {
             imageProxy.close();
             return;
@@ -719,19 +717,26 @@ public class CameraModulePlugin extends Plugin {
             return;
         }
 
-        InputImage image =
-            InputImage.fromMediaImage(
-                mediaImage,
-                imageProxy.getImageInfo().getRotationDegrees()
-            );
-
-        BarcodeScanner scanner =
-            BarcodeScanning.getClient();
+        InputImage image = InputImage.fromMediaImage(
+            mediaImage,
+            imageProxy.getImageInfo().getRotationDegrees()
+        );
 
-        scanner.process(image)
+        if (barcodeScanner == null) {
+            imageProxy.close();
+            return;
+        }
+        barcodeScanner.process(image)
             .addOnSuccessListener(barcodes -> {
-                if (!barcodes.isEmpty() && isScanning) {
 
+                if (!isScanning) {
+                    imageProxy.close();
+                    return;
+                }
+
+                if (!barcodes.isEmpty()) {
+
+                    isScanning = false;
                     vibrateOnce();
 
                     Barcode barcode = barcodes.get(0);
@@ -740,36 +745,63 @@ public class CameraModulePlugin extends Plugin {
                     ret.put("rawValue", barcode.getRawValue());
                     ret.put("format", barcode.getFormat());
 
-                    isScanning = false;
-                    imageProxy.close();
+                    if (scanCall != null) {
+                        scanCall.resolve(ret);
+                        scanCall.setKeepAlive(false);
+                        scanCall = null;
+
+                    }
+
+                    if (barcodeScanner != null) {
+                            barcodeScanner.close();
+                            barcodeScanner = null;
+                        }
 
-                    scanCall.resolve(ret);
-                    scanCall = null;
 
                     stopBarcodeScanInternal();
-                } else {
-                    imageProxy.close();
                 }
+
+                imageProxy.close();
             })
             .addOnFailureListener(e -> {
                 imageProxy.close();
             });
     }
 
+
     private void stopBarcodeScanInternal() {
-        if (imageAnalysis != null) {
-            cameraProvider.unbind(imageAnalysis);
-            imageAnalysis = null;
-        }
+        getActivity().runOnUiThread(() -> {
+            if (cameraProvider != null) {
+                cameraProvider.unbindAll();
+                startCamera();
+            }
+        });
     }
 
+
+
     @PluginMethod
     public void stopBarcodeScan(PluginCall call) {
         isScanning = false;
+        imageAnalysis = null;
+
+        if (scanCall != null) {
+            scanCall.setKeepAlive(false);
+            scanCall = null;
+        }
+
+        if (barcodeScanner != null) {
+            barcodeScanner.close();
+            barcodeScanner = null;
+        }
+
         stopBarcodeScanInternal();
+
         call.resolve();
     }
 
+
+
     private void vibrateOnce() {
         Vibrator vibrator =
             (Vibrator) getContext().getSystemService(Context.VIBRATOR_SERVICE);
@@ -788,5 +820,28 @@ public class CameraModulePlugin extends Plugin {
         }
     }
 
+    private void restartNormalPreview() {
+        if (cameraProvider == null) return;
+
+        cameraProvider.unbindAll();
+
+        Preview preview = new Preview.Builder().build();
+        preview.setSurfaceProvider(previewView.getSurfaceProvider());
+
+        imageCapture = new ImageCapture.Builder()
+            .setCaptureMode(ImageCapture.CAPTURE_MODE_MINIMIZE_LATENCY)
+            .build();
+
+        CameraSelector cameraSelector = CameraSelector.DEFAULT_BACK_CAMERA;
+
+        cameraProvider.bindToLifecycle(
+            getActivity(),
+            cameraSelector,
+            preview,
+            imageCapture
+        );
+    }
+
+
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-camera-module",
-  "version": "0.0.33",
+  "version": "0.0.35",
   "description": "Plugin to request permissiones view camera take phots",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",