fix sensor data collection interval error

awareframework · Apr 16, 2018 · 7381cd3 · 7381cd3
1 parent bea9cec
commit 7381cd3
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 12 deletions.
diff --git a/library/src/main/java/com/awareframework/android/sensor/accelerometer/Accelerometer.kt b/library/src/main/java/com/awareframework/android/sensor/accelerometer/Accelerometer.kt
@@ -32,6 +32,7 @@ class Accelerometer private constructor(
         const val ACTION_AWARE_ACCELEROMETER_STOP = "com.aware.android.sensor.accelerometer.SENSOR_STOP"
         const val ACTION_AWARE_ACCELEROMETER_LABEL = "com.aware.android.sensor.accelerometer.SET_LABEL"
         const val ACTION_AWARE_ACCELEROMETER_SYNC = "com.aware.android.sensor.accelerometer.SYNC"
+        const val ACTION_AWARE_ACCELEROMETER_SYNC_SENT = "com.aware.android.sensor.accelerometer.SYNC_SENT"
 
         const val EXTRA_AWARE_ACCELEROMETER_LABEL = "label"
 
@@ -124,6 +125,13 @@ class Accelerometer private constructor(
          * @param sensorObserver callback for live data updates.
          */
         fun setSensorObserver(sensorObserver: SensorObserver) = apply { config.sensorObserver = sensorObserver }
+        fun setSensorObserver(callback: (type: String, data: Any?, error: Any?) -> Unit) = apply {
+            config.sensorObserver = object : SensorObserver {
+                override fun onDataChanged(type: String, data: Any?, error: Any?) {
+                    callback(type, data, error)
+                }
+            }
+        }
 
         /**
          * @param deviceId id of the device that will be associated with the events and the sensor. (default = "")

diff --git a/library/src/main/java/com/awareframework/android/sensor/accelerometer/AccelerometerSensor.kt b/library/src/main/java/com/awareframework/android/sensor/accelerometer/AccelerometerSensor.kt
@@ -21,8 +21,13 @@ import com.awareframework.android.sensor.accelerometer.model.AccelerometerEvent
 import java.util.TimeZone
 import kotlin.collections.ArrayList
 
-private fun logd(msg: String) { if (AccelerometerSensor.CONFIG.debug) Log.d(AccelerometerSensor.TAG, msg) }
-private fun logw(msg: String) { Log.w(AccelerometerSensor.TAG, msg) }
+private fun logd(msg: String) {
+    if (AccelerometerSensor.CONFIG.debug) Log.d(AccelerometerSensor.TAG, msg)
+}
+
+private fun logw(msg: String) {
+    Log.w(AccelerometerSensor.TAG, msg)
+}
 
 /**
  * Implementation of Aware accelerometer in kotlin as a standalone service.
@@ -103,7 +108,7 @@ class AccelerometerSensor : AwareSensor(), SensorEventListener {
         } else {
             saveAccelerometerDevice(mAccelerometer)
 
-            val samplingPeriodUs = if(CONFIG.interval > 0) 1000000 / CONFIG.interval else 0
+            val samplingPeriodUs = if (CONFIG.interval > 0) 1000000 / CONFIG.interval else 0
             mSensorManager.registerListener(this, mAccelerometer, samplingPeriodUs, sensorHandler)
             lastSavedAt = System.currentTimeMillis()
 
@@ -129,23 +134,23 @@ class AccelerometerSensor : AwareSensor(), SensorEventListener {
     }
 
     override fun onSensorChanged(event: SensorEvent) {
-        if (event.timestamp - lastTimestamp < CONFIG.interval / 1000) {
+        val currentTime = System.currentTimeMillis()
+        if (currentTime - lastTimestamp < (900.0 / CONFIG.interval)) {
             // skip this event
             return
         }
-        lastTimestamp = event.timestamp
+        lastTimestamp = currentTime
 
-        if (lastValues != null && CONFIG.threshold > 0
-                && Math.abs(event.values[0] - lastValues!![0]) < CONFIG.threshold
-                && Math.abs(event.values[1] - lastValues!![1]) < CONFIG.threshold
-                && Math.abs(event.values[2] - lastValues!![2]) < CONFIG.threshold) {
+        if (CONFIG.threshold > 0
+                && Math.abs(event.values[0] - lastValues[0]) < CONFIG.threshold
+                && Math.abs(event.values[1] - lastValues[1]) < CONFIG.threshold
+                && Math.abs(event.values[2] - lastValues[2]) < CONFIG.threshold) {
             return
         }
-        lastValues.forEachIndexed { index, fl ->
+        lastValues.forEachIndexed { index, _ ->
             lastValues[index] = event.values[index]
         }
 
-        val currentTime = System.currentTimeMillis()
         val data = AccelerometerEvent().apply {
             timestamp = currentTime
             eventTimestamp = event.timestamp
@@ -187,6 +192,8 @@ class AccelerometerSensor : AwareSensor(), SensorEventListener {
     override fun onSync(intent: Intent?) {
         dbEngine?.startSync(AccelerometerEvent.TABLE_NAME)
         dbEngine?.startSync(AccelerometerDevice.TABLE_NAME, DbSyncConfig(removeAfterSync = false))
+
+        sendBroadcast(Intent(Accelerometer.ACTION_AWARE_ACCELEROMETER_SYNC_SENT))
     }
 
     override fun onDestroy() {
@@ -256,7 +263,7 @@ class AccelerometerSensor : AwareSensor(), SensorEventListener {
             }
         }
 
-        fun getIntentFilter() : IntentFilter {
+        fun getIntentFilter(): IntentFilter {
             val intentFilter = IntentFilter()
 //            intentFilter.addAction(Accelerometer.ACTION_AWARE_ACCELEROMETER_START)
 //            intentFilter.addAction(Accelerometer.ACTION_AWARE_ACCELEROMETER_STOP)