Option to disable buffering (fix #411)
Этот коммит содержится в:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012 - 2019 Anton Tananaev (anton@traccar.org)
|
||||
* Copyright 2012 - 2020 Anton Tananaev (anton@traccar.org)
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -60,6 +60,7 @@ public class MainFragment extends PreferenceFragmentCompat implements OnSharedPr
|
||||
public static final String KEY_ANGLE = "angle";
|
||||
public static final String KEY_ACCURACY = "accuracy";
|
||||
public static final String KEY_STATUS = "status";
|
||||
public static final String KEY_BUFFER = "buffer";
|
||||
|
||||
private static final int PERMISSIONS_REQUEST_LOCATION = 2;
|
||||
|
||||
@@ -169,6 +170,7 @@ public class MainFragment extends PreferenceFragmentCompat implements OnSharedPr
|
||||
findPreference(KEY_DISTANCE).setEnabled(enabled);
|
||||
findPreference(KEY_ANGLE).setEnabled(enabled);
|
||||
findPreference(KEY_ACCURACY).setEnabled(enabled);
|
||||
findPreference(KEY_BUFFER).setEnabled(enabled);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -35,6 +35,7 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
|
||||
private SharedPreferences preferences;
|
||||
|
||||
private String url;
|
||||
private boolean buffer;
|
||||
|
||||
private PositionProvider positionProvider;
|
||||
private DatabaseHelper databaseHelper;
|
||||
@@ -50,6 +51,7 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
|
||||
isOnline = networkManager.isOnline();
|
||||
|
||||
url = preferences.getString(MainFragment.KEY_URL, context.getString(R.string.settings_url_default_value));
|
||||
buffer = preferences.getBoolean(MainFragment.KEY_BUFFER, true);
|
||||
}
|
||||
|
||||
public void start() {
|
||||
@@ -78,7 +80,11 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
|
||||
public void onPositionUpdate(Position position) {
|
||||
StatusActivity.addMessage(context.getString(R.string.status_location_update));
|
||||
if (position != null) {
|
||||
write(position);
|
||||
if (buffer) {
|
||||
write(position);
|
||||
} else {
|
||||
send(position);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -173,10 +179,14 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
|
||||
@Override
|
||||
public void onComplete(boolean success) {
|
||||
if (success) {
|
||||
delete(position);
|
||||
if (buffer) {
|
||||
delete(position);
|
||||
}
|
||||
} else {
|
||||
StatusActivity.addMessage(context.getString(R.string.status_send_fail));
|
||||
retry();
|
||||
if (buffer) {
|
||||
retry();
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@@ -20,6 +20,9 @@
|
||||
<string name="settings_status_on">Stop</string>
|
||||
<string name="settings_status_off_summary">Service stopped</string>
|
||||
<string name="settings_status_on_summary">Service running</string>
|
||||
<string name="settings_buffer">Offline buffering</string>
|
||||
<string name="settings_buffer_off_summary">Buffering off</string>
|
||||
<string name="settings_buffer_on_summary">Buffering on</string>
|
||||
<string name="settings_accuracy_title">Location accuracy</string>
|
||||
<string name="settings_accuracy_summary">Desired location accuracy</string>
|
||||
<string name="settings_accuracy_high">High</string>
|
||||
|
||||
@@ -31,22 +31,29 @@
|
||||
<EditTextPreference
|
||||
android:defaultValue="300"
|
||||
android:key="interval"
|
||||
android:numeric="integer"
|
||||
android:inputType="number"
|
||||
android:summary="@string/settings_interval_summary"
|
||||
android:title="@string/settings_interval_title" />
|
||||
|
||||
<EditTextPreference
|
||||
android:defaultValue="0"
|
||||
android:key="distance"
|
||||
android:numeric="integer"
|
||||
android:inputType="number"
|
||||
android:summary="@string/settings_distance_summary"
|
||||
android:title="@string/settings_distance_title" />
|
||||
|
||||
<EditTextPreference
|
||||
android:defaultValue="0"
|
||||
android:key="angle"
|
||||
android:numeric="integer"
|
||||
android:inputType="number"
|
||||
android:summary="@string/settings_angle_summary"
|
||||
android:title="@string/settings_angle_title" />
|
||||
|
||||
<CheckBoxPreference
|
||||
android:defaultValue="true"
|
||||
android:key="buffer"
|
||||
android:summaryOff="@string/settings_buffer_off_summary"
|
||||
android:summaryOn="@string/settings_buffer_on_summary"
|
||||
android:title="@string/settings_buffer" />
|
||||
|
||||
</PreferenceScreen>
|
||||
|
||||
Ссылка в новой задаче
Block a user