Myzel394/Alibi
1
0
Fork 0
mirror of https://github.com/Myzel394/Alibi.git synced 2025-06-18 23:05:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fix recorder states

Browse Source
This commit is contained in:
Myzel394 2023-12-15 19:40:46 +01:00
parent 3d355df522
commit 4be2fc52e2
No known key found for this signature in database
GPG Key ID: 79CC92F37B3E1A2B
6 changed files with 51 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/app/myzel394/alibi/services/IntervalRecorderService.kt
View File

@ -38,6 +38,7 @@ abstract class IntervalRecorderService<S : IntervalRecorderService.Settings, I>
}
override fun start() {
super.start()
batchesFolder.initFolders()
if (!batchesFolder.checkIfFolderIsAccessible()) {
onCustomOutputFolderNotAccessible()
@ -48,10 +49,12 @@ abstract class IntervalRecorderService<S : IntervalRecorderService.Settings, I>
}
override fun pause() {
super.pause()
cycleTimer.shutdown()
}
override fun resume() {
super.resume()
createTimer()
}

37
app/src/main/java/app/myzel394/alibi/services/RecorderService.kt
View File

@ -39,21 +39,27 @@ abstract class RecorderService : LifecycleService() {
var recordingTime = 0L
private set
protected abstract fun start()
protected abstract fun pause()
// TODO: Move pause / recording here
protected abstract fun resume()
protected open suspend fun stop() {
protected open fun start() {
createRecordingTimeTimer()
}
override fun onDestroy() {
protected open fun pause() {
isPaused = true
recordingTimeTimer.shutdown()
}
protected open fun resume() {
createRecordingTimeTimer()
}
protected open suspend fun stop() {
recordingTimeTimer.shutdown()
NotificationManagerCompat.from(this)
.cancel(NotificationHelper.RECORDER_CHANNEL_NOTIFICATION_ID)
stopForeground(STOP_FOREGROUND_REMOVE)
stopSelf()
super.onDestroy()
}
protected abstract fun startForegroundService()
@ -141,20 +147,9 @@ abstract class RecorderService : LifecycleService() {
isPaused = false
}
// `start` is handled by `startRecording`
createRecordingTimeTimer()
}
RecorderState.PAUSED -> {
isPaused = true
recordingTimeTimer.shutdown()
pause()
}
RecorderState.STOPPED -> {
recordingTimeTimer.shutdown()
}
RecorderState.PAUSED -> pause()
else -> {}
}

7
app/src/main/java/app/myzel394/alibi/services/VideoRecorderService.kt
View File

@ -33,8 +33,6 @@ import kotlinx.coroutines.withContext
import kotlinx.coroutines.withTimeoutOrNull
import kotlin.properties.Delegates
const val CAMERA_CLOSE_TIMEOUT = 20000L
class VideoRecorderService :
IntervalRecorderService<VideoRecorderService.Settings, RecordingInformation>() {
override var batchesFolder: BatchesFolder = VideoBatchesFolder.viaInternalFolder(this)
@ -238,7 +236,10 @@ class VideoRecorderService :
type = RecordingInformation.Type.VIDEO,
)
// TODO: Save camera selector as it doesn't make sense to change the camera midway
companion object {
const val CAMERA_CLOSE_TIMEOUT = 20000L
}
data class Settings(
override val maxDuration: Long,
override val intervalDuration: Long,

28
app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/organisms/VideoRecordingStatus.kt
View File

@ -77,20 +77,22 @@ fun VideoRecordingStatus(
horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier.padding(bottom = 32.dp),
) {
val cameraControl = videoRecorder.recorderService!!.cameraControl!!
if (cameraControl.hasTorchAvailable()) {
val isTorchEnabled = cameraControl.isTorchEnabled()
if (!videoRecorder.isStartingRecording) {
val cameraControl = videoRecorder.recorderService!!.cameraControl!!
if (cameraControl.hasTorchAvailable()) {
val isTorchEnabled = cameraControl.isTorchEnabled()
TorchStatus(
enabled = isTorchEnabled,
onChange = {
if (isTorchEnabled) {
cameraControl.disableTorch()
} else {
cameraControl.enableTorch()
}
},
)
TorchStatus(
enabled = isTorchEnabled,
onChange = {
if (isTorchEnabled) {
cameraControl.disableTorch()
} else {
cameraControl.enableTorch()
}
},
)
}
}
Divider()

11
app/src/main/java/app/myzel394/alibi/ui/models/BaseRecorderModel.kt
View File

@ -77,6 +77,8 @@ abstract class BaseRecorderModel<S : IntervalRecorderService.Settings, I, T : In
}
override fun onServiceDisconnected(arg0: ComponentName) {
// `onServiceDisconnected` is called when the connection is unexpectedly lost,
// so we need to make sure to manually call `reset` to clean up in other places
reset()
}
}
@ -135,8 +137,13 @@ abstract class BaseRecorderModel<S : IntervalRecorderService.Settings, I, T : In
recorderService!!.stopRecording()
val intent = Intent(context, intentClass)
context.unbindService(connection)
context.stopService(intent)
runCatching {
context.unbindService(connection)
}
runCatching {
context.stopService(intent)
}
reset()
}
fun pauseRecording() {

5
app/src/main/java/app/myzel394/alibi/ui/models/VideoRecorderModel.kt
View File

@ -25,7 +25,10 @@ class VideoRecorderModel :
var cameraID by mutableIntStateOf(CameraInfo.Lens.BACK.androidValue)
override val isInRecording: Boolean
get() = super.isInRecording && recorderService!!.cameraControl != null
get() = super.isInRecording
val isStartingRecording: Boolean
get() = recorderService?.cameraControl == null
val cameraSelector: CameraSelector
get() = CameraSelector.Builder().requireLensFacing(cameraID).build()