refactor(wearos-lib): extend from base record and remove already incl…

…uded features
GeoTecINIT · Jul 26, 2022 · 909a1f3 · 909a1f3
1 parent 1e3f757
commit 909a1f3
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 102 deletions.
diff --git a/...-app/wearossensors/src/main/java/es/uji/geotec/wearossensors/records/HeartRateRecord.java b/...-app/wearossensors/src/main/java/es/uji/geotec/wearossensors/records/HeartRateRecord.java
@@ -1,11 +1,14 @@
 package es.uji.geotec.wearossensors.records;
 
+import es.uji.geotec.backgroundsensors.record.Record;
+import es.uji.geotec.wearossensors.sensor.WearSensor;
+
 public class HeartRateRecord extends Record {
 
     private int value;
 
     public HeartRateRecord(long timestamp, int value) {
-        super(timestamp);
+        super(WearSensor.HEART_RATE, timestamp);
         this.value = value;
     }
 

diff --git a/wear-app/wearossensors/src/main/java/es/uji/geotec/wearossensors/records/LocationRecord.java b/wear-app/wearossensors/src/main/java/es/uji/geotec/wearossensors/records/LocationRecord.java
@@ -2,21 +2,24 @@
 
 import android.location.Location;
 
+import es.uji.geotec.backgroundsensors.record.Record;
+import es.uji.geotec.wearossensors.sensor.WearSensor;
+
 public class LocationRecord extends Record {
 
     private double latitude;
     private double longitude;
     private double altitude;
 
     public LocationRecord(long timestamp, double latitude, double longitude, double altitude) {
-        super(timestamp);
+        super(WearSensor.LOCATION, timestamp);
         this.latitude = latitude;
         this.longitude = longitude;
         this.altitude = altitude;
     }
 
     public LocationRecord(Location location) {
-        super(location.getTime());
+        super(WearSensor.LOCATION, location.getTime());
         this.latitude = location.getLatitude();
         this.longitude = location.getLongitude();
         this.altitude = location.getAltitude();

diff --git a/wear-app/wearossensors/src/main/java/es/uji/geotec/wearossensors/records/Record.java b/wear-app/wearossensors/src/main/java/es/uji/geotec/wearossensors/records/Record.java
diff --git a/wear-app/wearossensors/src/main/java/es/uji/geotec/wearossensors/records/TriAxialRecord.java b/wear-app/wearossensors/src/main/java/es/uji/geotec/wearossensors/records/TriAxialRecord.java
diff --git a/...sors/src/main/java/es/uji/geotec/wearossensors/records/accumulator/RecordAccumulator.java b/...sors/src/main/java/es/uji/geotec/wearossensors/records/accumulator/RecordAccumulator.java
diff --git a/.../main/java/es/uji/geotec/wearossensors/records/accumulator/RecordAccumulatorProvider.java b/.../main/java/es/uji/geotec/wearossensors/records/accumulator/RecordAccumulatorProvider.java
diff --git a/...s/src/main/java/es/uji/geotec/wearossensors/records/callbacks/AbstractRecordCallback.java b/...s/src/main/java/es/uji/geotec/wearossensors/records/callbacks/AbstractRecordCallback.java
@@ -4,10 +4,11 @@
 
 import java.util.List;
 
+import es.uji.geotec.backgroundsensors.record.Record;
+import es.uji.geotec.backgroundsensors.record.callback.RecordCallback;
 import es.uji.geotec.wearossensors.messaging.MessagingClient;
-import es.uji.geotec.wearossensors.records.Record;
 
-public abstract class AbstractRecordCallback<T extends Record> {
+public abstract class AbstractRecordCallback<T extends Record> implements RecordCallback<T> {
 
     private MessagingClient messagingClient;
     private String requesterId;
@@ -19,6 +20,7 @@ public AbstractRecordCallback(Context context, String requesterId, String sendin
         this.sendingPath = sendingPath;
     }
 
+    @Override
     public void onRecordsCollected(List<T> records) {
         byte[] recordsEncoded = encodeRecords(records);
         this.messagingClient.sendNewRecord(requesterId, sendingPath, recordsEncoded);

diff --git a/...s/src/main/java/es/uji/geotec/wearossensors/records/callbacks/RecordCallbackProvider.java b/...s/src/main/java/es/uji/geotec/wearossensors/records/callbacks/RecordCallbackProvider.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 
-import es.uji.geotec.wearossensors.sensoring.WearSensor;
+import es.uji.geotec.wearossensors.sensor.WearSensor;
 
 public class RecordCallbackProvider {
     private RecordCallbackProvider() {

diff --git a/...s/src/main/java/es/uji/geotec/wearossensors/records/callbacks/TriAxialRecordCallback.java b/...s/src/main/java/es/uji/geotec/wearossensors/records/callbacks/TriAxialRecordCallback.java
@@ -5,7 +5,7 @@
 import java.nio.ByteBuffer;
 import java.util.List;
 
-import es.uji.geotec.wearossensors.records.TriAxialRecord;
+import es.uji.geotec.backgroundsensors.record.TriAxialRecord;
 
 
 public class TriAxialRecordCallback extends AbstractRecordCallback<TriAxialRecord> {