ki9
/
tracman-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added basic check for network connectivity

master
Keith Irwin 2017-03-01 20:44:47 -05:00
parent ae8355de83
commit edc440afa9
No known key found for this signature in database
GPG Key ID: 378933C743E2BBC0
7 changed files with 35 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml
View File

@ -37,7 +37,7 @@
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

BIN
app/app-release.apk
View File

Binary file not shown.

43
app/src/main/java/us/keithirwin/tracman/LocationService.java
View File

@ -10,17 +10,16 @@ import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.SharedPreferences;
//import android.content.pm.PackageManager;
import android.content.pm.PackageManager;
import android.location.Location;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.os.Bundle;
import android.os.IBinder;
import android.preference.PreferenceManager;
import android.support.annotation.Nullable;
//import android.support.v4.app.ActivityCompat;
import android.support.v4.app.ActivityCompat;
import android.support.v4.app.NotificationCompat;
//import android.support.v4.content.ContextCompat;
import android.support.v4.content.ContextCompat;
import android.util.Log;
@ -237,19 +236,33 @@ public class LocationService extends Service implements GoogleApiClient.Connecti
@Override
public void onLocationChanged(Location location) {
JSONObject mLocationView = new JSONObject();
try {
mLocationView.put("usr", mUserID);
mLocationView.put("tok", mUserSK);
mLocationView.put("lat", String.valueOf(location.getLatitude()));
mLocationView.put("lon", String.valueOf(location.getLongitude()));
mLocationView.put("dir", String.valueOf(location.getBearing()));
mLocationView.put("spd", String.valueOf(location.getSpeed()));
} catch (JSONException e) {
// Log.e(TAG, "Failed to put JSON data");
// Check for internet connectivity
ConnectivityManager cm =
(ConnectivityManager)this.getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
boolean isConnected = activeNetwork != null &&
activeNetwork.isConnectedOrConnecting();
if (isConnected) {
JSONObject mLocationView = new JSONObject();
try {
mLocationView.put("usr", mUserID);
mLocationView.put("tok", mUserSK);
mLocationView.put("lat", String.valueOf(location.getLatitude()));
mLocationView.put("lon", String.valueOf(location.getLongitude()));
mLocationView.put("dir", String.valueOf(location.getBearing()));
mLocationView.put("spd", String.valueOf(location.getSpeed()));
} catch (JSONException e) {
// Log.e(TAG, "Failed to put JSON data");
}
mSocket.emit("app", mLocationView);
// Log.v(TAG, "Location updated: " + mLocationView.toString());
} else {
showNotification(getString(R.string.not_connected), false);
}
mSocket.emit("app", mLocationView);
// Log.v(TAG, "Location updated: " + mLocationView.toString());
}
@Override

5
app/src/main/java/us/keithirwin/tracman/SettingsActivity.java
View File

@ -36,8 +36,7 @@ import java.util.List;
* API Guide</a> for more information on developing a Settings UI.
*/
public class SettingsActivity extends AppCompatPreferenceActivity {
private static final String TAG = "SettingsActivity";
// private static final String TAG = "SettingsActivity";
private static int MY_FINE_LOCATION_PERMISSION = 425;
/**
@ -208,7 +207,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
addPreferencesFromResource(R.xml.pref_general);
setHasOptionsMenu(true);
// Bind the summary of server address preference to its value
// Bind the summary of preferences to their value
bindPreferenceSummaryToValue(findPreference("broadcast_frequency"));
bindPreferenceSummaryToValue(findPreference("broadcast_priority"));
}

7
app/src/main/res/values-de/strings.xml
View File

@ -16,10 +16,6 @@
<string name="login_no_user_error">FEHLER: Nutzer nicht gefunden. </string>
<string name="logout_name">Ausloggen</string>
<string name="main_name">Hauptsicht</string>
<string name="named_welcome">Hallo%1$s! \n</string>
<string name="main_activity_description">Auf dem Hamburger klicken, Einstellungen zu ändern. \n\nAuf dem Knopf darunter klicken, deine Standort im Broswer zu zeigen. </string>
<string name="navigation_drawer_close">Navigation schließen</string>
<string name="navigation_drawer_open">Navigation aufmachen</string>
<string name="occasional_updates">Aktualisiert gelegentlich</string>
<string name="realtime_updates">Aktualisiert realtime</string>
<string name="pref_app_category_title">App Einstellungen</string>
@ -29,8 +25,6 @@
<string name="settings_name">Einstellungen</string>
<string name="server_connection_error">FEHLER: Könnte nicht zum Tracman Server verbinden. </string>
<string name="suggestions_name">Vorschläge</string>
<string name="view_trac_button">Karte zeigen</string>
<string name="welcome">Wilkommen</string>
<string name="pref_title_broadcast_frequency">Aktualisierung Zwischenraum</string>
<string-array name="pref_broadcast_frequency_list_titles">
<item>1 Sekund</item>
@ -56,4 +50,5 @@
</string-array>
<string name="pref_title_gps_broadcast">Sendungen einschalten</string>
<string name="pref_title_broadcast_priority">Aktualisierung Vorrang</string>
<string name="not_connected">Kein Internet Zugang</string>
</resources>

10
app/src/main/res/values-es/strings.xml
View File

@ -3,8 +3,6 @@
<string name="about_back_button">Atras</string>
<string name="about_name">Info</string>
<string name="connecting">conectando…</string>
<string name="welcome">Bienvenido</string>
<string name="named_welcome">Hola%1$s! \n</string>
<string name="about_license"><a href="https://tracman.org/license/">Mostrar licensia en el navegador (inglés)</a></string>
<string name="loading">Cargando…</string>
<string name="disconnected">Conexión perdida</string>
@ -12,7 +10,6 @@
<string name="bugs_name">Informe de error</string>
<string name="pref_header_general">Configuración principales</string>
<string name="settings_name">Configuración</string>
<string name="view_trac_button">Mostrar mapa</string>
<string name="suggestions_name">Sugerencias</string>
<string name="server_connection_error">ERROR: No se puede conectar al servidor de Tracman. </string>
<string name="occasional_updates">Se actualiza a veces</string>
@ -25,8 +22,6 @@
<string name="login_no_user_error">ERROR: Usario no encontrado</string>
<string name="logout_name">Cerrar sesión</string>
<string name="main_name">Vida principal</string>
<string name="navigation_drawer_close">Cerrar navegación</string>
<string name="navigation_drawer_open">Abrir navegación</string>
<string name="pref_app_category_title">Configuración de la aplicación</string>
<string name="pref_start_boot">Iniciar el servicio al encender</string>
<string name="pref_title_broadcast_frequency">Intervalo de actualización</string>
@ -53,7 +48,6 @@
<item>Ciudad</item>
<item>Sin energía</item>
</string-array>
<string name="pref_title_gps_broadcast">Encender transmisiónes</string>
<string name="main_activity_description">Haga clic en el menú de hamburguesa para cambiar la configuración. \n\n Haga clic en el botón abajo para ver su ubicación en su navegador. </string>
<string name="pref_broadcast_category_title">Actualizaciones de ubicación</string>
<string name="pref_title_gps_broadcast">Encender transmisiónes</string> <string name="pref_broadcast_category_title">Actualizaciones de ubicación</string>
<string name="not_connected">"Sin conexión a Internet "</string>
</resources>

11
app/src/main/res/values/strings.xml
View File

@ -22,16 +22,7 @@
<string name="realtime_updates">Sending realtime updates</string>
<string name="occasional_updates">Sending occasional updates</string>
<string name="broadcast_disabled">Broadcast disabled</string>
<!-- Strings related to drawer -->
<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string>
<!-- Strings related to MainFragment -->
<string name="welcome">Welcome </string>
<string name="named_welcome">Hi%1$s! \n</string>
<string name="main_activity_description">Tap on the hamburger menu to change settings. \n\nTap on the button below to see your location in your browser. </string>
<string name="view_trac_button">View Map</string>
<string name="not_connected">No internet connection</string>
<!-- Strings related to Settings -->
<string name="settings_name">Settings</string>