mirror of
https://github.com/SimpleMobileTools/Simple-Camera.git
synced 2025-02-17 03:40:38 +01:00
removing a redundant function
This commit is contained in:
parent
410822bd38
commit
184f87aab1
@ -97,7 +97,6 @@ class MainActivity : SimpleActivity(), PreviewListener, PhotoProcessor.MediaSave
|
|||||||
mFadeHandler.removeCallbacksAndMessages(null)
|
mFadeHandler.removeCallbacksAndMessages(null)
|
||||||
|
|
||||||
hideTimer()
|
hideTimer()
|
||||||
mPreview?.releaseCamera()
|
|
||||||
mOrientationEventListener.disable()
|
mOrientationEventListener.disable()
|
||||||
|
|
||||||
if (mPreview?.getCameraState() == STATE_PICTURE_TAKEN) {
|
if (mPreview?.getCameraState() == STATE_PICTURE_TAKEN) {
|
||||||
@ -108,7 +107,6 @@ class MainActivity : SimpleActivity(), PreviewListener, PhotoProcessor.MediaSave
|
|||||||
|
|
||||||
override fun onDestroy() {
|
override fun onDestroy() {
|
||||||
super.onDestroy()
|
super.onDestroy()
|
||||||
mPreview?.releaseCamera()
|
|
||||||
mPreview = null
|
mPreview = null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -17,8 +17,6 @@ interface MyPreview {
|
|||||||
|
|
||||||
fun getCameraState(): Int
|
fun getCameraState(): Int
|
||||||
|
|
||||||
fun releaseCamera()
|
|
||||||
|
|
||||||
fun showChangeResolutionDialog()
|
fun showChangeResolutionDialog()
|
||||||
|
|
||||||
fun toggleFrontBackCamera()
|
fun toggleFrontBackCamera()
|
||||||
|
@ -115,7 +115,9 @@ class PreviewCameraOne : ViewGroup, SurfaceHolder.Callback, MyPreview {
|
|||||||
|
|
||||||
override fun onResumed() {}
|
override fun onResumed() {}
|
||||||
|
|
||||||
override fun onPaused() {}
|
override fun onPaused() {
|
||||||
|
releaseCamera()
|
||||||
|
}
|
||||||
|
|
||||||
override fun tryInitVideoMode() {
|
override fun tryInitVideoMode() {
|
||||||
if (mIsSurfaceCreated) {
|
if (mIsSurfaceCreated) {
|
||||||
@ -502,7 +504,7 @@ class PreviewCameraOne : ViewGroup, SurfaceHolder.Callback, MyPreview {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun releaseCamera() {
|
fun releaseCamera() {
|
||||||
stopRecording()
|
stopRecording()
|
||||||
mCamera?.stopPreview()
|
mCamera?.stopPreview()
|
||||||
mCamera?.release()
|
mCamera?.release()
|
||||||
|
@ -403,9 +403,6 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie
|
|||||||
|
|
||||||
override fun getCameraState() = mCameraState
|
override fun getCameraState() = mCameraState
|
||||||
|
|
||||||
override fun releaseCamera() {
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun showChangeResolutionDialog() {
|
override fun showChangeResolutionDialog() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user