Skip to content

C
cordova-plugin-background-geolocation
Commit bda025f2 authored by Chris Scott's avatar Chris Scott
Browse files
Options

Merge branch 'android'

parents ba81579e 569a6e81
Show whitespace changes
Inline Side-by-side
Showing with 259 additions and 153 deletions
src/android/BackgroundGpsPlugin.java
View file @ bda025f2
...@@ -21,6 +21,8 @@ public class BackgroundGpsPlugin extends CordovaPlugin { ...@@ -21,6 +21,8 @@ public class BackgroundGpsPlugin extends CordovaPlugin {
private Intent updateServiceIntent; private Intent updateServiceIntent;
private Boolean isEnabled = false;
private String authToken; private String authToken;
private String url; private String url;
private String stationaryRadius = "30"; private String stationaryRadius = "30";
...@@ -33,7 +35,8 @@ public class BackgroundGpsPlugin extends CordovaPlugin { ...@@ -33,7 +35,8 @@ public class BackgroundGpsPlugin extends CordovaPlugin {
Activity activity = this.cordova.getActivity(); Activity activity = this.cordova.getActivity();
Boolean result = false; Boolean result = false;
updateServiceIntent = new Intent(activity, LocationUpdateService.class); updateServiceIntent = new Intent(activity, LocationUpdateService.class);
if (ACTION_START.equalsIgnoreCase(action)) {
if (ACTION_START.equalsIgnoreCase(action) && !isEnabled) {
result = true; result = true;
if (authToken == null || url == null) { if (authToken == null || url == null) {
callbackContext.error("Call configure before calling start"); callbackContext.error("Call configure before calling start");
...@@ -49,8 +52,10 @@ public class BackgroundGpsPlugin extends CordovaPlugin { ...@@ -49,8 +52,10 @@ public class BackgroundGpsPlugin extends CordovaPlugin {
updateServiceIntent.putExtra("isDebugging", isDebugging); updateServiceIntent.putExtra("isDebugging", isDebugging);
activity.startService(updateServiceIntent); activity.startService(updateServiceIntent);
isEnabled = true;
} }
} else if (ACTION_STOP.equalsIgnoreCase(action)) { } else if (ACTION_STOP.equalsIgnoreCase(action)) {
isEnabled = false;
result = true; result = true;
activity.stopService(updateServiceIntent); activity.stopService(updateServiceIntent);
callbackContext.success(); callbackContext.success();
......
src/android/LocationUpdateService.java
View file @ bda025f2
...@@ -42,7 +42,6 @@ import android.os.SystemClock; ...@@ -42,7 +42,6 @@ import android.os.SystemClock;
import android.util.Log; import android.util.Log;
import android.widget.Toast; import android.widget.Toast;
import static android.app.PendingIntent.*;
import static android.telephony.PhoneStateListener.*; import static android.telephony.PhoneStateListener.*;
import static java.lang.Math.*; import static java.lang.Math.*;
...@@ -51,7 +50,9 @@ public class LocationUpdateService extends Service implements LocationListener { ...@@ -51,7 +50,9 @@ public class LocationUpdateService extends Service implements LocationListener {
private static final String STATIONARY_REGION_ACTION = "com.tenforwardconsulting.cordova.bgloc.STATIONARY_REGION_ACTION"; private static final String STATIONARY_REGION_ACTION = "com.tenforwardconsulting.cordova.bgloc.STATIONARY_REGION_ACTION";
private static final String STATIONARY_ALARM_ACTION = "com.tenforwardconsulting.cordova.bgloc.STATIONARY_ALARM_ACTION"; private static final String STATIONARY_ALARM_ACTION = "com.tenforwardconsulting.cordova.bgloc.STATIONARY_ALARM_ACTION";
private static final String SINGLE_LOCATION_UPDATE_ACTION = "com.tenforwardconsulting.cordova.bgloc.SINGLE_LOCATION_UPDATE_ACTION"; private static final String SINGLE_LOCATION_UPDATE_ACTION = "com.tenforwardconsulting.cordova.bgloc.SINGLE_LOCATION_UPDATE_ACTION";
private static long STATIONARY_TIMEOUT = 60 * 1000 * 1; private static long STATIONARY_TIMEOUT = 60 * 1000 * 2;
private static final Integer MAX_STATIONARY_ACQUISITION_ATTEMPTS = 3;
private static final Integer MAX_SPEED_ACQUISITION_ATTEMPTS = 3;
private PowerManager.WakeLock wakeLock; private PowerManager.WakeLock wakeLock;
private Location lastLocation; private Location lastLocation;
...@@ -63,6 +64,14 @@ public class LocationUpdateService extends Service implements LocationListener { ...@@ -63,6 +64,14 @@ public class LocationUpdateService extends Service implements LocationListener {
private float stationaryRadius; private float stationaryRadius;
private Location stationaryLocation; private Location stationaryLocation;
private PendingIntent stationaryAlarmPI; private PendingIntent stationaryAlarmPI;
private PendingIntent stationaryRegionPI;
private PendingIntent singleUpdatePI;
private Boolean isMoving = false;
private Boolean isAcquiringStationaryLocation = false;
private Boolean isAcquiringSpeed = false;
private Integer stationaryLocationAttempts = 0;
private Integer speedAcquisitionAttempts = 0;
private Integer desiredAccuracy; private Integer desiredAccuracy;
private Integer distanceFilter; private Integer distanceFilter;
...@@ -72,16 +81,11 @@ public class LocationUpdateService extends Service implements LocationListener { ...@@ -72,16 +81,11 @@ public class LocationUpdateService extends Service implements LocationListener {
private ToneGenerator toneGenerator; private ToneGenerator toneGenerator;
private PendingIntent proximityPI; private Criteria criteria;
private LocationManager locationManager; private LocationManager locationManager;
private AlarmManager alarmManager; private AlarmManager alarmManager;
private ConnectivityManager connectivityManager; private ConnectivityManager connectivityManager;
private Criteria criteria;
private Boolean isMoving = false;
public static TelephonyManager telephonyManager = null; public static TelephonyManager telephonyManager = null;
@Override @Override
...@@ -96,17 +100,28 @@ public class LocationUpdateService extends Service implements LocationListener { ...@@ -96,17 +100,28 @@ public class LocationUpdateService extends Service implements LocationListener {
super.onCreate(); super.onCreate();
Log.i(TAG, "OnCreate"); Log.i(TAG, "OnCreate");
PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
locationManager = (LocationManager)this.getSystemService(Context.LOCATION_SERVICE); locationManager = (LocationManager)this.getSystemService(Context.LOCATION_SERVICE);
alarmManager = (AlarmManager) this.getSystemService(Context.ALARM_SERVICE); alarmManager = (AlarmManager) this.getSystemService(Context.ALARM_SERVICE);
toneGenerator = new ToneGenerator(AudioManager.STREAM_NOTIFICATION, 100);
connectivityManager = (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
// Stop-detection PI
stationaryAlarmPI = PendingIntent.getBroadcast(this, 0, new Intent(STATIONARY_ALARM_ACTION), 0); stationaryAlarmPI = PendingIntent.getBroadcast(this, 0, new Intent(STATIONARY_ALARM_ACTION), 0);
registerReceiver(stationaryAlarmReceiver, new IntentFilter(STATIONARY_ALARM_ACTION)); registerReceiver(stationaryAlarmReceiver, new IntentFilter(STATIONARY_ALARM_ACTION));
connectivityManager = (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE); // Stationary region PI
stationaryRegionPI = PendingIntent.getBroadcast(this, 0, new Intent(STATIONARY_REGION_ACTION), PendingIntent.FLAG_CANCEL_CURRENT);
registerReceiver(stationaryRegionReceiver, new IntentFilter(STATIONARY_REGION_ACTION));
// One-shot PI (TODO currently unused)
singleUpdatePI = PendingIntent.getBroadcast(this, 0, new Intent(SINGLE_LOCATION_UPDATE_ACTION), PendingIntent.FLAG_UPDATE_CURRENT);
registerReceiver(singleUpdateReceiver, new IntentFilter(SINGLE_LOCATION_UPDATE_ACTION));
PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG); wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);
wakeLock.acquire(); wakeLock.acquire();
// Location criteria
criteria = new Criteria(); criteria = new Criteria();
criteria.setAltitudeRequired(false); criteria.setAltitudeRequired(false);
criteria.setBearingRequired(false); criteria.setBearingRequired(false);
...@@ -127,9 +142,6 @@ public class LocationUpdateService extends Service implements LocationListener { ...@@ -127,9 +142,6 @@ public class LocationUpdateService extends Service implements LocationListener {
locationTimeout = Integer.parseInt(intent.getStringExtra("locationTimeout")); locationTimeout = Integer.parseInt(intent.getStringExtra("locationTimeout"));
isDebugging = Boolean.parseBoolean(intent.getStringExtra("isDebugging")); isDebugging = Boolean.parseBoolean(intent.getStringExtra("isDebugging"));
if (isDebugging) {
toneGenerator = new ToneGenerator(AudioManager.STREAM_NOTIFICATION, 100);
}
Log.i(TAG, "- url: " + url); Log.i(TAG, "- url: " + url);
Log.i(TAG, "- token: " + authToken); Log.i(TAG, "- token: " + authToken);
Log.i(TAG, "- stationaryRadius: " + stationaryRadius); Log.i(TAG, "- stationaryRadius: " + stationaryRadius);
...@@ -137,40 +149,72 @@ public class LocationUpdateService extends Service implements LocationListener { ...@@ -137,40 +149,72 @@ public class LocationUpdateService extends Service implements LocationListener {
Log.i(TAG, "- desiredAccuracy: " + desiredAccuracy); Log.i(TAG, "- desiredAccuracy: " + desiredAccuracy);
Log.i(TAG, "- locationTimeout: " + locationTimeout); Log.i(TAG, "- locationTimeout: " + locationTimeout);
Log.i(TAG, "- isDebugging: " + isDebugging); Log.i(TAG, "- isDebugging: " + isDebugging);
}
Toast.makeText(this, "Background location tracking started", Toast.LENGTH_SHORT).show();
this.setPace(false); this.setPace(false);
}
/** /**
* Experimental cell-location-change handler * Experimental cell-location-change handler. Hoping to implement something like ios Significant Changes system
* *
telephonyManager = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE); telephonyManager = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
telephonyManager.listen(phoneStateListener, LISTEN_CELL_LOCATION); telephonyManager.listen(phoneStateListener, LISTEN_CELL_LOCATION);
* *
*/ */
//We want this service to continue running until it is explicitly //We want this service to continue running until it is explicitly stopped
// stopped, so return sticky.
return START_STICKY; return START_STICKY;
} }
public void onCellLocationChanged(CellLocation cellLocation) {
Log.i(TAG, "- onCellLocationChanged");
Location lastKnownLocation = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
Location location = getLastBestLocation((int) stationaryRadius, locationTimeout * 1000);
if (location != null) {
Log.i(TAG, "location: " + location.getLatitude() + "," + location.getLongitude() + ", accuracy: " + location.getAccuracy());
}
}
@Override @Override
public boolean stopService(Intent intent) { public boolean stopService(Intent intent) {
Log.i(TAG, "Received stop: " + intent); Log.i(TAG, "- Received stop: " + intent);
cleanUp(); cleanUp();
Toast.makeText(this, "Background location tracking stopped", Toast.LENGTH_SHORT).show(); Toast.makeText(this, "Background location tracking stopped", Toast.LENGTH_SHORT).show();
return super.stopService(intent); return super.stopService(intent);
} }
/**
*
* @param value set true to engage "aggressive", battery-consuming tracking, false for stationary-region tracking
*/
private void setPace(Boolean value) {
Log.i(TAG, "setPace: " + value);
Boolean wasMoving = isMoving;
isMoving = value;
isAcquiringStationaryLocation = false;
isAcquiringSpeed = false;
stationaryLocation = null;
locationManager.removeUpdates(this);
criteria.setAccuracy(Criteria.ACCURACY_FINE);
criteria.setHorizontalAccuracy(translateDesiredAccuracy(desiredAccuracy));
criteria.setPowerRequirement(Criteria.POWER_HIGH);
if (isMoving) {
// setPace can be called while moving, after distanceFilter has been recalculated. We don't want to re-acquire velocity in this case.
if (!wasMoving) {
isAcquiringSpeed = true;
speedAcquisitionAttempts = 0;
}
} else {
isAcquiringStationaryLocation = true;
stationaryLocationAttempts = 0;
}
// Temporarily turn on super-aggressive geolocation on all providers when acquiring velocity or stationary location.
if (isAcquiringSpeed || isAcquiringStationaryLocation) {
locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, this);
locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 0, 0, this);
} else {
locationManager.requestLocationUpdates(locationManager.getBestProvider(criteria, true), locationTimeout*1000, scaledDistanceFilter, this);
}
}
/**
* Translates a number representing desired accuracy of GeoLocation system from set [0, 10, 100, 1000].
* 0: most aggressive, most accurate, worst battery drain
* 1000: least aggressive, least accurate, best for battery.
*/
private Integer translateDesiredAccuracy(Integer accuracy) { private Integer translateDesiredAccuracy(Integer accuracy) {
switch (accuracy) { switch (accuracy) {
case 1000: case 1000:
...@@ -180,7 +224,7 @@ public class LocationUpdateService extends Service implements LocationListener { ...@@ -180,7 +224,7 @@ public class LocationUpdateService extends Service implements LocationListener {
accuracy = Criteria.ACCURACY_MEDIUM; accuracy = Criteria.ACCURACY_MEDIUM;
break; break;
case 10: case 10:
accuracy = Criteria.ACCURACY_MEDIUM; accuracy = Criteria.ACCURACY_HIGH;
break; break;
case 0: case 0:
accuracy = Criteria.ACCURACY_HIGH; accuracy = Criteria.ACCURACY_HIGH;
...@@ -191,44 +235,6 @@ public class LocationUpdateService extends Service implements LocationListener { ...@@ -191,44 +235,6 @@ public class LocationUpdateService extends Service implements LocationListener {
return accuracy; return accuracy;
} }
private void setPace(Boolean value) {
Log.i(TAG, "setPace: " + value);
isMoving = value;
locationManager.removeUpdates(this);
if (isMoving) {
stationaryLocation = null;
criteria.setAccuracy(Criteria.ACCURACY_FINE);
criteria.setHorizontalAccuracy(translateDesiredAccuracy(desiredAccuracy));
criteria.setPowerRequirement(Criteria.POWER_HIGH);
locationManager.requestLocationUpdates(locationManager.getBestProvider(criteria, true), locationTimeout*1000, scaledDistanceFilter, this);
// Configure stationary alarm timout. If no location update within configured timeout, tone-down tracking.
/*
if (stationaryAlarmPI != null) {
alarmManager.cancel(stationaryAlarmPI);
stationaryAlarmPI = null;
}
*/
resetStationaryAlarm();
} else {
stationaryLocation = null;
criteria.setAccuracy(Criteria.ACCURACY_COARSE);
criteria.setHorizontalAccuracy(Criteria.ACCURACY_LOW);
criteria.setPowerRequirement(Criteria.POWER_LOW);
Location location = this.getLastBestLocation((int) stationaryRadius, locationTimeout * 1000);
if (location != null) {
this.startMonitoringStationaryRegion(location);
}
}
}
public void resetStationaryAlarm() {
alarmManager.set(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + STATIONARY_TIMEOUT, stationaryAlarmPI); // Millisec * Second * Minute
}
/** /**
* Returns the most accurate and timely previously detected location. * Returns the most accurate and timely previously detected location.
* Where the last result is beyond the specified maximum distance or * Where the last result is beyond the specified maximum distance or
...@@ -265,21 +271,56 @@ public class LocationUpdateService extends Service implements LocationListener { ...@@ -265,21 +271,56 @@ public class LocationUpdateService extends Service implements LocationListener {
} }
} }
} }
// If the best result is beyond the allowed time limit, or the accuracy of the
// best result is wider than the acceptable maximum distance, request a single update.
// This check simply implements the same conditions we set when requesting regular
// location updates every [minTime] and [minDistance].
if ((bestTime < minTime || bestAccuracy > minDistance)) {
bestResult = null;
}
return bestResult; return bestResult;
} }
public void onLocationChanged(Location location) { public void onLocationChanged(Location location) {
Log.d(TAG, "- onLocationChanged: " + location.getLatitude() + "," + location.getLongitude() + ", accuracy: " + location.getAccuracy() + ", isMoving: " + isMoving + ", speed: " + location.getSpeed()); Log.d(TAG, "- onLocationChanged: " + location.getLatitude() + "," + location.getLongitude() + ", accuracy: " + location.getAccuracy() + ", isMoving: " + isMoving + ", speed: " + location.getSpeed());
if (isDebugging) { if (isDebugging) {
Toast.makeText(this, "mv:"+isMoving+",acy:"+location.getAccuracy()+",v:"+location.getSpeed()+",df:"+scaledDistanceFilter, Toast.LENGTH_LONG).show();
toneGenerator.startTone(ToneGenerator.TONE_PROP_BEEP); toneGenerator.startTone(ToneGenerator.TONE_PROP_BEEP);
} }
if (isMoving) { if (isAcquiringStationaryLocation) {
// If user hasn't moved beyond the stationaryRadius within time of STATIONARY_TIMEOUT if (stationaryLocation == null || stationaryLocation.getAccuracy() > location.getAccuracy()) {
// assume they've stopped. stationaryLocation = location;
if (lastLocation != null) { }
if (lastLocation.distanceTo(location) > stationaryRadius) { if (stationaryLocationAttempts++ == MAX_STATIONARY_ACQUISITION_ATTEMPTS || (stationaryLocation.getAccuracy() <= stationaryRadius) ) {
isAcquiringStationaryLocation = false;
startMonitoringStationaryRegion(stationaryLocation);
} else {
// Unacceptable stationary-location: bail-out and wait for another.
return;
}
} else if (isAcquiringSpeed) {
// Make *hoo* sound, acquiring speed.
if (isDebugging) {
toneGenerator.startTone(ToneGenerator.TONE_SUP_RADIO_ACK);
}
if (speedAcquisitionAttempts++ == MAX_SPEED_ACQUISITION_ATTEMPTS) {
// Got enough samples, assume we're confident in reported speed now. Play "woohoo" sound.
if (isDebugging) {
// @sound doodly-doo
toneGenerator.startTone(ToneGenerator.TONE_CDMA_ALERT_NETWORK_LITE);
}
isAcquiringSpeed = false;
scaledDistanceFilter = calculateDistanceFilter(location.getSpeed());
setPace(true);
} else {
return;
}
} else if (isMoving) {
// Only reset stationaryAlarm when speed is detected, prevents spurious locations from resetting when stopped.
if (location.getSpeed() > 0) {
resetStationaryAlarm(); resetStationaryAlarm();
}
// Calculate latest distanceFilter, if it changed by 5 m/s, we'll reconfigure our pace.
Integer newDistanceFilter = calculateDistanceFilter(location.getSpeed()); Integer newDistanceFilter = calculateDistanceFilter(location.getSpeed());
if (newDistanceFilter != scaledDistanceFilter) { if (newDistanceFilter != scaledDistanceFilter) {
Log.i(TAG, "- updated distanceFilter, new: " + newDistanceFilter + ", old: " + scaledDistanceFilter); Log.i(TAG, "- updated distanceFilter, new: " + newDistanceFilter + ", old: " + scaledDistanceFilter);
...@@ -287,16 +328,8 @@ public class LocationUpdateService extends Service implements LocationListener { ...@@ -287,16 +328,8 @@ public class LocationUpdateService extends Service implements LocationListener {
setPace(true); setPace(true);
} }
} }
} // Go ahead and cache, push to server
} else if (stationaryLocation == null) {
this.startMonitoringStationaryRegion(location);
}
lastLocation = location; lastLocation = location;
Log.d(TAG, "-------- persistLocation DISABLED");
// test the measurement to see if it is more accurate than the previous measurement
persistLocation(location); persistLocation(location);
if (this.isNetworkConnected()) { if (this.isNetworkConnected()) {
...@@ -307,6 +340,11 @@ public class LocationUpdateService extends Service implements LocationListener { ...@@ -307,6 +340,11 @@ public class LocationUpdateService extends Service implements LocationListener {
} }
} }
public void resetStationaryAlarm() {
alarmManager.cancel(stationaryAlarmPI);
alarmManager.set(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + STATIONARY_TIMEOUT, stationaryAlarmPI); // Millisec * Second * Minute
}
private Integer calculateDistanceFilter(Float speed) { private Integer calculateDistanceFilter(Float speed) {
Double newDistanceFilter = (double) distanceFilter; Double newDistanceFilter = (double) distanceFilter;
if (speed > 3 && speed < 100) { if (speed > 3 && speed < 100) {
...@@ -316,34 +354,82 @@ public class LocationUpdateService extends Service implements LocationListener { ...@@ -316,34 +354,82 @@ public class LocationUpdateService extends Service implements LocationListener {
return (newDistanceFilter.intValue() < 1000) ? newDistanceFilter.intValue() : 1000; return (newDistanceFilter.intValue() < 1000) ? newDistanceFilter.intValue() : 1000;
} }
private void startMonitoringStationaryRegion(Location location) { private void startMonitoringStationaryRegion(Location location) {
Log.i(TAG, "- startMonitoringStationaryRegion (" + location.getLatitude() + "," + location.getLongitude() + ")"); Log.i(TAG, "- startMonitoringStationaryRegion (" + location.getLatitude() + "," + location.getLongitude() + "), accuracy:" + location.getAccuracy());
stationaryLocation = location;
if (isDebugging) { if (isDebugging) {
// @sound "beeeeeeeeeeeeeeeeep"
toneGenerator.startTone(ToneGenerator.TONE_CDMA_ABBR_ALERT); toneGenerator.startTone(ToneGenerator.TONE_CDMA_ABBR_ALERT);
} }
stationaryLocation = location;
locationManager.removeUpdates(this);
if (proximityPI != null) { // Remove previous stationaryRegionPI just in case.
locationManager.removeProximityAlert(proximityPI); locationManager.removeProximityAlert(stationaryRegionPI);
proximityPI = null;
}
Intent intent = new Intent(STATIONARY_REGION_ACTION);
proximityPI = PendingIntent.getBroadcast(this, 0, intent, 0);
// Here be the execution of the stationary region monitor
locationManager.addProximityAlert( locationManager.addProximityAlert(
location.getLatitude(), location.getLatitude(),
location.getLongitude(), location.getLongitude(),
stationaryRadius, (location.getAccuracy() < stationaryRadius) ? stationaryRadius : location.getAccuracy(),
-1, -1,
proximityPI stationaryRegionPI
); );
}
IntentFilter filter = new IntentFilter(STATIONARY_REGION_ACTION); /**
registerReceiver(stationaryRegionReceiver, filter); * User has exit his stationary region! Initiate aggressive geolocation!
*/
public void onExitStationaryRegion() {
if (isDebugging) {
new ToneGenerator(AudioManager.STREAM_NOTIFICATION, 100).startTone(ToneGenerator.TONE_CDMA_CONFIRM);
} }
// There MUST be a valid, recent location if this event-handler was called.
Location location = getLastBestLocation((int) stationaryRadius, locationTimeout * 1000);
if (location != null) {
// Filter-out spurious region-exits: must have at least a little speed to move out of stationary-region.
if (location.getSpeed() < 0.75) {
return;
}
} else {
Log.i(TAG, "- exit stationary region receiver was triggered but could not fetch the last-best location!");
}
// Kill the current region-monitor we just walked out of.
locationManager.removeProximityAlert(stationaryRegionPI);
// Engage aggressive tracking.
this.setPace(true);
}
/**
* TODO Experimental cell-tower change system; something like ios significant changes.
*/
public void onCellLocationChanged(CellLocation cellLocation) {
Log.i(TAG, "- onCellLocationChanged");
Location location = getLastBestLocation((int) stationaryRadius, locationTimeout * 1000);
if (location != null) {
Log.i(TAG, "location: " + location.getLatitude() + "," + location.getLongitude() + ", accuracy: " + location.getAccuracy());
}
}
/**
* Broadcast receiver for receiving a single-update from LocationManager.
* UN-USED
*/
private BroadcastReceiver singleUpdateReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
unregisterReceiver(singleUpdateReceiver);
String key = LocationManager.KEY_LOCATION_CHANGED;
Location location = (Location)intent.getExtras().get(key);
if (location != null)
onLocationChanged(location);
locationManager.removeUpdates(singleUpdatePI);
}
};
/**
* Broadcast receiver which detcts a user has stopped for a long enough time to be determined as STOPPED
*/
private BroadcastReceiver stationaryAlarmReceiver = new BroadcastReceiver() { private BroadcastReceiver stationaryAlarmReceiver = new BroadcastReceiver() {
@Override @Override
public void onReceive(Context context, Intent intent) public void onReceive(Context context, Intent intent)
...@@ -353,7 +439,9 @@ public class LocationUpdateService extends Service implements LocationListener { ...@@ -353,7 +439,9 @@ public class LocationUpdateService extends Service implements LocationListener {
setPace(false); setPace(false);
} }
}; };
/**
* Broadcast receiver which detects a user has exit his circular stationary-region determined by the greater of stationaryLocation.getAccuracy() OR stationaryRadius
*/
private BroadcastReceiver stationaryRegionReceiver = new BroadcastReceiver() { private BroadcastReceiver stationaryRegionReceiver = new BroadcastReceiver() {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
...@@ -373,7 +461,9 @@ public class LocationUpdateService extends Service implements LocationListener { ...@@ -373,7 +461,9 @@ public class LocationUpdateService extends Service implements LocationListener {
} }
} }
}; };
/**
* TODO Experimental, hoping to implement some sort of "significant changes" system here like ios based upon cell-tower changes.
*/
private PhoneStateListener phoneStateListener = new PhoneStateListener() { private PhoneStateListener phoneStateListener = new PhoneStateListener() {
@Override @Override
public void onCellLocationChanged(CellLocation location) public void onCellLocationChanged(CellLocation location)
...@@ -382,17 +472,6 @@ public class LocationUpdateService extends Service implements LocationListener { ...@@ -382,17 +472,6 @@ public class LocationUpdateService extends Service implements LocationListener {
} }
}; };
public void onExitStationaryRegion() {
if (isDebugging) {
toneGenerator.startTone(ToneGenerator.TONE_CDMA_CONFIRM);
}
if (proximityPI != null) {
Log.i(TAG, "- proximityPI: " + proximityPI.toString());
locationManager.removeProximityAlert(proximityPI);
}
this.setPace(true);
}
public void onProviderDisabled(String provider) { public void onProviderDisabled(String provider) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
...@@ -432,10 +511,11 @@ public class LocationUpdateService extends Service implements LocationListener { ...@@ -432,10 +511,11 @@ public class LocationUpdateService extends Service implements LocationListener {
JSONObject location = new JSONObject(); JSONObject location = new JSONObject();
location.put("latitude", l.getLatitude()); location.put("latitude", l.getLatitude());
location.put("longitude", l.getLongitude()); location.put("longitude", l.getLongitude());
location.put("accuracy", l.getAccuracy());
location.put("speed", l.getSpeed());
location.put("recorded_at", l.getRecordedAt()); location.put("recorded_at", l.getRecordedAt());
params.put("location", location); params.put("location", location);
StringEntity se = new StringEntity(params.toString()); StringEntity se = new StringEntity(params.toString());
request.setEntity(se); request.setEntity(se);
request.setHeader("Accept", "application/json"); request.setHeader("Accept", "application/json");
...@@ -484,12 +564,12 @@ public class LocationUpdateService extends Service implements LocationListener { ...@@ -484,12 +564,12 @@ public class LocationUpdateService extends Service implements LocationListener {
} }
private void cleanUp() { private void cleanUp() {
locationManager.removeUpdates(this); locationManager.removeUpdates(this);
locationManager.removeProximityAlert(stationaryRegionPI);
alarmManager.cancel(stationaryAlarmPI);
unregisterReceiver(stationaryAlarmReceiver);
unregisterReceiver(stationaryRegionReceiver);
unregisterReceiver(singleUpdateReceiver);
// Stationary-region proximity-detector.
if (proximityPI != null) {
locationManager.removeProximityAlert(proximityPI);
proximityPI = null;
}
wakeLock.release(); wakeLock.release();
} }
......
src/android/data/Location.java
View file @ bda025f2
...@@ -9,6 +9,9 @@ public class Location { ...@@ -9,6 +9,9 @@ public class Location {
private String latitude; private String latitude;
private String longitude; private String longitude;
private Date recordedAt; private Date recordedAt;
private String accuracy;
private String speed;
private Long id; private Long id;
public Long getId() { public Long getId() {
...@@ -17,7 +20,6 @@ public class Location { ...@@ -17,7 +20,6 @@ public class Location {
public void setId(Long id) { public void setId(Long id) {
this.id = id; this.id = id;
} }
public String getLatitude() { public String getLatitude() {
return latitude; return latitude;
} }
...@@ -36,12 +38,26 @@ public class Location { ...@@ -36,12 +38,26 @@ public class Location {
public void setRecordedAt(Date recordedAt) { public void setRecordedAt(Date recordedAt) {
this.recordedAt = recordedAt; this.recordedAt = recordedAt;
} }
public String getAccuracy() {
return accuracy;
}
public void setAccuracy(String accuracy) {
this.accuracy = accuracy;
}
public String getSpeed() {
return speed;
}
public void setSpeed(String speed) {
this.speed = speed;
}
public static Location fromAndroidLocation(android.location.Location originalLocation) { public static Location fromAndroidLocation(android.location.Location originalLocation) {
Location location = new Location(); Location location = new Location();
location.setRecordedAt(new Date(originalLocation.getTime())); location.setRecordedAt(new Date(originalLocation.getTime()));
location.setLongitude(String.valueOf(originalLocation.getLongitude())); location.setLongitude(String.valueOf(originalLocation.getLongitude()));
location.setLatitude(String.valueOf(originalLocation.getLatitude())); location.setLatitude(String.valueOf(originalLocation.getLatitude()));
location.setAccuracy(String.valueOf(originalLocation.getAccuracy()));
location.setSpeed(String.valueOf(originalLocation.getSpeed()));
return location; return location;
} }
......
src/android/data/sqlite/LocationOpenHelper.java
View file @ bda025f2
...@@ -13,6 +13,8 @@ public class LocationOpenHelper extends SQLiteOpenHelper { ...@@ -13,6 +13,8 @@ public class LocationOpenHelper extends SQLiteOpenHelper {
private static final String LOCATION_TABLE_COLUMNS = private static final String LOCATION_TABLE_COLUMNS =
" id INTEGER PRIMARY KEY AUTOINCREMENT," + " id INTEGER PRIMARY KEY AUTOINCREMENT," +
" recordedAt TEXT," + " recordedAt TEXT," +
" accuracy TEXT," +
" speed TEXT," +
" latitude TEXT," + " latitude TEXT," +
" longitude TEXT"; " longitude TEXT";
private static final String LOCATION_TABLE_CREATE = private static final String LOCATION_TABLE_CREATE =
......
src/android/data/sqlite/SQLiteLocationDAO.java
View file @ bda025f2
...@@ -78,6 +78,8 @@ public class SQLiteLocationDAO implements LocationDAO { ...@@ -78,6 +78,8 @@ public class SQLiteLocationDAO implements LocationDAO {
l.setRecordedAt(stringToDate(c.getString(c.getColumnIndex("recordedAt")))); l.setRecordedAt(stringToDate(c.getString(c.getColumnIndex("recordedAt"))));
l.setLatitude(c.getString(c.getColumnIndex("latitude"))); l.setLatitude(c.getString(c.getColumnIndex("latitude")));
l.setLongitude(c.getString(c.getColumnIndex("longitude"))); l.setLongitude(c.getString(c.getColumnIndex("longitude")));
l.setAccuracy(c.getString(c.getColumnIndex("accuracy")));
l.setSpeed(c.getString(c.getColumnIndex("speed")));
return l; return l;
} }
...@@ -87,7 +89,8 @@ public class SQLiteLocationDAO implements LocationDAO { ...@@ -87,7 +89,8 @@ public class SQLiteLocationDAO implements LocationDAO {
values.put("latitude", location.getLatitude()); values.put("latitude", location.getLatitude());
values.put("longitude", location.getLongitude()); values.put("longitude", location.getLongitude());
values.put("recordedAt", dateToString(location.getRecordedAt())); values.put("recordedAt", dateToString(location.getRecordedAt()));
values.put("accuracy", location.getAccuracy());
values.put("speed", location.getSpeed());
return values; return values;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment