From dcb8a913416fc87c5083493fa5b10f03e7277aa8 Mon Sep 17 00:00:00 2001 From: Larry Ng Date: Tue, 30 May 2017 04:08:57 -0400 Subject: [PATCH] fix crash on tap focus --- .../api16/com/flurgle/camerakit/Camera1.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/camerakit/src/main/api16/com/flurgle/camerakit/Camera1.java b/camerakit/src/main/api16/com/flurgle/camerakit/Camera1.java index ca9e1f48..fe997cc1 100644 --- a/camerakit/src/main/api16/com/flurgle/camerakit/Camera1.java +++ b/camerakit/src/main/api16/com/flurgle/camerakit/Camera1.java @@ -595,28 +595,28 @@ public class Camera1 extends CameraImpl { } private Rect calculateFocusArea(float x, float y) { - int centerX = clamp(Float.valueOf((x / mPreview.getView().getWidth()) * 2000 - 1000).intValue(), getFocusAreaSize()); - int centerY = clamp(Float.valueOf((y / mPreview.getView().getHeight()) * 2000 - 1000).intValue(), getFocusAreaSize()); + int buffer = getFocusAreaSize() / 2; + int centerX = calculateCenter(x, mPreview.getView().getWidth(), buffer); + int centerY = calculateCenter(y, mPreview.getView().getHeight(), buffer); return new Rect( - centerX - getFocusAreaSize() / 2, - centerY - getFocusAreaSize() / 2, - centerX + getFocusAreaSize() / 2, - centerY + getFocusAreaSize() / 2 + centerX - buffer, + centerY - buffer, + centerX + buffer, + centerY + buffer ); } - private int clamp(int touchCoordinateInCameraReper, int focusAreaSize) { - int result; - if (Math.abs(touchCoordinateInCameraReper) + focusAreaSize / 2 > 1000) { - if (touchCoordinateInCameraReper > 0) { - result = 1000 - focusAreaSize / 2; + private static int calculateCenter(float coord, int dimen, int buffer) { + int normalized = (int) ((coord / dimen) * 2000 - 1000); + if (Math.abs(normalized) + buffer > 1000) { + if (normalized > 0) { + return 1000 - buffer; } else { - result = -1000 + focusAreaSize / 2; + return -1000 + buffer; } } else { - result = touchCoordinateInCameraReper - focusAreaSize / 2; + return normalized; } - return result; } }