Сравнить коммиты
| Автор | SHA1 | Дата | |
|---|---|---|---|
 Anton Tananaev
|
4e70977d95 | ||
|
Anton Tananaev
|
66161cf9ac | ||
|
Anton Tananaev
|
579c00b860 | ||
|
Anton Tananaev
|
ea89c638b7 | ||
|
Anton Tananaev
|
dd1b0be0c0 | ||
|
Anton Tananaev
|
cdea58caa4 | ||
|
Anton Tananaev
|
fb3b7658a8 |
@@ -1,6 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
|
||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||
<component name="NewModuleRootManager" inherit-compiler-output="false">
|
||||
<output url="file://$MODULE_DIR$/build/classes/main" />
|
||||
<output-test url="file://$MODULE_DIR$/build/classes/test" />
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
|
||||
|
||||
@@ -7,8 +7,8 @@ android {
|
||||
defaultConfig {
|
||||
minSdkVersion 3
|
||||
targetSdkVersion 19
|
||||
versionCode 16
|
||||
versionName "2.9"
|
||||
versionCode 18
|
||||
versionName "2.11"
|
||||
}
|
||||
|
||||
signingConfigs {
|
||||
@@ -27,17 +27,5 @@ android {
|
||||
}
|
||||
}
|
||||
|
||||
tasks.whenTaskAdded { task ->
|
||||
if (task.name == 'validateReleaseSigning') {
|
||||
task.dependsOn keystoreInfo
|
||||
}
|
||||
}
|
||||
|
||||
task keystoreInfo << {
|
||||
def password = System.console().readPassword('\n\nKeystore password: ')
|
||||
android.signingConfigs.release.storePassword = new String(password)
|
||||
android.signingConfigs.release.keyPassword = new String(password)
|
||||
}
|
||||
|
||||
dependencies {
|
||||
}
|
||||
|
||||
@@ -53,11 +53,12 @@ public class ClientController implements Connection.ConnectionHandler {
|
||||
private BroadcastReceiver connectivityListener = new BroadcastReceiver() {
|
||||
@Override
|
||||
public void onReceive(Context context, Intent intent) {
|
||||
if (intent.getBooleanExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, false)) {
|
||||
StatusActivity.addMessage(context.getString(R.string.status_connectivity_change));
|
||||
/*if (intent.getBooleanExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, false)) {
|
||||
handler.removeCallbacksAndMessages(null);
|
||||
} else {
|
||||
reconnect();
|
||||
}
|
||||
}*/
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -116,11 +116,16 @@ public class TraccarService extends Service {
|
||||
wakeLock.release();
|
||||
}
|
||||
|
||||
@TargetApi(Build.VERSION_CODES.ECLAIR)
|
||||
public double getBatteryLevel() {
|
||||
Intent batteryIntent = registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
|
||||
int level = batteryIntent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
|
||||
int scale = batteryIntent.getIntExtra(BatteryManager.EXTRA_SCALE, 1);
|
||||
return (level * 100.0) / scale;
|
||||
if (android.os.Build.VERSION.SDK_INT > Build.VERSION_CODES.ECLAIR) {
|
||||
Intent batteryIntent = registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
|
||||
int level = batteryIntent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
|
||||
int scale = batteryIntent.getIntExtra(BatteryManager.EXTRA_SCALE, 1);
|
||||
return (level * 100.0) / scale;
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
private PositionProvider.PositionListener positionListener = new PositionProvider.PositionListener() {
|
||||
|
||||
@@ -42,5 +42,6 @@
|
||||
<string name="status_send_fail">Odesílání selhalo</string>
|
||||
<string name="status_location_update">Aktualizace pozice</string>
|
||||
<string name="status_preference_update">Aktualizace nastavení</string>
|
||||
<string name="status_connectivity_change">Změna připojení</string>
|
||||
|
||||
</resources>
|
||||
|
||||
@@ -42,5 +42,6 @@
|
||||
<string name="status_send_fail">Send fejl</string>
|
||||
<string name="status_location_update">Placering opdateret</string>
|
||||
<string name="status_preference_update">Oplysninger opdateret</string>
|
||||
<string name="status_connectivity_change">Connectivity forandring</string>
|
||||
|
||||
</resources>
|
||||
@@ -42,5 +42,6 @@
|
||||
<string name="status_send_fail">Übertragung fehlerhaft</string>
|
||||
<string name="status_location_update">Positionsupdate</string>
|
||||
<string name="status_preference_update">Prioritätsupdate</string>
|
||||
<string name="status_connectivity_change">Anschlusswechsel</string>
|
||||
|
||||
</resources>
|
||||
|
||||
@@ -42,5 +42,6 @@
|
||||
<string name="status_send_fail">Erro en el envío</string>
|
||||
<string name="status_location_update">Posición actualizada</string>
|
||||
<string name="status_preference_update">Preferencias actualizadas</string>
|
||||
<string name="status_connectivity_change">Cambio conectividad</string>
|
||||
|
||||
</resources>
|
||||
|
||||
@@ -42,5 +42,6 @@
|
||||
<string name="status_send_fail">L’envoi de localisation a échoué</string>
|
||||
<string name="status_location_update">Localisation mise à jour</string>
|
||||
<string name="status_preference_update">Mise à jour des préférences</string>
|
||||
<string name="status_connectivity_change">Changement de connectivité</string>
|
||||
|
||||
</resources>
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<string name="app_name">Traccar Klient</string>
|
||||
<string name="app_logo">Traccar</string>
|
||||
|
||||
<string name="settings_id_title">Enhetsidentifikasjon</string>
|
||||
<string name="settings_address_title">Tjeneradresse</string>
|
||||
<string name="settings_address_summary">Domenenavn eller IP-adresse</string>
|
||||
<string name="settings_port_title">Tjenerport</string>
|
||||
<string name="settings_port_summary">TCP-port til sproingstjener</string>
|
||||
<string name="settings_interval_title">Frekvens</string>
|
||||
<string name="settings_interval_summary">Beskjedinterval i sekunder</string>
|
||||
<string name="settings_status_title">Tjeneste status</string>
|
||||
<string name="settings_status_off">Start</string>
|
||||
<string name="settings_status_on">Stopp</string>
|
||||
<string name="settings_status_off_summary">Tjeneste stoppet</string>
|
||||
<string name="settings_status_on_summary">Tjeneste kjører</string>
|
||||
<string name="settings_extended_title">Utvidet format</string>
|
||||
<string name="settings_extended_summary">Bruk det nye utvidede formatet</string>
|
||||
<string name="settings_provider_title">Lokaliseringsleverandør</string>
|
||||
<string name="settings_provider_summary">Kilde for lokaliseringsdata</string>
|
||||
<string-array name="settings_provider_names">
|
||||
<item>GPS-lokalisering</item>
|
||||
<item>Nettverkslokalisering</item>
|
||||
<item>Blandet lokalisering</item>
|
||||
</string-array>
|
||||
|
||||
<string name="menu_status">Status</string>
|
||||
<string name="menu_about">Om</string>
|
||||
<string name="menu_clear">Tøm</string>
|
||||
|
||||
<string name="about_description">Sanntids GPS-sporing for Android-enheter. Kompatible med Traccar Server og andre sporingssystemer.</string>
|
||||
<string name="about_license">Dette programmet har fri og åpen kildekode; kildekoden er lisensiert under Apache License Version 2.0 og er tilgjengelig på GitHub.</string>
|
||||
<string name="about_web">For mor informasjon besøk\nwww.traccar.org/client</string>
|
||||
|
||||
<string name="status_service_create">Tjeneste opprettet</string>
|
||||
<string name="status_service_start">Tjeneste startet</string>
|
||||
<string name="status_service_destroy">Tjeneste ødelagt</string>
|
||||
<string name="status_connection_success">Tilkobling var vellykket</string>
|
||||
<string name="status_connection_fail">Tilkobling mislyktes</string>
|
||||
<string name="status_send_fail">Sending mislyktes</string>
|
||||
<string name="status_location_update">Plassering oppdatert</string>
|
||||
<string name="status_preference_update">Innstillinger oppdatert</string>
|
||||
<string name="status_connectivity_change">tilkobling forandret</string>
|
||||
|
||||
</resources>
|
||||
@@ -42,5 +42,6 @@
|
||||
<string name="status_send_fail">Falha no envio</string>
|
||||
<string name="status_location_update">Localização atualizada</string>
|
||||
<string name="status_preference_update">Preferências atualizadas</string>
|
||||
<string name="status_connectivity_change">Mudança de conectividade</string>
|
||||
|
||||
</resources>
|
||||
|
||||
@@ -42,5 +42,6 @@
|
||||
<string name="status_send_fail">Ошибка отправки</string>
|
||||
<string name="status_location_update">Обновление местоположения</string>
|
||||
<string name="status_preference_update">Обновление настроек</string>
|
||||
<string name="status_connectivity_change">Изменение подключения</string>
|
||||
|
||||
</resources>
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<string name="app_name">Traccar klijent</string>
|
||||
<string name="app_logo">Traccar</string>
|
||||
|
||||
<string name="settings_id_title">Identifikator uređaja</string>
|
||||
<string name="settings_address_title">Adresa servera</string>
|
||||
<string name="settings_address_summary">Domen ime ili IP adresa</string>
|
||||
<string name="settings_port_title">Server port</string>
|
||||
<string name="settings_port_summary">TCP port servera</string>
|
||||
<string name="settings_interval_title">Učestalost</string>
|
||||
<string name="settings_interval_summary">Interval podataka u sekundama</string>
|
||||
<string name="settings_status_title">Status servisa</string>
|
||||
<string name="settings_status_off">Start</string>
|
||||
<string name="settings_status_on">Stop</string>
|
||||
<string name="settings_status_off_summary">Servis zaustavljen</string>
|
||||
<string name="settings_status_on_summary">Servis pokrenut</string>
|
||||
<string name="settings_extended_title">Produžen format</string>
|
||||
<string name="settings_extended_summary">Koristi novi format za poruke</string>
|
||||
<string name="settings_provider_title">Provajder lokacije</string>
|
||||
<string name="settings_provider_summary">Izvor lokacijskih podataka</string>
|
||||
<string-array name="settings_provider_names">
|
||||
<item>GPS provajder</item>
|
||||
<item>Provajder Mreže</item>
|
||||
<item>Oba zajedno provajdera</item>
|
||||
</string-array>
|
||||
|
||||
<string name="menu_status">Status</string>
|
||||
<string name="menu_about">O klijentu</string>
|
||||
<string name="menu_clear">Očisti</string>
|
||||
|
||||
<string name="about_description">GPS tracker za Android telefone. GPS satelit kompatibilno.</string>
|
||||
<string name="about_license">Ova aplikacija je besplatna i open source,izvorni kod je licenciran pod Apache License Version 2.0 i dostupan na GitHub</string>
|
||||
<string name="about_web">"Za više informacija www.traccar.org/client "</string>
|
||||
|
||||
<string name="status_service_create">Servis kreiran</string>
|
||||
<string name="status_service_start">Servis pokrenut</string>
|
||||
<string name="status_service_destroy">Servis uništen</string>
|
||||
<string name="status_connection_success">Konekcija uspešna</string>
|
||||
<string name="status_connection_fail">Konekcija neuspešna</string>
|
||||
<string name="status_send_fail">Slanje neuspešno</string>
|
||||
<string name="status_location_update">Ažuriranje lokacije</string>
|
||||
<string name="status_preference_update">Ažuriranje preferenci</string>
|
||||
<string name="status_connectivity_change">Promenjena konekcija</string>
|
||||
|
||||
</resources>
|
||||
@@ -42,5 +42,6 @@
|
||||
<string name="status_send_fail">Send failed</string>
|
||||
<string name="status_location_update">Location update</string>
|
||||
<string name="status_preference_update">Preference update</string>
|
||||
<string name="status_connectivity_change">Connectivity change</string>
|
||||
|
||||
</resources>
|
||||
|
||||
@@ -25,37 +25,37 @@
|
||||
<output url="file://$MODULE_DIR$/build/classes/debug" />
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/assets" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/jni" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/rs" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/java" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/aidl" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/debug" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/resources" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/res" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/test/debug" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/source/r/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/source/r/test/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/test/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/debug" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/source/r/test/debug" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test/debug" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test/debug" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/test/debug" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/test/debug" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/aidl" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/assets" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/java" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/jni" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/rs" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/res" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/resources" type="java-test-resource" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/apk" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/assets" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/bundles" />
|
||||
@@ -68,7 +68,7 @@
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/symbols" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
|
||||
</content>
|
||||
<orderEntry type="jdk" jdkName="Android 4.2.2 Platform" jdkType="Android SDK" />
|
||||
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
|
||||
Ссылка в новой задаче
Block a user
© 2026 StackWorks