mirror of
https://github.com/libretro/RetroArch
synced 2025-04-10 15:45:19 +00:00
(Android Phoenix) Split up Location functionaltity into RetroActivityLocation
This commit is contained in:
twinaphex
parent
a643b2954f
commit
4491140e03
@ -1,50 +1,15 @@
|
||||
package com.retroarch.browser;
|
||||
|
||||
import com.google.android.gms.common.ConnectionResult;
|
||||
import com.google.android.gms.common.GooglePlayServicesClient;
|
||||
import com.google.android.gms.location.LocationClient;
|
||||
import com.google.android.gms.location.LocationRequest;
|
||||
import com.retroarch.browser.mainmenu.MainMenuActivity;
|
||||
import com.retroarch.browser.preferences.util.UserPreferences;
|
||||
|
||||
import android.app.NativeActivity;
|
||||
import android.content.Intent;
|
||||
import android.content.IntentSender;
|
||||
import android.content.SharedPreferences;
|
||||
import android.location.Location;
|
||||
import android.location.LocationListener;
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
import android.widget.Toast;
|
||||
|
||||
public class RetroActivityCommon extends NativeActivity
|
||||
implements GooglePlayServicesClient.ConnectionCallbacks,
|
||||
GooglePlayServicesClient.OnConnectionFailedListener,
|
||||
LocationListener {
|
||||
public class RetroActivityCommon extends RetroActivityLocation
|
||||
{
|
||||
/* PENDING INTENT VARIABLES */
|
||||
private Intent pendingIntent = null;
|
||||
|
||||
/* LOCATION VARIABLES */
|
||||
private static int CONNECTION_FAILURE_RESOLUTION_REQUEST = 0;
|
||||
private LocationClient mLocationClient = null;
|
||||
private Location mCurrentLocation;
|
||||
//TODO - FIXME: We will want to make most of this configurable
|
||||
// Milliseconds per second
|
||||
private static final int MILLISECONDS_PER_SECOND = 1000;
|
||||
// Update frequency in seconds
|
||||
public static final int UPDATE_INTERVAL_IN_SECONDS = 5;
|
||||
// Update frequency in milliseconds
|
||||
private static final long UPDATE_INTERVAL =
|
||||
MILLISECONDS_PER_SECOND * UPDATE_INTERVAL_IN_SECONDS;
|
||||
// The fastest update frequency, in seconds
|
||||
private static final int FASTEST_INTERVAL_IN_SECONDS = 1;
|
||||
// A fast frequency ceiling in milliseconds
|
||||
private static final long FASTEST_INTERVAL =
|
||||
MILLISECONDS_PER_SECOND * FASTEST_INTERVAL_IN_SECONDS;
|
||||
// Define an object that holds accuracy and frequency parameters
|
||||
LocationRequest mLocationRequest;
|
||||
boolean mUpdatesRequested;
|
||||
boolean location_service_running = false;
|
||||
|
||||
/* INTENT
|
||||
* TODO: Refactor to some class that RetroActivityCommon will implement
|
||||
@ -91,168 +56,7 @@ LocationListener {
|
||||
pendingIntent = null;
|
||||
}
|
||||
|
||||
/* LOCATION
|
||||
* TODO: Refactor to some class that RetroActivityCommon will implement
|
||||
* TODO: Make sure after refactoring to class that JNI will still work */
|
||||
|
||||
/*
|
||||
* Called by Location Services when the request to connect the
|
||||
* client finishes successfully. At this point, you can
|
||||
* request the current location or start periodic updates
|
||||
*/
|
||||
@Override
|
||||
public void onConnected(Bundle dataBundle)
|
||||
{
|
||||
// Display the connection status
|
||||
Toast.makeText(this, "Connected", Toast.LENGTH_SHORT).show();
|
||||
// If already requested, start periodic updates
|
||||
if (mUpdatesRequested)
|
||||
{
|
||||
mLocationClient.requestLocationUpdates(mLocationRequest,
|
||||
(com.google.android.gms.location.LocationListener) this);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Called by Location Services if the connection to the
|
||||
* location client drops because of an error.
|
||||
*/
|
||||
@Override
|
||||
public void onDisconnected()
|
||||
{
|
||||
// Display the connection status
|
||||
Toast.makeText(this, "Disconnected. Please re-connect.",
|
||||
Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
|
||||
/*
|
||||
* Called by Location Services if the attempt to
|
||||
* Location Services fails.
|
||||
*/
|
||||
@Override
|
||||
public void onConnectionFailed(ConnectionResult connectionResult)
|
||||
{
|
||||
/*
|
||||
* Google Play services can resolve some errors it detects.
|
||||
* If the error has a resolution, try sending an Intent to
|
||||
* start a Google Play services activity that can resolve
|
||||
* error.
|
||||
*/
|
||||
if (connectionResult.hasResolution())
|
||||
{
|
||||
try
|
||||
{
|
||||
// Start an Activity that tries to resolve the error
|
||||
connectionResult.startResolutionForResult(
|
||||
this,
|
||||
CONNECTION_FAILURE_RESOLUTION_REQUEST);
|
||||
/*
|
||||
* Thrown if Google Play services cancelled the original
|
||||
* PendingIntent
|
||||
*/
|
||||
}
|
||||
catch (IntentSender.SendIntentException e)
|
||||
{
|
||||
// Log the error
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
/*
|
||||
* If no resolution is available, display a dialog to the
|
||||
* user with the error.
|
||||
*/
|
||||
//showErrorDialog(connectionResult.getErrorCode());
|
||||
}
|
||||
}
|
||||
|
||||
public void onLocationInit()
|
||||
{
|
||||
/*
|
||||
* Create a new location client, using the enclosing class to
|
||||
* handle callbacks.
|
||||
*/
|
||||
mLocationClient = new LocationClient(this, this, this);
|
||||
// Start with updates turned off
|
||||
mUpdatesRequested = false;
|
||||
|
||||
//TODO - FIXME
|
||||
/* Split this logic up into a separate function
|
||||
* and make it configurable - callback parameters
|
||||
* should be configurable
|
||||
*/
|
||||
|
||||
// Create the LocationRequest object
|
||||
mLocationRequest = LocationRequest.create();
|
||||
// Use high accuracy
|
||||
mLocationRequest.setPriority(
|
||||
LocationRequest.PRIORITY_HIGH_ACCURACY);
|
||||
// Set the update interval to 5 seconds
|
||||
mLocationRequest.setInterval(UPDATE_INTERVAL);
|
||||
// Set the fastest update interval to 1 second
|
||||
mLocationRequest.setFastestInterval(FASTEST_INTERVAL);
|
||||
|
||||
}
|
||||
|
||||
public void onLocationStart()
|
||||
{
|
||||
// Connect the client.
|
||||
mLocationClient.connect();
|
||||
|
||||
// Get last known location
|
||||
mCurrentLocation = mLocationClient.getLastLocation();
|
||||
location_service_running = true;
|
||||
}
|
||||
|
||||
public void onLocationStop()
|
||||
{
|
||||
// If the client is connected
|
||||
if (mLocationClient.isConnected())
|
||||
{
|
||||
/*
|
||||
* Remove location updates for a listener.
|
||||
* The current Activity is the listener, so
|
||||
* the argument is "this".
|
||||
*/
|
||||
mLocationClient.removeLocationUpdates((com.google.android.gms.location.LocationListener) this);
|
||||
}
|
||||
|
||||
if (location_service_running)
|
||||
{
|
||||
// Disconnecting the client invalidates it.
|
||||
mLocationClient.disconnect();
|
||||
}
|
||||
location_service_running = false;
|
||||
}
|
||||
|
||||
public double onLocationGetLatitude()
|
||||
{
|
||||
return mCurrentLocation.getLatitude();
|
||||
}
|
||||
|
||||
public double onLocationGetLongitude()
|
||||
{
|
||||
return mCurrentLocation.getLongitude();
|
||||
}
|
||||
|
||||
// Define the callback method that receives location updates
|
||||
@Override
|
||||
public void onLocationChanged(Location location) {
|
||||
mCurrentLocation = location;
|
||||
// Report to the UI that the location was updated
|
||||
String msg = "Updated Location: " +
|
||||
Double.toString(location.getLatitude()) + "," +
|
||||
Double.toString(location.getLongitude());
|
||||
Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
|
||||
public void onStatusChanged(String provider, int status, Bundle extras) {}
|
||||
|
||||
public void onProviderEnabled(String provider) {}
|
||||
|
||||
public void onProviderDisabled(String provider) {}
|
||||
|
||||
/* MISC
|
||||
* Other RetroArch functions */
|
||||
|
||||
@ -271,52 +75,6 @@ LocationListener {
|
||||
public void onTrimMemory(int level)
|
||||
{
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPause()
|
||||
{
|
||||
// Save the current setting for updates
|
||||
SharedPreferences prefs = UserPreferences.getPreferences(this);
|
||||
SharedPreferences.Editor edit = prefs.edit();
|
||||
edit.putBoolean("LOCATION_UPDATES_ON", mUpdatesRequested);
|
||||
edit.commit();
|
||||
|
||||
super.onPause();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onResume()
|
||||
{
|
||||
SharedPreferences prefs = UserPreferences.getPreferences(this);
|
||||
SharedPreferences.Editor edit = prefs.edit();
|
||||
|
||||
/*
|
||||
* Get any previous setting for location updates
|
||||
* Gets "false" if an error occurs
|
||||
*/
|
||||
if (prefs.contains("LOCATION_UPDATES_ON"))
|
||||
{
|
||||
mUpdatesRequested = prefs.getBoolean("LOCATION_UPDATES_ON", false);
|
||||
if (mUpdatesRequested)
|
||||
location_service_running = true;
|
||||
// Otherwise, turn off location updates
|
||||
}
|
||||
else
|
||||
{
|
||||
edit.putBoolean("LOCATION_UPDATES_ON", false);
|
||||
edit.commit();
|
||||
location_service_running = false;
|
||||
}
|
||||
|
||||
super.onResume();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onStop()
|
||||
{
|
||||
onLocationStop();
|
||||
super.onStop();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBackPressed()
|
||||
|
||||
@ -0,0 +1,255 @@
|
||||
package com.retroarch.browser;
|
||||
|
||||
import com.google.android.gms.common.ConnectionResult;
|
||||
import com.google.android.gms.common.GooglePlayServicesClient;
|
||||
import com.google.android.gms.location.LocationClient;
|
||||
import com.google.android.gms.location.LocationRequest;
|
||||
import com.retroarch.browser.preferences.util.UserPreferences;
|
||||
|
||||
import android.app.NativeActivity;
|
||||
import android.content.IntentSender;
|
||||
import android.content.SharedPreferences;
|
||||
import android.location.Location;
|
||||
import android.location.LocationListener;
|
||||
import android.os.Bundle;
|
||||
import android.widget.Toast;
|
||||
|
||||
public class RetroActivityLocation extends NativeActivity
|
||||
implements GooglePlayServicesClient.ConnectionCallbacks,
|
||||
GooglePlayServicesClient.OnConnectionFailedListener,
|
||||
LocationListener
|
||||
{
|
||||
/* LOCATION VARIABLES */
|
||||
private static int CONNECTION_FAILURE_RESOLUTION_REQUEST = 0;
|
||||
private LocationClient mLocationClient = null;
|
||||
private Location mCurrentLocation;
|
||||
//TODO - FIXME: We will want to make most of this configurable
|
||||
// Milliseconds per second
|
||||
private static final int MILLISECONDS_PER_SECOND = 1000;
|
||||
// Update frequency in seconds
|
||||
public static final int UPDATE_INTERVAL_IN_SECONDS = 5;
|
||||
// Update frequency in milliseconds
|
||||
private static final long UPDATE_INTERVAL =
|
||||
MILLISECONDS_PER_SECOND * UPDATE_INTERVAL_IN_SECONDS;
|
||||
// The fastest update frequency, in seconds
|
||||
private static final int FASTEST_INTERVAL_IN_SECONDS = 1;
|
||||
// A fast frequency ceiling in milliseconds
|
||||
private static final long FASTEST_INTERVAL =
|
||||
MILLISECONDS_PER_SECOND * FASTEST_INTERVAL_IN_SECONDS;
|
||||
// Define an object that holds accuracy and frequency parameters
|
||||
LocationRequest mLocationRequest = null;
|
||||
boolean mUpdatesRequested = false;
|
||||
boolean location_service_running = false;
|
||||
|
||||
/*
|
||||
* Called by Location Services when the request to connect the
|
||||
* client finishes successfully. At this point, you can
|
||||
* request the current location or start periodic updates
|
||||
*/
|
||||
@Override
|
||||
public void onConnected(Bundle dataBundle)
|
||||
{
|
||||
// Display the connection status
|
||||
Toast.makeText(this, "Connected", Toast.LENGTH_SHORT).show();
|
||||
// If already requested, start periodic updates
|
||||
if (mUpdatesRequested)
|
||||
{
|
||||
mLocationClient.requestLocationUpdates(mLocationRequest,
|
||||
(com.google.android.gms.location.LocationListener) this);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Called by Location Services if the connection to the
|
||||
* location client drops because of an error.
|
||||
*/
|
||||
@Override
|
||||
public void onDisconnected()
|
||||
{
|
||||
// Display the connection status
|
||||
Toast.makeText(this, "Disconnected. Please re-connect.",
|
||||
Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
|
||||
/*
|
||||
* Called by Location Services if the attempt to
|
||||
* Location Services fails.
|
||||
*/
|
||||
@Override
|
||||
public void onConnectionFailed(ConnectionResult connectionResult)
|
||||
{
|
||||
/*
|
||||
* Google Play services can resolve some errors it detects.
|
||||
* If the error has a resolution, try sending an Intent to
|
||||
* start a Google Play services activity that can resolve
|
||||
* error.
|
||||
*/
|
||||
if (connectionResult.hasResolution())
|
||||
{
|
||||
try
|
||||
{
|
||||
// Start an Activity that tries to resolve the error
|
||||
connectionResult.startResolutionForResult(
|
||||
this,
|
||||
CONNECTION_FAILURE_RESOLUTION_REQUEST);
|
||||
/*
|
||||
* Thrown if Google Play services cancelled the original
|
||||
* PendingIntent
|
||||
*/
|
||||
}
|
||||
catch (IntentSender.SendIntentException e)
|
||||
{
|
||||
// Log the error
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
/*
|
||||
* If no resolution is available, display a dialog to the
|
||||
* user with the error.
|
||||
*/
|
||||
//showErrorDialog(connectionResult.getErrorCode());
|
||||
}
|
||||
}
|
||||
|
||||
public void onLocationInit()
|
||||
{
|
||||
/*
|
||||
* Create a new location client, using the enclosing class to
|
||||
* handle callbacks.
|
||||
*/
|
||||
if (mLocationClient == null)
|
||||
mLocationClient = new LocationClient(this, this, this);
|
||||
// Start with updates turned off
|
||||
mUpdatesRequested = false;
|
||||
|
||||
//TODO - FIXME
|
||||
/* Split this logic up into a separate function
|
||||
* and make it configurable - callback parameters
|
||||
* should be configurable
|
||||
*/
|
||||
|
||||
// Create the LocationRequest object
|
||||
if (mLocationRequest == null)
|
||||
mLocationRequest = LocationRequest.create();
|
||||
// Use high accuracy
|
||||
mLocationRequest.setPriority(
|
||||
LocationRequest.PRIORITY_HIGH_ACCURACY);
|
||||
// Set the update interval to 5 seconds
|
||||
mLocationRequest.setInterval(UPDATE_INTERVAL);
|
||||
// Set the fastest update interval to 1 second
|
||||
mLocationRequest.setFastestInterval(FASTEST_INTERVAL);
|
||||
|
||||
}
|
||||
|
||||
public void onLocationStart()
|
||||
{
|
||||
if (location_service_running)
|
||||
return;
|
||||
|
||||
// Connect the client.
|
||||
mLocationClient.connect();
|
||||
|
||||
// Get last known location
|
||||
mCurrentLocation = mLocationClient.getLastLocation();
|
||||
location_service_running = true;
|
||||
}
|
||||
|
||||
public void onLocationStop()
|
||||
{
|
||||
if (!location_service_running)
|
||||
return;
|
||||
|
||||
// If the client is connected
|
||||
if (mLocationClient.isConnected())
|
||||
{
|
||||
/*
|
||||
* Remove location updates for a listener.
|
||||
* The current Activity is the listener, so
|
||||
* the argument is "this".
|
||||
*/
|
||||
mLocationClient.removeLocationUpdates((com.google.android.gms.location.LocationListener) this);
|
||||
}
|
||||
|
||||
if (location_service_running)
|
||||
{
|
||||
// Disconnecting the client invalidates it.
|
||||
mLocationClient.disconnect();
|
||||
}
|
||||
location_service_running = false;
|
||||
}
|
||||
|
||||
public double onLocationGetLatitude()
|
||||
{
|
||||
return mCurrentLocation.getLatitude();
|
||||
}
|
||||
|
||||
public double onLocationGetLongitude()
|
||||
{
|
||||
return mCurrentLocation.getLongitude();
|
||||
}
|
||||
|
||||
// Define the callback method that receives location updates
|
||||
@Override
|
||||
public void onLocationChanged(Location location) {
|
||||
mCurrentLocation = location;
|
||||
// Report to the UI that the location was updated
|
||||
String msg = "Updated Location: " +
|
||||
Double.toString(location.getLatitude()) + "," +
|
||||
Double.toString(location.getLongitude());
|
||||
Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
|
||||
public void onStatusChanged(String provider, int status, Bundle extras) {}
|
||||
|
||||
public void onProviderEnabled(String provider) {}
|
||||
|
||||
public void onProviderDisabled(String provider) {}
|
||||
|
||||
@Override
|
||||
public void onPause()
|
||||
{
|
||||
// Save the current setting for updates
|
||||
SharedPreferences prefs = UserPreferences.getPreferences(this);
|
||||
SharedPreferences.Editor edit = prefs.edit();
|
||||
edit.putBoolean("LOCATION_UPDATES_ON", mUpdatesRequested);
|
||||
edit.commit();
|
||||
|
||||
super.onPause();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onResume()
|
||||
{
|
||||
SharedPreferences prefs = UserPreferences.getPreferences(this);
|
||||
SharedPreferences.Editor edit = prefs.edit();
|
||||
|
||||
/*
|
||||
* Get any previous setting for location updates
|
||||
* Gets "false" if an error occurs
|
||||
*/
|
||||
if (prefs.contains("LOCATION_UPDATES_ON"))
|
||||
{
|
||||
mUpdatesRequested = prefs.getBoolean("LOCATION_UPDATES_ON", false);
|
||||
if (mUpdatesRequested)
|
||||
location_service_running = true;
|
||||
// Otherwise, turn off location updates
|
||||
}
|
||||
else
|
||||
{
|
||||
edit.putBoolean("LOCATION_UPDATES_ON", false);
|
||||
edit.commit();
|
||||
location_service_running = false;
|
||||
}
|
||||
|
||||
super.onResume();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onStop()
|
||||
{
|
||||
onLocationStop();
|
||||
super.onStop();
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user