fenix
/
Simple-Camera
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remember last used focus area, set it again after capturing an image

This commit is contained in:
tibbi 2018-06-10 14:56:37 +02:00
parent a24a3979d2
commit 5f0a1d0475
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/kotlin/com/simplemobiletools/camera/views/PreviewCameraTwo.kt
View File

@ -71,6 +71,8 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie
private var mDownEventAtMS = 0L private var mDownEventAtMS = 0L
private var mDownEventAtX = 0f private var mDownEventAtX = 0f
private var mDownEventAtY = 0f private var mDownEventAtY = 0f
private var mLastFocusX = 0f
private var mLastFocusY = 0f
private var mIsFlashSupported = true private var mIsFlashSupported = true
private var mIsZoomSupported = true private var mIsZoomSupported = true
private var mIsFocusSupported = true private var mIsFocusSupported = true
@ -119,7 +121,7 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie
Math.abs(event.x - mDownEventAtX) < CLICK_DIST && Math.abs(event.x - mDownEventAtX) < CLICK_DIST &&
Math.abs(event.y - mDownEventAtY) < CLICK_DIST) { Math.abs(event.y - mDownEventAtY) < CLICK_DIST) {
try { try {
focusArea(event.x, event.y) focusArea(event.x, event.y, true)
} catch (e: Exception) { } catch (e: Exception) {
} }
} }
@ -564,8 +566,12 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie
} }
// inspired by https://gist.github.com/royshil/8c760c2485257c85a11cafd958548482 // inspired by https://gist.github.com/royshil/8c760c2485257c85a11cafd958548482
private fun focusArea(x: Float, y: Float) { private fun focusArea(x: Float, y: Float, drawCircle: Boolean) {
mActivity.drawFocusCircle(x, y) mLastFocusX = x
mLastFocusY = y
if (drawCircle) {
mActivity.drawFocusCircle(x, y)
}
val captureCallbackHandler = object : CameraCaptureSession.CaptureCallback() { val captureCallbackHandler = object : CameraCaptureSession.CaptureCallback() {
override fun onCaptureCompleted(session: CameraCaptureSession, request: CaptureRequest, result: TotalCaptureResult) { override fun onCaptureCompleted(session: CameraCaptureSession, request: CaptureRequest, result: TotalCaptureResult) {
@ -691,6 +697,10 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie
} }
mCameraState = STATE_PREVIEW mCameraState = STATE_PREVIEW
mCaptureSession!!.setRepeatingRequest(mPreviewRequest, mCaptureCallback, mBackgroundHandler) mCaptureSession!!.setRepeatingRequest(mPreviewRequest, mCaptureCallback, mBackgroundHandler)
if (mLastFocusX != 0f && mLastFocusY != 0f) {
focusArea(mLastFocusX, mLastFocusY, false)
}
} catch (e: CameraAccessException) { } catch (e: CameraAccessException) {
} finally { } finally {
mCameraState = STATE_PREVIEW mCameraState = STATE_PREVIEW
@ -871,6 +881,8 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie
} }
override fun initVideoMode(): Boolean { override fun initVideoMode(): Boolean {
mLastFocusX = 0f
mLastFocusY = 0f
mIsInVideoMode = true mIsInVideoMode = true
closeCamera() closeCamera()
openCamera(mTextureView.width, mTextureView.height) openCamera(mTextureView.width, mTextureView.height)