Set autofocus when launching video preview

KlubJagiellonski · Aug 16, 2017 · 746d80b · 746d80b
1 parent 0b9c98a
commit 746d80b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 14 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -30,8 +30,8 @@ android {
         applicationId "pl.pola_app"
         minSdkVersion 16
         targetSdkVersion 25
-        versionCode 22
-        versionName "1.5"
+        versionCode 23
+        versionName "1.5.1"
     }
 
     signingConfigs {

diff --git a/app/src/main/java/pl/pola_app/helpers/OldCamera.java b/app/src/main/java/pl/pola_app/helpers/OldCamera.java
@@ -16,7 +16,7 @@ public class OldCamera extends CameraCompat {
 
     private static final int DEFAULT_MIN_PIC_SIZE = 1000;
     Camera camera;
-    boolean saveToTakePicture = false;
+    boolean safeToTakePicture = false;
     boolean isPreviewing = false;
 
     private final int maxPictureSize;
@@ -29,6 +29,7 @@ public class OldCamera extends CameraCompat {
     @Override
     public void open(){
         camera = Camera.open();
+        camera.cancelAutoFocus();
         final Camera.Parameters parameters = camera.getParameters();
         final List<Camera.Size> supportedPictureSizes = parameters.getSupportedPictureSizes();
         Camera.Size size = supportedPictureSizes.get(0);
@@ -39,8 +40,9 @@ public void open(){
                 size = cameraSize;
             }
         }
-        parameters.setSceneMode(Camera.Parameters.SCENE_MODE_PORTRAIT);
+
         parameters.setPictureSize(size.width, size.height);
+        parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_AUTO);
         camera.setParameters(parameters);
         camera.setDisplayOrientation(90);
     }
@@ -51,8 +53,9 @@ public void openPreview(SurfaceHolder surface) {
         try {
             camera.setPreviewDisplay(surface);
             camera.startPreview();
+            camera.autoFocus(null);
             isPreviewing = true;
-            saveToTakePicture = true;
+            safeToTakePicture = true;
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -63,17 +66,17 @@ public void closePreview() {
         camera.stopPreview();
         camera.release();
         isPreviewing = false;
-        saveToTakePicture = false;
+        safeToTakePicture = false;
     }
 
     @Override
     public void takePicture(OnPhotoTakenSuccessListener onPhotoTakenSuccessListener) {
-        if (!saveToTakePicture) {
+        if (!safeToTakePicture) {
             Log.e("TAG", "Skipped photo");
             return;
         }
         camera.takePicture(null, null, (data, camera) -> {
-            saveToTakePicture = true;
+            safeToTakePicture = true;
             final Camera.Parameters parameters = camera.getParameters();
             final Camera.Size pictureSize = parameters.getPictureSize();
             final Bitmap bitmap = FileUtils.rotateImageAndScale(BitmapFactory.decodeByteArray(data, 0, data.length), 90, maxPictureSize);
@@ -87,6 +90,6 @@ public void takePicture(OnPhotoTakenSuccessListener onPhotoTakenSuccessListener)
             );
             camera.startPreview();
         });
-        saveToTakePicture = false;
+        safeToTakePicture = false;
     }
 }
diff --git a/app/src/main/java/pl/pola_app/helpers/Utils.java b/app/src/main/java/pl/pola_app/helpers/Utils.java
@@ -2,6 +2,7 @@
 
 import android.content.res.Resources;
 import android.os.Build;
+import android.support.compat.BuildConfig;
 import android.text.TextUtils;
 
 public class Utils {
@@ -28,7 +29,7 @@ public static String getDeviceName() {
         if (Build.MODEL.startsWith(Build.MANUFACTURER)) {
             return upperFirstLetter(Build.MODEL);
         }
-        return "Android: " + upperFirstLetter(Build.MANUFACTURER) + " " + Build.MODEL;
+        return "Android: " + upperFirstLetter(Build.MANUFACTURER) + " " + Build.MODEL + " (" +  BuildConfig.VERSION_NAME + ")";
     }
 
     private static String upperFirstLetter(String strToUpper) {

diff --git a/app/src/main/java/pl/pola_app/presenter/VideoCapturePresenter.java b/app/src/main/java/pl/pola_app/presenter/VideoCapturePresenter.java
@@ -99,7 +99,7 @@ public void onDestroy() {
         view = null;
     }
 
-    public void sandFilesToServer(List<TakenPicInfo> list) {
+    public void sendFilesToServer(List<TakenPicInfo> list) {
         final PhotoPicturesReport photoPicturesReport = PhotoPicturesReport.builder()
                 .setDeviceName(Utils.getDeviceName())
                 .setFilesCount(list.size())
@@ -146,7 +146,7 @@ public void onTakePicture(Bitmap bitmap, long time, int originalWidth, int origi
             fileNames.add(new TakenPicInfo(picturePath, originalWidth, originalHeight, width, height));
             Log.d(TAG, "File " + picturePath + " is saved o thread " + Thread.currentThread().getName());
             if (time == 1) {
-                sandFilesToServer(fileNames);
+                sendFilesToServer(fileNames);
             }
         });
     }

diff --git a/app/src/main/java/pl/pola_app/ui/activity/MainActivity.java b/app/src/main/java/pl/pola_app/ui/activity/MainActivity.java
@@ -207,7 +207,7 @@ public void onTeachPolaButtonClick() {
 
     @Override
     public void onTeachPolaAction(SearchResult searchResult) {
-        mainPresenter.onTechPolaClick(searchResult);
+        mainPresenter.onTeachPolaClick(searchResult);
     }
 
     @Override

diff --git a/app/src/main/java/pl/pola_app/ui/activity/MainPresenter.java b/app/src/main/java/pl/pola_app/ui/activity/MainPresenter.java
@@ -175,7 +175,7 @@ public void reportButtonClicked(ReportButtonClickedEvent event) {
         viewBinder.launchReportActivity(productId);
     }
 
-    public void onTechPolaClick(SearchResult searchResult) {
+    public void onTeachPolaClick(SearchResult searchResult) {
         viewBinder.displayVideoActivity(searchResult, sessionId.get());
     }