Fix autofocus

Author: DeividAndreola

android/gradle.properties

@@ -1 +1,3 @@
+android.useAndroidX=true
+android.enableJetifier=true
 org.gradle.jvmargs=-Xmx1536M

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Mar 28 09:56:16 PDT 2018
+#Wed Dec 21 10:30:36 BRT 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+zipStoreBase=GRADLE_USER_HOME

android/src/main/java/com/github/rmtmckenzie/qrmobilevision/QrCameraC1.java

@@ -95,6 +95,15 @@ public void start(final int cameraDirection) throws QrReader.Exception {
 
         final android.hardware.Camera.Parameters parameters = camera.getParameters();
 
+        List<String> sceneModes = parameters.getSupportedSceneModes();
+        if(sceneModes.contains(android.hardware.Camera.Parameters.SCENE_MODE_BARCODE)){
+            Log.i(TAG, "Initializing with barcode scene mode.");
+            parameters.setSceneMode(android.hardware.Camera.Parameters.SCENE_MODE_BARCODE);
+        } else{
+            Log.i(TAG, "Initializing with default scene mode.");
+            parameters.setSceneMode(android.hardware.Camera.Parameters.SCENE_MODE_AUTO);
+        }
+
         List<String> focusModes = parameters.getSupportedFocusModes();
         if (focusModes.contains(android.hardware.Camera.Parameters.FOCUS_MODE_AUTO)) {
             Log.i(TAG, "Initializing with autofocus on.");

android/src/main/java/com/github/rmtmckenzie/qrmobilevision/QrCameraC2.java

@@ -235,6 +235,22 @@ public void close() {
 
     }
 
+    private Integer getSceneMode() {
+
+        int[] availableSceneModes = cameraCharacteristics.get(CameraCharacteristics.CONTROL_AVAILABLE_SCENE_MODES);
+        List<Integer> sceneModes = new ArrayList<Integer>(availableSceneModes.length);
+        for (int i : availableSceneModes) sceneModes.add(i);
+
+        Log.i(TAG, "Available scene modes: " + sceneModes);
+
+        if (sceneModes.contains(CameraCharacteristics.CONTROL_SCENE_MODE_BARCODE))
+            return CameraMetadata.CONTROL_SCENE_MODE_BARCODE;
+        else if (sceneModes.contains(CameraCharacteristics.CONTROL_SCENE_MODE_DISABLED))
+            return CameraMetadata.CONTROL_SCENE_MODE_DISABLED;
+        else
+            return CameraMetadata.CONTROL_SCENE_MODE_ACTION;
+    }
+
     private void startCamera() {
         List<Surface> list = new ArrayList<>();
 
@@ -265,20 +281,13 @@ public void onImageAvailable(ImageReader reader) {
             previewBuilder = cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
             previewBuilder.addTarget(list.get(0));
             previewBuilder.addTarget(list.get(1));
+            Integer sceneMode = getSceneMode();
 
-            Integer afMode = afMode(cameraCharacteristics);
+            Log.i(TAG, "Initialize scene mode: " + sceneMode.toString());
 
+            previewBuilder.set(CaptureRequest.CONTROL_SCENE_MODE, sceneMode);
             previewBuilder.set(CaptureRequest.CONTROL_MODE, CameraMetadata.CONTROL_MODE_AUTO);
 
-            if (afMode != null) {
-                previewBuilder.set(CaptureRequest.CONTROL_AF_MODE, afMode);
-                Log.i(TAG, "Setting af mode to: " + afMode);
-                if (afMode == CONTROL_AF_MODE_AUTO) {
-                    previewBuilder.set(CaptureRequest.CONTROL_AF_TRIGGER, CaptureRequest.CONTROL_AF_TRIGGER_START);
-                } else {
-                    previewBuilder.set(CaptureRequest.CONTROL_AF_TRIGGER, CaptureRequest.CONTROL_AF_TRIGGER_CANCEL);
-                }
-            }
         } catch (java.lang.Exception e) {
             e.printStackTrace();
             return;
@@ -319,39 +328,30 @@ public void onCaptureCompleted(@NonNull CameraCaptureSession session, @NonNull C
         }
     }
 
-    public void turnOnFlashLight()
-    {
-        try
-        {
+    public void turnOnFlashLight() {
+        try {
             previewBuilder.set(CaptureRequest.FLASH_MODE, CameraMetadata.FLASH_MODE_TORCH);
             previewSession.setRepeatingRequest(previewBuilder.build(), null, null);
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
-    public void turnOffFlashLight()
-    {
-        try
-        {
+    public void turnOffFlashLight() {
+        try {
             previewBuilder.set(CaptureRequest.FLASH_MODE, CameraMetadata.FLASH_MODE_OFF);
             previewSession.setRepeatingRequest(previewBuilder.build(), null, null);
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
     @Override
     public void toggleFlash() {
-        if(isFlashOn) {
+        if (isFlashOn) {
             turnOffFlashLight();
             isFlashOn = false;
-        }
-        else {
+        } else {
             turnOnFlashLight();
             isFlashOn = true;
         }