From c2f7c563cbe8a4b649e391167dcebce6d3609df7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20P=C3=B3=C5=82grabia?= Date: Sun, 2 Oct 2016 19:57:19 +0200 Subject: [PATCH] I think refresh time was fixed. --- .../urbanexplorer/MainActivity.java | 18 +++++- .../callbacks/StandardLocationListener.java | 11 ++++ .../utils/LocationUtils.java | 55 +++++++++++++++++++ 3 files changed, 82 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/MainActivity.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/MainActivity.java index 5bf9dc0..413093b 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/MainActivity.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/MainActivity.java @@ -4,6 +4,7 @@ import android.app.ProgressDialog; import android.content.Intent; import android.location.LocationManager; import android.os.Bundle; +import android.os.Looper; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; @@ -106,7 +107,7 @@ public class MainActivity extends ActionBarActivity { swipeHandler = new SwipeHandler(this); gestureDetector = new GestureDetectorCompat(this, swipeHandler); - locationCallback = new StandardLocationListener(); + locationCallback = new StandardLocationListener(this); // init fragments MainActivityState fragId = savedInstanceState != null @@ -300,14 +301,27 @@ public class MainActivity extends ActionBarActivity { lg.debug("Selected location provider {} is available", locationProvider); + final Long updateTime = HelperUtils.fetchGpsUpdateFreq(this); + lg.debug("Update time: {}", updateTime); if (locationProvider != null) { lg.debug("Requesting location updates"); LocationManager locationService = (LocationManager)getSystemService(LOCATION_SERVICE); locationService.requestLocationUpdates(locationProvider, - HelperUtils.fetchGpsUpdateFreq(this), + updateTime, HelperUtils.fetchGpsDistanceFreq(this), locationCallback); locationServicesActivated = true; + + final Long lastLocationUpdateTime = LocationUtils.getLastLocationUpdate(this); + lg.debug("Last location update time: {}", lastLocationUpdateTime); + final long now = System.currentTimeMillis(); + lg.debug("Now: {}", now); + final long lastLocationUpdateTimeAgo = now - lastLocationUpdateTime; + lg.debug("Last location update was {} ms ago", lastLocationUpdateTimeAgo); + if (lastLocationUpdateTime < 0 || lastLocationUpdateTimeAgo >= updateTime) { + lg.info("Last location update time exceeded. Requesting single update..."); + locationService.requestSingleUpdate(locationProvider, locationCallback, Looper.getMainLooper()); + } } savedConfiguration = false; diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/callbacks/StandardLocationListener.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/callbacks/StandardLocationListener.java index 6e5f63d..d620ef5 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/callbacks/StandardLocationListener.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/callbacks/StandardLocationListener.java @@ -1,12 +1,15 @@ package pl.tpolgrabia.urbanexplorer.callbacks; +import android.content.Context; import android.location.Location; import android.location.LocationListener; import android.os.Bundle; +import android.widget.Toast; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import pl.tpolgrabia.panoramiobindings.callback.ProviderStatusCallback; import pl.tpolgrabia.urbanexplorerutils.callbacks.StandardLocationListenerCallback; +import pl.tpolgrabia.urbanexplorerutils.utils.LocationUtils; import java.util.ArrayList; import java.util.List; @@ -16,21 +19,29 @@ import java.util.List; */ public class StandardLocationListener implements LocationListener { private static final Logger lg = LoggerFactory.getLogger(StandardLocationListener.class); + private final Context ctx; private List locationChangedCallbacks = new ArrayList<>(); private List providerStatusCallbacks = new ArrayList<>(); + public StandardLocationListener(Context ctx) { + this.ctx = ctx; + } + @Override public void onLocationChanged(Location location) { lg.info("Location provider changed: {}", location); for (StandardLocationListenerCallback callback : locationChangedCallbacks) { callback.callback(location); } + Toast.makeText(ctx, "Location changed " + location, Toast.LENGTH_LONG).show(); + LocationUtils.updateLastLocationUPdate(ctx); } @Override public void onStatusChanged(String provider, int status, Bundle extras) { lg.debug("Location provider {} status has changed to {} with {}", provider, status, extras); + Toast.makeText(ctx, "Location provider " + provider + " status changed to " + status, Toast.LENGTH_LONG).show(); } @Override diff --git a/urbanexplorerutils/src/main/java/pl/tpolgrabia/urbanexplorerutils/utils/LocationUtils.java b/urbanexplorerutils/src/main/java/pl/tpolgrabia/urbanexplorerutils/utils/LocationUtils.java index d2eba6f..46d64c9 100644 --- a/urbanexplorerutils/src/main/java/pl/tpolgrabia/urbanexplorerutils/utils/LocationUtils.java +++ b/urbanexplorerutils/src/main/java/pl/tpolgrabia/urbanexplorerutils/utils/LocationUtils.java @@ -6,12 +6,16 @@ import android.location.LocationManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.*; + /** * Created by tpolgrabia on 28.08.16. */ public class LocationUtils { private static final Logger lg = LoggerFactory.getLogger(LocationUtils.class); + public static final String LOCATION_UPDATE_TIME_CACHE = "location-cache.dat"; + public static String getDefaultLocation(Context ctx) { if (ctx == null) { @@ -46,4 +50,55 @@ public class LocationUtils { return NetUtils.getSystemService(ctx).getLastKnownLocation(locationProvider); } + + public static void updateLastLocationUPdate(Context ctx) { + File f = new File(ctx.getCacheDir(), LOCATION_UPDATE_TIME_CACHE); + BufferedWriter bw = null; + try { + bw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(f, false))); + bw.write("" + System.currentTimeMillis()); + } catch (FileNotFoundException e) { + lg.error("File cannot be found", e); + } catch (IOException e) { + lg.error("Error during writing to file", e); + } finally { + if (bw != null) { + try { + bw.close(); + } catch (IOException e) { + lg.error("Error during writer closing", e); + } + } + } + } + + public static Long getLastLocationUpdate(Context ctx) { + File f = new File(ctx.getCacheDir(), LOCATION_UPDATE_TIME_CACHE); + BufferedReader br = null; + try { + br = new BufferedReader(new InputStreamReader(new FileInputStream(f))); + StringBuilder sb = new StringBuilder(); + String line; + while ((line = br.readLine()) != null) { + sb.append(line); + } + return Long.parseLong(sb.toString()); + } catch (FileNotFoundException e) { + return Long.MIN_VALUE; + } catch (IOException e) { + lg.error("I/O error during reading last location update timestamp", e); + return Long.MIN_VALUE; + } catch (NumberFormatException e) { + lg.error("Wrong timestamp format", e); + return Long.MIN_VALUE; + } finally { + if (br != null) { + try { + br.close(); + } catch (IOException e) { + lg.error("Cannot close reader", e); + } + } + } + } }