refactor

spoonconsulting · Apr 5, 2024 · df81319 · df81319
1 parent 9705d29
commit df81319
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 72 deletions.
diff --git a/src/android/CameraPreviewFragment.java b/src/android/CameraPreviewFragment.java
@@ -136,38 +136,7 @@ public void startCamera() {
             startCameraCallback.onCameraStarted(new Exception("Unable to start camera"));
             return;
         }
-        CameraSelector cameraSelector = getCameraSelector(captureDevice);
-
-        Size targetResolution = null;
-        if (targetSize > 0) {
-            targetResolution = CameraPreviewFragment.calculateResolution(getContext(), targetSize);
-        }
-
-        preview = new Preview.Builder().build();
-        imageCapture = new ImageCapture.Builder()
-                .setTargetResolution(targetResolution)
-                .build();
-
-        cameraProvider.unbindAll();
-        try {
-            camera = cameraProvider.bindToLifecycle(
-                    this,
-                    cameraSelector,
-                    preview,
-                    imageCapture
-            );
-        } catch (IllegalArgumentException e) {
-            // Error with result in capturing image with default resolution
-            e.printStackTrace();
-            imageCapture = new ImageCapture.Builder()
-                    .build();
-            camera = cameraProvider.bindToLifecycle(
-                    this,
-                    cameraSelector,
-                    preview,
-                    imageCapture
-            );
-        }
+        setUpCamera(captureDevice,cameraProvider);
 
         preview.setSurfaceProvider(viewFinder.getSurfaceProvider());
 
@@ -385,48 +354,18 @@ public void switchCameraTo(String device, CameraSwitchedCallback cameraSwitchedC
                 return;
             }
 
-            CameraSelector cameraSelector = getCameraSelector(device);
-
-            Size targetResolution = null;
-            if (targetSize > 0) {
-                targetResolution = CameraPreviewFragment.calculateResolution(getContext(), targetSize);
-            }
-
-            preview = new Preview.Builder().build();
-            imageCapture = new ImageCapture.Builder()
-                    .setTargetResolution(targetResolution)
-                    .build();
-
-            cameraProvider.unbindAll();
-            try {
-                camera = cameraProvider.bindToLifecycle(
-                        getActivity(),
-                        cameraSelector,
-                        preview,
-                        imageCapture
-                );
-            } catch (IllegalArgumentException e) {
-                // Error with result in capturing image with default resolution
-                e.printStackTrace();
-                imageCapture = new ImageCapture.Builder()
-                        .build();
-                camera = cameraProvider.bindToLifecycle(
-                        getActivity(),
-                        cameraSelector,
-                        preview,
-                        imageCapture
-                );
-            }
+            setUpCamera(device,cameraProvider);
 
             preview.setSurfaceProvider(viewFinder.getSurfaceProvider());
             cameraSwitchedCallback.onSwitch(true);
         });
     }
 
     @SuppressLint("RestrictedApi")
-    public CameraSelector getCameraSelector(String captureDevice) {
+    public void setUpCamera(String captureDevice, ProcessCameraProvider cameraProvider) {
+        CameraSelector cameraSelector;
         if (captureDevice.equals("ultra-wide-angle")) {
-            return new CameraSelector.Builder()
+            cameraSelector = new CameraSelector.Builder()
                     .addCameraFilter(cameraInfos -> {
                         List<Camera2CameraInfoImpl> backCameras = new ArrayList<>();
                         for (CameraInfo cameraInfo : cameraInfos) {
@@ -452,9 +391,41 @@ public CameraSelector getCameraSelector(String captureDevice) {
                     })
                     .build();
         } else {
-            return new CameraSelector.Builder()
+            cameraSelector = new CameraSelector.Builder()
                     .requireLensFacing(direction)
                     .build();
         }
+
+        Size targetResolution = null;
+        if (targetSize > 0) {
+            targetResolution = CameraPreviewFragment.calculateResolution(getContext(), targetSize);
+        }
+
+        preview = new Preview.Builder().build();
+        imageCapture = new ImageCapture.Builder()
+                .setTargetResolution(targetResolution)
+                .build();
+
+        cameraProvider.unbindAll();
+        try {
+            camera = cameraProvider.bindToLifecycle(
+                    getActivity(),
+                    cameraSelector,
+                    preview,
+                    imageCapture
+            );
+        } catch (IllegalArgumentException e) {
+            // Error with result in capturing image with default resolution
+            e.printStackTrace();
+            imageCapture = new ImageCapture.Builder()
+                    .build();
+            camera = cameraProvider.bindToLifecycle(
+                    getActivity(),
+                    cameraSelector,
+                    preview,
+                    imageCapture
+            );
+        }
+
     }
 }
diff --git a/src/ios/SimpleCameraPreview.m b/src/ios/SimpleCameraPreview.m
@@ -74,23 +74,21 @@ - (void) enable:(CDVInvokedUrlCommand*)command {
                 [setupSessionOptions setValue:[NSNumber numberWithInteger:targetSize] forKey:@"targetSize"];
             }
             NSString *captureDevice = config[@"captureDevice"];
-            if (captureDevice != [NSNull null] && ![captureDevice isEqual: @""]) {
+            if (captureDevice && [captureDevice length] > 0) {
                 [setupSessionOptions setValue:captureDevice forKey:@"captureDevice"];
             }
         } @catch(NSException *exception) {
             [self.commandDelegate sendPluginResult:[CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"targetSize not well defined"] callbackId:command.callbackId];
         }
     }
 
-    self.photoSettings = [AVCapturePhotoSettings photoSettingsWithFormat:@{AVVideoCodecKey : AVVideoCodecTypeJPEG}];
-    NSDictionary *immutableSetupSessionOptions = [setupSessionOptions copy];
-    [self.sessionManager setupSession:@"back" completion:^(BOOL started) {
+    self.photoSettings = [AVCapturePhotoSettings photoSettingsWithFormat:@{AVVideoCodecKey : AVVideoCodecTypeJPEG}];    [self.sessionManager setupSession:@"back" completion:^(BOOL started) {
         dispatch_async(dispatch_get_main_queue(), ^{
             CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
             [pluginResult setKeepCallbackAsBool:true];
             [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
         });
-    } options:immutableSetupSessionOptions photoSettings:self.photoSettings];
+    } options:setupSessionOptions photoSettings:self.photoSettings];
 }
 
 - (void) sessionNotInterrupted:(NSNotification *)notification {