fenix/Simple-Camera
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git synced 2025-06-27 09:02:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

catching some exceptions

Browse Source
This commit is contained in:
tibbi
2019-04-07 23:16:40 +02:00
parent b1a0bddc4a
commit 966e2c5a36
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/kotlin/com/simplemobiletools/camera/views/CameraPreview.kt
View File

@ -731,15 +731,15 @@ class CameraPreview : ViewGroup, TextureView.SurfaceTextureListener, MyPreview {
try { try {
mPreviewRequestBuilder!!.apply { mPreviewRequestBuilder!!.apply {
set(CaptureRequest.CONTROL_AF_TRIGGER, CameraMetadata.CONTROL_AF_TRIGGER_IDLE) set(CaptureRequest.CONTROL_AF_TRIGGER, CameraMetadata.CONTROL_AF_TRIGGER_IDLE)
mCaptureSession!!.capture(build(), mCaptureCallback, mBackgroundHandler) mCaptureSession?.capture(build(), mCaptureCallback, mBackgroundHandler)
} }
mCameraState = STATE_PREVIEW mCameraState = STATE_PREVIEW
mCaptureSession!!.setRepeatingRequest(mPreviewRequest, mCaptureCallback, mBackgroundHandler) mCaptureSession?.setRepeatingRequest(mPreviewRequest, mCaptureCallback, mBackgroundHandler)
if (mLastFocusX != 0f && mLastFocusY != 0f) { if (mLastFocusX != 0f && mLastFocusY != 0f) {
focusArea(mLastFocusX, mLastFocusY, false) focusArea(mLastFocusX, mLastFocusY, false)
} }
} catch (e: CameraAccessException) { } catch (e: Exception) {
} finally { } finally {
mCameraState = STATE_PREVIEW mCameraState = STATE_PREVIEW
} }
@ -816,9 +816,13 @@ class CameraPreview : ViewGroup, TextureView.SurfaceTextureListener, MyPreview {
surfaces.add(previewSurface) surfaces.add(previewSurface)
mPreviewRequestBuilder!!.addTarget(previewSurface) mPreviewRequestBuilder!!.addTarget(previewSurface)
try {
val recorderSurface = mMediaRecorder!!.surface val recorderSurface = mMediaRecorder!!.surface
surfaces.add(recorderSurface) surfaces.add(recorderSurface)
mPreviewRequestBuilder!!.addTarget(recorderSurface) mPreviewRequestBuilder!!.addTarget(recorderSurface)
} catch (e: Exception) {
mActivity.showErrorToast(e)
}
val captureCallback = object : CameraCaptureSession.StateCallback() { val captureCallback = object : CameraCaptureSession.StateCallback() {
override fun onConfigured(session: CameraCaptureSession?) { override fun onConfigured(session: CameraCaptureSession?) {