diff --git a/app/src/main/java/org/traccar/client/MainActivity.java b/app/src/main/java/org/traccar/client/MainActivity.java index 3c41710..c4ed63e 100644 --- a/app/src/main/java/org/traccar/client/MainActivity.java +++ b/app/src/main/java/org/traccar/client/MainActivity.java @@ -37,7 +37,6 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen public static final String KEY_PORT = "port"; public static final String KEY_INTERVAL = "interval"; public static final String KEY_PROVIDER = "provider"; - public static final String KEY_EXTENDED = "extended"; public static final String KEY_STATUS = "status"; @Override @@ -70,7 +69,6 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen preferenceScreen.findPreference(KEY_PORT).setEnabled(enabled); preferenceScreen.findPreference(KEY_INTERVAL).setEnabled(enabled); preferenceScreen.findPreference(KEY_PROVIDER).setEnabled(enabled); - preferenceScreen.findPreference(KEY_EXTENDED).setEnabled(enabled); } @Override diff --git a/app/src/main/java/org/traccar/client/ProtocolFormatter.java b/app/src/main/java/org/traccar/client/ProtocolFormatter.java index 1941ea1..cfe7852 100644 --- a/app/src/main/java/org/traccar/client/ProtocolFormatter.java +++ b/app/src/main/java/org/traccar/client/ProtocolFormatter.java @@ -63,35 +63,22 @@ public class ProtocolFormatter { /** * Format location message */ - public static String createLocationMessage(boolean extended, Location l, double battery) { - StringBuilder s = new StringBuilder(extended ? "$TRCCR," : "$GPRMC,"); + public static String createLocationMessage(Location l, double battery) { + StringBuilder s = new StringBuilder("$GPRMC,"); Formatter f = new Formatter(s, Locale.ENGLISH); Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"), Locale.ENGLISH); calendar.setTimeInMillis(l.getTime()); - if (extended) { + f.format("%1$tH%1$tM%1$tS.%1$tL,A,", calendar); - f.format("%1$tY%1$tm%1$td%1$tH%1$tM%1$tS.%1$tL,A,", calendar); + double lat = l.getLatitude(); + double lon = l.getLongitude(); + f.format("%02d%07.4f,%c,", (int) Math.abs(lat), Math.abs(lat) % 1 * 60, lat < 0 ? 'S' : 'N'); + f.format("%03d%07.4f,%c,", (int) Math.abs(lon), Math.abs(lon) % 1 * 60, lon < 0 ? 'W' : 'E'); - f.format("%.6f,%.6f,", l.getLatitude(), l.getLongitude()); - f.format("%.2f,%.2f,", l.getSpeed() * 1.943844, l.getBearing()); - f.format("%.2f,", l.getAltitude()); - f.format("%.0f,", battery); - - } else { - - f.format("%1$tH%1$tM%1$tS.%1$tL,A,", calendar); - - double lat = l.getLatitude(); - double lon = l.getLongitude(); - f.format("%02d%07.4f,%c,", (int) Math.abs(lat), Math.abs(lat) % 1 * 60, lat < 0 ? 'S' : 'N'); - f.format("%03d%07.4f,%c,", (int) Math.abs(lon), Math.abs(lon) % 1 * 60, lon < 0 ? 'W' : 'E'); - - double speed = l.getSpeed() * 1.943844; // speed in knots - f.format("%.2f,%.2f,", speed, l.getBearing()); - f.format("%1$td%1$tm%1$ty,,", calendar); - - } + double speed = l.getSpeed() * 1.943844; // speed in knots + f.format("%.2f,%.2f,", speed, l.getBearing()); + f.format("%1$td%1$tm%1$ty,,", calendar); byte checksum = 0; for (byte b : s.substring(1).getBytes()) { diff --git a/app/src/main/java/org/traccar/client/TrackingService.java b/app/src/main/java/org/traccar/client/TrackingService.java index ebd00cd..9962619 100644 --- a/app/src/main/java/org/traccar/client/TrackingService.java +++ b/app/src/main/java/org/traccar/client/TrackingService.java @@ -40,7 +40,6 @@ public class TrackingService extends Service implements PositionProvider.Positio private int port; private int interval; private String provider; - private boolean extended; private ClientController clientController; private PositionProvider positionProvider; @@ -63,7 +62,6 @@ public class TrackingService extends Service implements PositionProvider.Positio provider = sharedPreferences.getString(MainActivity.KEY_PROVIDER, null); port = Integer.valueOf(sharedPreferences.getString(MainActivity.KEY_PORT, null)); interval = Integer.valueOf(sharedPreferences.getString(MainActivity.KEY_INTERVAL, null)); - extended = sharedPreferences.getBoolean(MainActivity.KEY_EXTENDED, false); } catch (Exception error) { Log.w(LOG_TAG, error); } @@ -99,7 +97,7 @@ public class TrackingService extends Service implements PositionProvider.Positio public void onPositionUpdate(Position position) { if (position != null) { StatusActivity.addMessage(getString(R.string.status_location_update)); - clientController.setNewLocation(ProtocolFormatter.createLocationMessage(extended, position.location, 0)); + clientController.setNewLocation(ProtocolFormatter.createLocationMessage(position.location, 0)); } } diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 6dd6128..618c909 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -16,8 +16,6 @@ Stop Zastaveno Spuštěno - Rozšířené formát - Použijte nový formát zprávy Poskytovatel zaměření Zdroj zaměřovacích dat diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 121098d..11736d1 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -16,8 +16,6 @@ Stop Service stoppet Service er aktiv - Udvidet format - Brug ny besked format Udbyder Udbyder lokaliseringsdata diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 0733adc..743fa7c 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -16,8 +16,6 @@ Stop Dienst inaktiv Dienst aktiv - Erweitertes Format - Verwenden Sie das neue Nachrichtenformat Datenherkunft Quelle der Positionen diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 5bea749..86883ca 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -16,8 +16,6 @@ Desactivado Servicio parado Servicio activado - Formato extendido - Utilice el nuevo formato de mensaje Proveedor de localización Fuente de los datos de localización diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f09bfb6..1ac5fc0 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -16,8 +16,6 @@ Arrêter Arrêté En marche - Format étendu - Utilisez un nouveau format de message Source de localisation Source utilisée par le système afin d\'obtenir la localisation de l\'appareil diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 6c69c9c..ce45f43 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -16,8 +16,6 @@ Stopp Tjenesten stoppet Tjenesten kjører - Utvidet format - Bruk det nye utvidede formatet Lokaliseringsleverandør Kilde for lokaliseringsdata diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 5bddd5c..4f6c307 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -16,8 +16,6 @@ Parar Serviço Parado Serviço em execução - Formato prolongado - Use o formato de mensagem nova Provedor de localização Fonte dos dados de localização diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 7d0b0db..6a73007 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -16,8 +16,6 @@ Стоп Сервис остановлен Сервис запущен - Расширенный формат - Использовать новый формат сообщений Провайдер местоположения Источник данных о местоположении diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index afaa04e..172d406 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -16,8 +16,6 @@ Stop Servis zaustavljen Servis pokrenut - Produžen format - Koristi novi format za poruke Provajder lokacije Izvor lokacijskih podataka diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 61d2e34..93cf48b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -16,8 +16,6 @@ Stop Service stopped Service running - Extended format - Use new message format Location provider Source of location data diff --git a/app/src/main/res/xml-v14/preferences.xml b/app/src/main/res/xml-v14/preferences.xml index 5d06058..e0a5816 100644 --- a/app/src/main/res/xml-v14/preferences.xml +++ b/app/src/main/res/xml-v14/preferences.xml @@ -42,10 +42,4 @@ android:summary="@string/settings_provider_summary" android:title="@string/settings_provider_title" /> - - \ No newline at end of file diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 8f0513c..30c8ec5 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -40,10 +40,4 @@ android:summary="@string/settings_provider_summary" android:title="@string/settings_provider_title" /> - -