tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] LocationComponent animator throttling tests and examples

Browse Source
This commit is contained in:
Łukasz Paczos
2019-01-28 18:32:31 +01:00
committed by Łukasz Paczos
parent 953e6dca5b
commit f897f128e6
11 changed files with 451 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinator.java
View File

@@ -5,11 +5,13 @@ import android.location.Location;
import android.os.SystemClock;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
import android.util.SparseArray;
import android.view.animation.LinearInterpolator;
import com.mapbox.mapboxsdk.camera.CameraPosition;
import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.log.Logger;
import com.mapbox.mapboxsdk.maps.MapboxMap;
import com.mapbox.mapboxsdk.maps.Projection;
@@ -34,6 +36,9 @@ import static com.mapbox.mapboxsdk.location.Utils.immediateAnimation;
final class LocationAnimatorCoordinator {
private static final String TAG = "Mbgl-LocationAnimatorCoordinator";
@VisibleForTesting
final SparseArray<MapboxAnimator> animatorArray = new SparseArray<>();
private final Projection projection;
@@ -42,29 +47,28 @@ final class LocationAnimatorCoordinator {
private float previousCompassBearing = -1;
private long locationUpdateTimestamp = -1;
private float durationMultiplier;
private final MapboxAnimatorProvider animatorProvider;
private final MapboxAnimatorSetProvider animatorSetProvider;
private boolean compassAnimationEnabled;
private boolean accuracyAnimationEnabled;
private int maxAnimationFps = Integer.MAX_VALUE;
private MapboxAnimator.AnimationsValueChangeListener[] listeners;
@VisibleForTesting
int maxAnimationFps = Integer.MAX_VALUE;
LocationAnimatorCoordinator(@NonNull Projection projection, @NonNull MapboxAnimatorSetProvider animatorSetProvider) {
@VisibleForTesting
final SparseArray<MapboxAnimator.AnimationsValueChangeListener> listeners = new SparseArray<>();
LocationAnimatorCoordinator(@NonNull Projection projection, @NonNull MapboxAnimatorSetProvider animatorSetProvider,
@NonNull MapboxAnimatorProvider animatorProvider) {
this.projection = projection;
this.animatorProvider = animatorProvider;
this.animatorSetProvider = animatorSetProvider;
}
void updateAnimatorListenerHolders(@NonNull Set<AnimatorListenerHolder> listenerHolders) {
int maxIndex = 0;
listeners.clear();
for (AnimatorListenerHolder holder : listenerHolders) {
if (holder.getAnimatorType() > maxIndex) {
maxIndex = holder.getAnimatorType();
}
}
listeners = new MapboxAnimator.AnimationsValueChangeListener[maxIndex + 1];
for (AnimatorListenerHolder holder : listenerHolders) {
listeners[holder.getAnimatorType()] = holder.getListener();
listeners.append(holder.getAnimatorType(), holder.getListener());
}
}
@@ -229,26 +233,26 @@ final class LocationAnimatorCoordinator {
private void createNewLatLngAnimator(@MapboxAnimator.Type int animatorType, LatLng previous, LatLng target) {
cancelAnimator(animatorType);
MapboxAnimator.AnimationsValueChangeListener listener = listeners[animatorType];
MapboxAnimator.AnimationsValueChangeListener listener = listeners.get(animatorType);
if (listener != null) {
animatorArray.put(animatorType, new MapboxLatLngAnimator(previous, target, listener, maxAnimationFps));
animatorArray.put(animatorType, animatorProvider.latLngAnimator(previous, target, listener, maxAnimationFps));
}
}
private void createNewFloatAnimator(@MapboxAnimator.Type int animatorType, float previous, float target) {
cancelAnimator(animatorType);
MapboxAnimator.AnimationsValueChangeListener listener = listeners[animatorType];
MapboxAnimator.AnimationsValueChangeListener listener = listeners.get(animatorType);
if (listener != null) {
animatorArray.put(animatorType, new MapboxFloatAnimator(previous, target, listener, maxAnimationFps));
animatorArray.put(animatorType, animatorProvider.floatAnimator(previous, target, listener, maxAnimationFps));
}
}
private void createNewCameraAdapterAnimator(@MapboxAnimator.Type int animatorType, float previous, float target,
@Nullable MapboxMap.CancelableCallback cancelableCallback) {
cancelAnimator(animatorType);
MapboxAnimator.AnimationsValueChangeListener listener = listeners[animatorType];
MapboxAnimator.AnimationsValueChangeListener listener = listeners.get(animatorType);
if (listener != null) {
animatorArray.put(animatorType, new MapboxCameraAnimatorAdapter(previous, target, listener, cancelableCallback));
animatorArray.put(animatorType, animatorProvider.cameraAnimator(previous, target, listener, cancelableCallback));
}
}
@@ -379,6 +383,7 @@ final class LocationAnimatorCoordinator {
void setMaxAnimationFps(int maxAnimationFps) {
if (maxAnimationFps <= 0) {
Logger.e(TAG, "Max animation FPS cannot be less or equal to 0.");
return;
}
this.maxAnimationFps = maxAnimationFps;

3
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java
View File

@@ -1021,7 +1021,8 @@ public final class LocationComponent {
locationAnimatorCoordinator = new LocationAnimatorCoordinator(
mapboxMap.getProjection(),
MapboxAnimatorSetProvider.getInstance()
MapboxAnimatorSetProvider.getInstance(),
MapboxAnimatorProvider.getInstance()
);
locationAnimatorCoordinator.setTrackingAnimationDurationMultiplier(options
.trackingAnimationDurationMultiplier());

2
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimator.java
View File

@@ -45,7 +45,7 @@ abstract class MapboxAnimator<K> extends ValueAnimator implements ValueAnimator.
private final K target;
private K animatedValue;
private double minUpdateInterval;
private final double minUpdateInterval;
private long timeElapsed;
MapboxAnimator(@NonNull K previous, @NonNull K target, @NonNull AnimationsValueChangeListener<K> updateListener,

40
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimatorProvider.java Normal file
View File

@@ -0,0 +1,40 @@
package com.mapbox.mapboxsdk.location;
import android.support.annotation.Nullable;
import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.maps.MapboxMap;
final class MapboxAnimatorProvider {
private static MapboxAnimatorProvider INSTANCE;
private MapboxAnimatorProvider() {
// private constructor
}
public static MapboxAnimatorProvider getInstance() {
if (INSTANCE == null) {
INSTANCE = new MapboxAnimatorProvider();
}
return INSTANCE;
}
MapboxLatLngAnimator latLngAnimator(LatLng previous, LatLng target,
MapboxAnimator.AnimationsValueChangeListener updateListener,
int maxAnimationFps) {
return new MapboxLatLngAnimator(previous, target, updateListener, maxAnimationFps);
}
MapboxFloatAnimator floatAnimator(Float previous, Float target,
MapboxAnimator.AnimationsValueChangeListener updateListener,
int maxAnimationFps) {
return new MapboxFloatAnimator(previous, target, updateListener, maxAnimationFps);
}
MapboxCameraAnimatorAdapter cameraAnimator(Float previous, Float target,
MapboxAnimator.AnimationsValueChangeListener updateListener,
@Nullable MapboxMap.CancelableCallback cancelableCallback) {
return new MapboxCameraAnimatorAdapter(previous, target, updateListener, cancelableCallback);
}
}