forked from upstream-mirrors/OpenTracks
Restored functionality: sensor name/address is shown AFTER connecting.
This commit is contained in:
@@ -44,7 +44,7 @@ public class AltitudeChangeHandler extends SensorHandler<AtmosphericPressure, Al
|
|||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
@Override
|
@Override
|
||||||
public AggregatorBarometer createAggregator() {
|
public AggregatorBarometer createAggregator(String sensorAddress, String sensorName) {
|
||||||
return new AggregatorBarometer("", null);
|
return new AggregatorBarometer(sensorAddress, sensorName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,8 +27,8 @@ public class CyclingCadenceHandler extends SensorHandler<CyclingCadenceBluetooth
|
|||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
@Override
|
@Override
|
||||||
protected AggregatorCyclingCadence createAggregator() {
|
protected AggregatorCyclingCadence createAggregator(String sensorAddress, String sensorName) {
|
||||||
return new AggregatorCyclingCadence("", null);
|
return new AggregatorCyclingCadence(sensorAddress, sensorName);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -27,8 +27,8 @@ public class CyclingDistanceSpeedHandler extends SensorHandler<CyclingDistanceSp
|
|||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
@Override
|
@Override
|
||||||
protected AggregatorCyclingDistanceSpeed createAggregator() {
|
protected AggregatorCyclingDistanceSpeed createAggregator(String sensorAddress, String sensorName) {
|
||||||
return new AggregatorCyclingDistanceSpeed("", null);
|
return new AggregatorCyclingDistanceSpeed(sensorAddress, sensorName);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -27,8 +27,8 @@ public class CyclingPowerHandler extends SensorHandler<CyclingPowerBluetooth.Dat
|
|||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
@Override
|
@Override
|
||||||
protected AggregatorCyclingPower createAggregator() {
|
protected AggregatorCyclingPower createAggregator(String sensorAddress, String sensorName) {
|
||||||
return new AggregatorCyclingPower("", null);
|
return new AggregatorCyclingPower(sensorAddress, sensorName);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -120,7 +120,7 @@ public class GpsManager implements DriverObserver<Location>, GpsStatusManager.Gp
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onConnect() {
|
public void onConnect(String sensorAddress, String sensorName) {
|
||||||
gpsStatusManager.onGpsEnabled();
|
gpsStatusManager.onGpsEnabled();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -27,8 +27,8 @@ public class HeartRateHandler extends SensorHandler<HeartRate, HeartRate> {
|
|||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
@Override
|
@Override
|
||||||
protected AggregatorHeartRate createAggregator() {
|
protected AggregatorHeartRate createAggregator(String sensorAddress, String sensorName) {
|
||||||
return new AggregatorHeartRate("", null);
|
return new AggregatorHeartRate(sensorAddress, sensorName);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+1
-1
@@ -26,7 +26,7 @@ public class RunningSpeedCadenceDistanceHandler extends SensorHandler<RunningSpe
|
|||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
@Override
|
@Override
|
||||||
protected AggregatorRunning createAggregator() {
|
protected AggregatorRunning createAggregator(String sensorAddress, String sensorName) {
|
||||||
return new AggregatorRunning("", null);
|
return new AggregatorRunning("", null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -25,8 +25,8 @@ public abstract class SensorHandler<AggregatorInput, AggregatorOutput> {
|
|||||||
|
|
||||||
protected final DriverObserver<AggregatorInput> driverObserver = new DriverObserver<>() {
|
protected final DriverObserver<AggregatorInput> driverObserver = new DriverObserver<>() {
|
||||||
@Override
|
@Override
|
||||||
public void onConnect() {
|
public void onConnect(String sensorAddress, String sensorName) {
|
||||||
SensorHandler.this.aggregator = createAggregator();
|
SensorHandler.this.aggregator = createAggregator(sensorAddress, sensorName);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -89,7 +89,7 @@ public abstract class SensorHandler<AggregatorInput, AggregatorOutput> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
protected abstract Aggregator<AggregatorInput, AggregatorOutput> createAggregator();
|
protected abstract Aggregator<AggregatorInput, AggregatorOutput> createAggregator(String sensorAddress, String sensorName);
|
||||||
|
|
||||||
protected abstract int getSensorPreferenceKey();
|
protected abstract int getSensorPreferenceKey();
|
||||||
|
|
||||||
|
|||||||
@@ -27,8 +27,8 @@ public class TemperatureHandler extends SensorHandler<Temperature, Temperature>
|
|||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
@Override
|
@Override
|
||||||
protected AggregatorTemperature createAggregator() {
|
protected AggregatorTemperature createAggregator(String sensorAddress, String sensorName) {
|
||||||
return new AggregatorTemperature("", null);
|
return new AggregatorTemperature(sensorAddress, sensorName);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ public class BarometerInternal implements Driver {
|
|||||||
|
|
||||||
if (sensorManager.registerListener(sensorEventListener, pressureSensor, SAMPLING_PERIOD, handler)) {
|
if (sensorManager.registerListener(sensorEventListener, pressureSensor, SAMPLING_PERIOD, handler)) {
|
||||||
this.context = context;
|
this.context = context;
|
||||||
observer.onConnect();
|
observer.onConnect(null, null);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -166,7 +166,7 @@ public class BluetoothDriver<T> implements Driver {
|
|||||||
|
|
||||||
bluetoothGatt = device.connectGatt(context, false, connectCallback, BluetoothDevice.TRANSPORT_AUTO, 0, handler);
|
bluetoothGatt = device.connectGatt(context, false, connectCallback, BluetoothDevice.TRANSPORT_AUTO, 0, handler);
|
||||||
|
|
||||||
observer.onConnect(); //TODO pass device.getAddress(), device.getName()
|
observer.onConnect(device.getAddress(), device.getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
private synchronized void clearData() {
|
private synchronized void clearData() {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ package de.dennisguse.opentracks.sensors.driver;
|
|||||||
|
|
||||||
|
|
||||||
public interface DriverObserver<T> {
|
public interface DriverObserver<T> {
|
||||||
void onConnect();
|
void onConnect(String sensorAddress, String sensorName);
|
||||||
|
|
||||||
void onDisconnect();
|
void onDisconnect();
|
||||||
|
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ public class GpsInternal implements Driver {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onProviderEnabled(@NonNull String provider) {
|
public void onProviderEnabled(@NonNull String provider) {
|
||||||
driverObserver.onConnect();
|
driverObserver.onConnect(null, provider);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user