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

[android] save location state

Browse Source
This commit is contained in:
Łukasz Paczos
2018-09-05 13:38:12 +02:00
committed by Łukasz Paczos
parent fa3f6f055c
commit cf7752c80c
7 changed files with 117 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
View File

@@ -132,6 +132,7 @@ public final class MapboxMap {
outState.putBoolean(MapboxConstants.STATE_DEBUG_ACTIVE, nativeMapView.getDebug());
outState.putString(MapboxConstants.STATE_STYLE_URL, nativeMapView.getStyleUrl());
uiSettings.onSaveInstanceState(outState);
locationLayerPlugin.onSaveInstanceState(outState);
}
/**
@@ -156,6 +157,7 @@ public final class MapboxMap {
if (!TextUtils.isEmpty(styleUrl)) {
nativeMapView.setStyleUrl(savedInstanceState.getString(MapboxConstants.STATE_STYLE_URL));
}
locationLayerPlugin.onRestoreInstanceState(savedInstanceState);
}
/**

10
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/plugins/locationlayer/LocationLayerConstants.java
View File

@@ -5,6 +5,12 @@ package com.mapbox.mapboxsdk.plugins.locationlayer;
*/
final class LocationLayerConstants {
static final String STATE_LOCATION_ENABLED = "mapbox_location_locationEnabled";
static final String STATE_LOCATION_OPTIONS = "mapbox_location_options";
static final String STATE_LOCATION_LAST_LOCATION = "mapbox_location_lastLocation";
static final String STATE_LOCATION_RENDER_MODE = "mapbox_location_renderMode";
static final String STATE_LOCATION_CAMERA_MODE = "mapbox_location_cameraMode";
// Controls the compass update rate in milliseconds
static final int COMPASS_UPDATE_RATE_MS = 500;
@@ -18,10 +24,10 @@ final class LocationLayerConstants {
static final long ACCURACY_RADIUS_ANIMATION_DURATION = 250;
// Default animation duration for zooming while tracking.
static final long DEFAULT_TRACKING_ZOOM_ANIMATION_DURATION = 750;
static final long DEFAULT_TRACKING_ZOOM_ANIM_DURATION = 750;
// Default animation duration for tilting while tracking.
static final long DEFAULT_TRACKING_TILT_ANIMATION_DURATION = 1250;
static final long DEFAULT_TRACKING_TILT_ANIM_DURATION = 1250;
// Sources
static final String LOCATION_SOURCE = "mapbox-location-source";

56
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/plugins/locationlayer/LocationLayerPlugin.java
View File

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
import android.content.Context;
import android.hardware.SensorManager;
import android.location.Location;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.RequiresPermission;
@@ -31,8 +32,13 @@ import java.util.concurrent.CopyOnWriteArrayList;
import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
import static android.Manifest.permission.ACCESS_FINE_LOCATION;
import static com.mapbox.mapboxsdk.plugins.locationlayer.LocationLayerConstants.DEFAULT_TRACKING_TILT_ANIMATION_DURATION;
import static com.mapbox.mapboxsdk.plugins.locationlayer.LocationLayerConstants.DEFAULT_TRACKING_ZOOM_ANIMATION_DURATION;
import static com.mapbox.mapboxsdk.plugins.locationlayer.LocationLayerConstants.DEFAULT_TRACKING_TILT_ANIM_DURATION;
import static com.mapbox.mapboxsdk.plugins.locationlayer.LocationLayerConstants.DEFAULT_TRACKING_ZOOM_ANIM_DURATION;
import static com.mapbox.mapboxsdk.plugins.locationlayer.LocationLayerConstants.STATE_LOCATION_CAMERA_MODE;
import static com.mapbox.mapboxsdk.plugins.locationlayer.LocationLayerConstants.STATE_LOCATION_ENABLED;
import static com.mapbox.mapboxsdk.plugins.locationlayer.LocationLayerConstants.STATE_LOCATION_LAST_LOCATION;
import static com.mapbox.mapboxsdk.plugins.locationlayer.LocationLayerConstants.STATE_LOCATION_OPTIONS;
import static com.mapbox.mapboxsdk.plugins.locationlayer.LocationLayerConstants.STATE_LOCATION_RENDER_MODE;
/**
* The Location layer plugin provides location awareness to your mobile application. Enabling this
@@ -59,6 +65,16 @@ import static com.mapbox.mapboxsdk.plugins.locationlayer.LocationLayerConstants.
* When instantiating the plugin for the first time, the map's max/min zoom levels will be set to
* {@link LocationLayerOptions#MAX_ZOOM_DEFAULT} and {@link LocationLayerOptions#MIN_ZOOM_DEFAULT} respectively.
* You can adjust the zoom range with {@link LocationLayerOptions#maxZoom()} and {@link LocationLayerOptions#minZoom()}.
* <p>
* When an activity, or a fragment, that contains the plugin is destroyed and recreated,
* the plugin will restore its state, which is:
* <br/>
* - If the plugin was enabled, last location will be displayed.
* You still need to activate the plugin, or just provide the {@link LocationEngine}.
* <br/>
* - {@link CameraMode} and {@link RenderMode} will be restored.
* <br/>
* - {@link LocationLayerOptions} will be restored.
*/
public final class LocationLayerPlugin {
private static final String TAG = "Mbgl-LocationLayerPlugin";
@@ -265,9 +281,9 @@ public final class LocationLayerPlugin {
* @param cameraMode one of the modes found in {@link CameraMode}
*/
public void setCameraMode(@CameraMode.Mode int cameraMode) {
locationLayerCamera.setCameraMode(cameraMode);
boolean isGpsNorth = cameraMode == CameraMode.TRACKING_GPS_NORTH;
pluginAnimatorCoordinator.resetAllCameraAnimations(mapboxMap.getCameraPosition(), isGpsNorth);
locationLayerCamera.setCameraMode(cameraMode);
}
/**
@@ -387,7 +403,7 @@ public final class LocationLayerPlugin {
* @param zoomLevel The desired zoom level.
*/
public void zoomWhileTracking(double zoomLevel) {
zoomWhileTracking(zoomLevel, DEFAULT_TRACKING_ZOOM_ANIMATION_DURATION, null);
zoomWhileTracking(zoomLevel, DEFAULT_TRACKING_ZOOM_ANIM_DURATION, null);
}
/**
@@ -445,7 +461,7 @@ public final class LocationLayerPlugin {
* @param tilt The desired camera tilt.
*/
public void tiltWhileTracking(double tilt) {
tiltWhileTracking(tilt, DEFAULT_TRACKING_TILT_ANIMATION_DURATION, null);
tiltWhileTracking(tilt, DEFAULT_TRACKING_TILT_ANIM_DURATION, null);
}
/**
@@ -665,6 +681,28 @@ public final class LocationLayerPlugin {
isPluginStarted = false;
}
/**
* Internal use.
*/
public void onSaveInstanceState(@NonNull Bundle outState) {
outState.putBoolean(STATE_LOCATION_ENABLED, isEnabled);
outState.putParcelable(STATE_LOCATION_OPTIONS, options);
outState.putInt(STATE_LOCATION_RENDER_MODE, locationLayer.getRenderMode());
outState.putInt(STATE_LOCATION_CAMERA_MODE, locationLayerCamera.getCameraMode());
outState.putParcelable(STATE_LOCATION_LAST_LOCATION, lastLocation);
}
/**
* Internal use.
*/
public void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
updateLocation(savedInstanceState.getParcelable(STATE_LOCATION_LAST_LOCATION), true);
setCameraMode(savedInstanceState.getInt(STATE_LOCATION_CAMERA_MODE));
setRenderMode(savedInstanceState.getInt(STATE_LOCATION_RENDER_MODE));
applyStyle(savedInstanceState.getParcelable(STATE_LOCATION_OPTIONS));
setLocationLayerEnabled(savedInstanceState.getBoolean(STATE_LOCATION_ENABLED));
}
/**
* Internal use.
*/
@@ -772,6 +810,14 @@ public final class LocationLayerPlugin {
}
private void initializeLocationEngine(@NonNull Context context) {
if (this.locationEngine != null) {
if (usingInternalLocationEngine) {
this.locationEngine.removeLocationUpdates();
this.locationEngine.deactivate();
}
this.locationEngine.removeLocationEngineListener(locationEngineListener);
}
usingInternalLocationEngine = true;
locationEngine = new LocationEngineProvider(context).obtainBestLocationEngineAvailable();
locationEngine.setPriority(LocationEnginePriority.HIGH_ACCURACY);