pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Modified geofencing mode

Browse source
This commit is contained in:
Dmitry Donskoy 2018-12-21 16:43:16 +03:00 • committed by Aleksandr Zatsepin
parent 532f0fedf2
commit f2b419269a
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
android/src/com/mapswithme/maps/geofence/GeofenceRegistryImpl.java
View file

@ -9,6 +9,7 @@ import com.google.android.gms.location.Geofence;
import com.google.android.gms.location.GeofencingClient;
import com.google.android.gms.location.GeofencingRequest;
import com.google.android.gms.location.LocationServices;
import com.mapswithme.maps.LightFramework;
import com.mapswithme.maps.MwmApplication;
import com.mapswithme.maps.location.LocationPermissionNotGrantedException;
import com.mapswithme.util.PermissionsUtils;
@ -23,7 +24,6 @@ import java.util.concurrent.TimeUnit;
public class GeofenceRegistryImpl implements GeofenceRegistry
{
public static final String GEOFENCE_FEATURES_EXTRA = "geofence_features";
private static final int GEOFENCE_MAX_COUNT = 100;
private static final int GEOFENCE_TTL_IN_DAYS = 3;
private static final float PREFERRED_GEOFENCE_RADIUS = 100.0f;
@ -48,9 +48,10 @@ public class GeofenceRegistryImpl implements GeofenceRegistry
checkThread();
checkPermission();
List<GeoFenceFeature> features = Arrays.asList(new GeoFenceFeature(1, "a", 2, location.getLat(), location.getLon()));/*LightFramework.getLocalAdsFeatures(
location.getLat(), location.getLon(), location.getRadiusInMeters(), GEOFENCE_MAX_COUNT);*/
List<GeoFenceFeature> features = LightFramework.getLocalAdsFeatures(
location.getLat(), location.getLon(), location.getRadiusInMeters(), GEOFENCE_MAX_COUNT);
LOG.d(TAG, "GeoFenceFeatures = " + Arrays.toString(features.toArray()));
if (features.isEmpty())
return;
List<Geofence> geofences = new ArrayList<>();
@ -60,8 +61,7 @@ public class GeofenceRegistryImpl implements GeofenceRegistry
.setRequestId(each.getId().toString())
.setCircularRegion(each.getLatitude(), each.getLongitude(), PREFERRED_GEOFENCE_RADIUS)
.setExpirationDuration(TimeUnit.DAYS.toMillis(GEOFENCE_TTL_IN_DAYS))
.setLoiteringDelay(1)
.setTransitionTypes(Geofence.GEOFENCE_TRANSITION_DWELL)
.setTransitionTypes(Geofence.GEOFENCE_TRANSITION_ENTER | Geofence.GEOFENCE_TRANSITION_EXIT)
.build();
geofences.add(geofence);
}
@ -127,7 +127,7 @@ public class GeofenceRegistryImpl implements GeofenceRegistry
private GeofencingRequest makeGeofencingRequest(@NonNull List<Geofence> geofences)
{
GeofencingRequest.Builder builder = new GeofencingRequest.Builder();
return builder.setInitialTrigger(GeofencingRequest.INITIAL_TRIGGER_DWELL)
return builder.setInitialTrigger(GeofencingRequest.INITIAL_TRIGGER_ENTER)
.addGeofences(geofences)
.build();
}

2
android/src/com/mapswithme/maps/geofence/GeofenceTransitionsIntentService.java
View file

@ -50,7 +50,7 @@ public class GeofenceTransitionsIntentService extends JobIntentService
{
int transitionType = geofencingEvent.getGeofenceTransition();
if (transitionType == Geofence.GEOFENCE_TRANSITION_DWELL)
if (transitionType == Geofence.GEOFENCE_TRANSITION_ENTER)
onGeofenceEnter(geofencingEvent);
else if (transitionType == Geofence.GEOFENCE_TRANSITION_EXIT)
onGeofenceExit(geofencingEvent);