Merge pull request #4 from Haydart/connection

Motion sensor incident reporting

Author: Haydart

app/src/main/java/pl/rmakowiecki/smartalarmcore/AlarmController.kt

@@ -8,8 +8,8 @@ import pl.rmakowiecki.smartalarmcore.extensions.logD
 import pl.rmakowiecki.smartalarmcore.peripheral.AlarmTriggerPeripheralDevice
 import pl.rmakowiecki.smartalarmcore.peripheral.camera.CameraPeripheryContract
 import pl.rmakowiecki.smartalarmcore.remote.AlarmBackendContract
-import pl.rmakowiecki.smartalarmcore.remote.AlarmTriggerReason
-import pl.rmakowiecki.smartalarmcore.remote.SecurityIncident
+import pl.rmakowiecki.smartalarmcore.remote.models.AlarmTriggerReason
+import pl.rmakowiecki.smartalarmcore.remote.models.SecurityIncident
 import pl.rmakowiecki.smartalarmcore.setup.UsbSetupProviderContract
 
 class AlarmController(
@@ -55,7 +55,7 @@ class AlarmController(
             observeBeamBreakDetector()
             observeMotionSensor()
         }
-        else -> {
+        AlarmArmingState.DISARMED -> {
             beamBreakDetectorDisposable.dispose()
             motionSensorDisposable.dispose()
         }
@@ -70,7 +70,7 @@ class AlarmController(
                             onNext = {
                                 updateAlarmTriggerState(it)
                                 if (it == TRIGGERED) {
-                                    reportBeamBreakIncident()
+                                    reportAlarmIncident(AlarmTriggerReason.BEAM_BREAK_DETECTOR)
                                 }
                             }
                     )
@@ -83,15 +83,24 @@ class AlarmController(
                     .registerForChanges()
                     .applyIoSchedulers()
                     .subscribeBy(
-                            onNext = { /*logD(it)*/ }
+                            onNext = {
+                                updateAlarmTriggerState(it)
+                                if (it == TRIGGERED) {
+                                    reportAlarmIncident(AlarmTriggerReason.MOTION_SENSOR)
+                                }
+                            }
                     )
         }
     }
 
-    private fun updateAlarmTriggerState(alarmTriggerState: AlarmTriggerState)
-            = backendInteractor.updateAlarmState(alarmTriggerState)
+    private fun updateAlarmTriggerState(alarmTriggerState: AlarmTriggerState) = backendInteractor
+            .updateAlarmState(alarmTriggerState)
+            .applyIoSchedulers()
+            .subscribeBy(
+                    onSuccess = { logD("Updating trigger value on server successful") }
+            )
 
-    private fun reportBeamBreakIncident() {
+    private fun reportAlarmIncident(reason: AlarmTriggerReason) {
         val reportTimestamp = System.currentTimeMillis()
 
         val cameraPhotoObservable = camera.capturePhoto()
@@ -100,7 +109,7 @@ class AlarmController(
         cameraPhotoObservable.subscribeBy(onNext = { logD("camera photo taken") })
 
         backendInteractor
-                .reportSecurityIncident(SecurityIncident(AlarmTriggerReason.BEAM_BREAK_DETECTOR, reportTimestamp))
+                .reportSecurityIncident(SecurityIncident(reason, reportTimestamp))
                 .flatMapObservable { incidentModel ->
                     cameraPhotoObservable
                             .flatMapSingle { (photo, photoNumber) ->

app/src/main/java/pl/rmakowiecki/smartalarmcore/peripheral/camera/CameraPeriphery.kt

@@ -19,8 +19,8 @@ import java.util.*
 private const val PHOTO_WIDTH = 1920
 private const val PHOTO_HEIGHT = 1080
 private const val PHOTO_MAX_COUNT = 10
-private const val PHOHOS_IN_SEQUENCE = 10
-private const val PHOTO_SEQUENCE_INTERVAL = 250
+private const val PHOTOS_IN_SEQUENCE = 10
+private const val PHOTO_SEQUENCE_INTERVAL = 250L
 
 class CameraPeriphery(private var context: Context?) : CameraPeripheryContract {
 
@@ -69,29 +69,26 @@ class CameraPeriphery(private var context: Context?) : CameraPeripheryContract {
         override fun onCaptureCompleted(session: CameraCaptureSession?, request: CaptureRequest?, result: TotalCaptureResult?) {
             super.onCaptureCompleted(session, request, result)
 
-            session?.close()
-            logD("CaptureSession closed")
+            logD("picture taken")
+
+            if (photosEmittedInSequence < PHOTOS_IN_SEQUENCE) {
+                Thread.sleep(PHOTO_SEQUENCE_INTERVAL)
+                triggerImageCapture()
+            } else {
+                session?.close()
+                logD("CaptureSession closed")
+            }
         }
     }
 
     private fun triggerImageCapture() {
         try {
-            val captureBuilder = cameraDevice?.createCaptureRequest(CameraDevice.TEMPLATE_ZERO_SHUTTER_LAG)
+            val captureBuilder = cameraDevice?.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE)
             captureBuilder?.addTarget(imageReadProcessor?.surface)
             captureBuilder?.set(CaptureRequest.CONTROL_AE_MODE, CaptureRequest.CONTROL_AE_MODE_ON)
 
             logD("Session initialized.")
 
-            val cameraRequests = mutableListOf<CaptureRequest>()
-            (1..10).map {
-                val request = cameraDevice?.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE)
-                request?.addTarget(imageReadProcessor?.surface)
-                request?.set(CaptureRequest.CONTROL_AE_MODE, CaptureRequest.CONTROL_AE_MODE_ON)
-                request?.build()
-
-            }.forEach { cameraRequests.add(it!!) }
-
-//            cameraCaptureSession?.captureBurst(cameraRequests, cameraCaptureCallback, null) CANNOT BE INTERLEAVED
             cameraCaptureSession?.capture(captureBuilder?.build(), cameraCaptureCallback, null)
         } catch (cameraAccessException: CameraAccessException) {
             printStackTrace(cameraAccessException)
@@ -126,7 +123,7 @@ class CameraPeriphery(private var context: Context?) : CameraPeripheryContract {
             imageReadProcessor?.setOnImageAvailableListener(
                     { reader -> processTakenImage(reader) },
                     backgroundHandler)
-            cameraDevice?.createCaptureSession(Collections.singletonList(imageReadProcessor?.surface), cameraSessionCallback, null)
+            cameraDevice?.createCaptureSession(Collections.singletonList(imageReadProcessor?.surface), cameraSessionCallback, backgroundHandler)
         } catch (cameraAccessException: CameraAccessException) {
             printStackTrace(cameraAccessException)
         }
@@ -154,8 +151,8 @@ class CameraPeriphery(private var context: Context?) : CameraPeripheryContract {
     private fun compressTakenImage(imageBytes: ByteArray): ByteArray {
         val bitmap = BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.size)
         val outputStream = ByteArrayOutputStream()
-        bitmap.compress(Bitmap.CompressFormat.JPEG, 90, outputStream)
-        return outputStream.toByteArray()
+        bitmap?.compress(Bitmap.CompressFormat.JPEG, 90, outputStream)
+        return outputStream.toByteArray() ?: imageBytes
     }
 
     override fun closeCamera() {

app/src/main/java/pl/rmakowiecki/smartalarmcore/remote/AlarmBackendContract.kt

@@ -5,12 +5,14 @@ import io.reactivex.Single
 import pl.rmakowiecki.smartalarmcore.AlarmActivity
 import pl.rmakowiecki.smartalarmcore.AlarmArmingState
 import pl.rmakowiecki.smartalarmcore.AlarmTriggerState
+import pl.rmakowiecki.smartalarmcore.remote.models.SecurityIncident
+import pl.rmakowiecki.smartalarmcore.remote.models.SecurityIncidentResponse
 
 interface AlarmBackendContract {
     fun isLoggedInToBackend(): Single<Boolean>
     fun signInToBackend(): Single<Boolean>
     fun observeAlarmArmingState(): Observable<AlarmArmingState>
-    fun updateAlarmState(alarmState: AlarmTriggerState)
+    fun updateAlarmState(alarmState: AlarmTriggerState): Single<Boolean>
     fun reportSecurityIncident(securityIncident: SecurityIncident): Single<SecurityIncidentResponse>
     fun uploadIncidentPhoto(photoBytes: ByteArray, uniqueIncidentId: String, photoNumber: Int): Single<Boolean>
 

app/src/main/java/pl/rmakowiecki/smartalarmcore/remote/AlarmBackendInteractor.kt

@@ -17,11 +17,13 @@ import pl.rmakowiecki.smartalarmcore.AlarmTriggerState
 import pl.rmakowiecki.smartalarmcore.extensions.logD
 import pl.rmakowiecki.smartalarmcore.extensions.printStackTrace
 import pl.rmakowiecki.smartalarmcore.remote.Nodes.ALARM_ARMING
+import pl.rmakowiecki.smartalarmcore.remote.Nodes.ALARM_SETTINGS
 import pl.rmakowiecki.smartalarmcore.remote.Nodes.ALARM_STATE
 import pl.rmakowiecki.smartalarmcore.remote.Nodes.ALARM_TRIGGER
 import pl.rmakowiecki.smartalarmcore.remote.Nodes.CORE_DEVICE_DIRECTORY
 import pl.rmakowiecki.smartalarmcore.remote.Nodes.IMAGES_DIRECTORY
 import pl.rmakowiecki.smartalarmcore.remote.Nodes.PRESENCE_NODE
+import pl.rmakowiecki.smartalarmcore.remote.models.*
 import pl.rmakowiecki.smartalarmcore.toArmingState
 
 class AlarmBackendInteractor(private val activity: AlarmActivity) : AlarmBackendContract {
@@ -75,8 +77,13 @@ class AlarmBackendInteractor(private val activity: AlarmActivity) : AlarmBackend
 
         databaseNode.child(getCurrentBackendUser()?.uid)
                 .child(ALARM_STATE)
-                .setValue(RemoteAlarmStateModel(true, false, true))
-                .addOnSuccessListener { emitter.onSuccess(true) }
+                .setValue(RemoteAlarmStateModel.createDefault())
+                .addOnCompleteListener {
+                    databaseNode.child(getCurrentBackendUser()?.uid)
+                            .child(ALARM_SETTINGS)
+                            .setValue(CameraSequenceSettingsModel.createDefault())
+                            .addOnSuccessListener { emitter.onSuccess(true) }
+                }
     }
 
     override fun isLoggedInToBackend(): Single<Boolean> =
@@ -103,12 +110,12 @@ class AlarmBackendInteractor(private val activity: AlarmActivity) : AlarmBackend
         }
     }
 
-    override fun updateAlarmState(alarmState: AlarmTriggerState) {
+    override fun updateAlarmState(alarmState: AlarmTriggerState): Single<Boolean> = Single.create { emitter ->
         databaseNode.child(getCurrentBackendUser()?.uid)
                 .child(ALARM_STATE)
                 .child(ALARM_TRIGGER)
                 .setValue(alarmState.toBoolean())
-                .addOnCompleteListener { }
+                .addOnCompleteListener { emitter.onSuccess(it.isSuccessful) }
     }
 
     override fun reportSecurityIncident(securityIncident: SecurityIncident): Single<SecurityIncidentResponse> = Single.create { emitter ->
@@ -126,7 +133,6 @@ class AlarmBackendInteractor(private val activity: AlarmActivity) : AlarmBackend
     }
 
     override fun uploadIncidentPhoto(photoBytes: ByteArray, uniqueIncidentId: String, photoNumber: Int): Single<Boolean> = Single.create { emitter ->
-
         storageNode.child(CORE_DEVICE_DIRECTORY)
                 .child(IMAGES_DIRECTORY)
                 .child(getCurrentBackendUser()?.uid ?: "non_assignable_incidents")
@@ -136,15 +142,4 @@ class AlarmBackendInteractor(private val activity: AlarmActivity) : AlarmBackend
     }
 }
 
-private fun DataSnapshot.getArmingState() = (this.value as Boolean).toArmingState()
-
-class RemoteAlarmStateModel(
-        val active: Boolean,
-        val triggered: Boolean,
-        val connected: Boolean
-)
-
-class SecurityIncidentResponse(
-        val isSuccessful: Boolean,
-        val generatedId: String
-)
+private fun DataSnapshot.getArmingState() = (this.value as Boolean).toArmingState()

app/src/main/java/pl/rmakowiecki/smartalarmcore/remote/Constants.kt

@@ -4,6 +4,7 @@ object Nodes {
     const val ALARM_TRIGGER = "triggered"
     const val ALARM_ARMING = "active"
     const val ALARM_STATE = "state"
+    const val ALARM_SETTINGS = "settings"
     const val CORE_DEVICE_DIRECTORY = "core_assets"
     const val IMAGES_DIRECTORY = "images"
     const val INCIDENTS = "incidents"

app/src/main/java/pl/rmakowiecki/smartalarmcore/remote/AlarmTriggerReason.kt renamed to app/src/main/java/pl/rmakowiecki/smartalarmcore/remote/models/AlarmTriggerReason.kt

@@ -1,4 +1,4 @@
-package pl.rmakowiecki.smartalarmcore.remote
+package pl.rmakowiecki.smartalarmcore.remote.models
 
 enum class AlarmTriggerReason {
     BEAM_BREAK_DETECTOR,

app/src/main/java/pl/rmakowiecki/smartalarmcore/remote/models/CameraSequenceSettingsModel.kt

@@ -0,0 +1,10 @@
+package pl.rmakowiecki.smartalarmcore.remote.models
+
+class CameraSequenceSettingsModel(
+        val sessionPhotoCount: Int,
+        val photoSequenceIntervalMillis: Int) {
+
+    companion object {
+        fun createDefault() = CameraSequenceSettingsModel(20, 250)
+    }
+}

app/src/main/java/pl/rmakowiecki/smartalarmcore/remote/models/RemoteAlarmStateModel.kt

@@ -0,0 +1,11 @@
+package pl.rmakowiecki.smartalarmcore.remote.models
+
+class RemoteAlarmStateModel(
+        val active: Boolean,
+        val triggered: Boolean,
+        val connected: Boolean) {
+
+    companion object {
+        fun createDefault() = RemoteAlarmStateModel(true, false, true)
+    }
+}

app/src/main/java/pl/rmakowiecki/smartalarmcore/remote/RemoteSecurityIncident.kt renamed to app/src/main/java/pl/rmakowiecki/smartalarmcore/remote/models/RemoteSecurityIncident.kt

@@ -1,4 +1,4 @@
-package pl.rmakowiecki.smartalarmcore.remote
+package pl.rmakowiecki.smartalarmcore.remote.models
 
 class RemoteSecurityIncident private constructor(
         val reason: AlarmTriggerReason,

app/src/main/java/pl/rmakowiecki/smartalarmcore/remote/SecurityIncident.kt renamed to app/src/main/java/pl/rmakowiecki/smartalarmcore/remote/models/SecurityIncident.kt

@@ -1,4 +1,4 @@
-package pl.rmakowiecki.smartalarmcore.remote
+package pl.rmakowiecki.smartalarmcore.remote.models
 
 class SecurityIncident(
         val reason: AlarmTriggerReason,