forked from upstream-mirrors/OpenTracks
TrackRecordingService: simplify altitude and remoteSensor handling.
This commit is contained in:
@@ -7,9 +7,11 @@ import android.hardware.SensorEventListener;
|
||||
import android.hardware.SensorManager;
|
||||
import android.util.Log;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
|
||||
import de.dennisguse.opentracks.content.data.TrackPoint;
|
||||
import de.dennisguse.opentracks.util.PressureSensorUtils;
|
||||
|
||||
/**
|
||||
@@ -62,6 +64,11 @@ public class AltitudeSumManager implements SensorEventListener {
|
||||
this.isConnected = isConnected;
|
||||
}
|
||||
|
||||
public void fill(@NonNull TrackPoint trackPoint) {
|
||||
trackPoint.setAltitudeGain(altitudeGain_m);
|
||||
trackPoint.setAltitudeLoss(altitudeLoss_m);
|
||||
}
|
||||
|
||||
public @Nullable
|
||||
Float getAltitudeGain_m() {
|
||||
return isConnected ? altitudeGain_m : null;
|
||||
|
||||
+9
-1
@@ -22,10 +22,13 @@ import android.content.Context;
|
||||
import android.content.SharedPreferences;
|
||||
import android.util.Log;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
import java.time.Duration;
|
||||
|
||||
import de.dennisguse.opentracks.R;
|
||||
import de.dennisguse.opentracks.content.data.Distance;
|
||||
import de.dennisguse.opentracks.content.data.TrackPoint;
|
||||
import de.dennisguse.opentracks.content.sensor.SensorData;
|
||||
import de.dennisguse.opentracks.content.sensor.SensorDataCycling;
|
||||
import de.dennisguse.opentracks.content.sensor.SensorDataSet;
|
||||
@@ -158,7 +161,12 @@ public class BluetoothRemoteSensorManager implements BluetoothConnectionManager.
|
||||
}
|
||||
}
|
||||
|
||||
public SensorDataSet getSensorData() {
|
||||
public void fill(@NonNull TrackPoint trackPoint) {
|
||||
sensorDataSet.fillTrackPoint(trackPoint);
|
||||
}
|
||||
|
||||
public SensorDataSet getSensorDataSet() {
|
||||
// TODO Should return a copy.
|
||||
return sensorDataSet;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user