diff --git a/app/src/main/java/kz/istt/locust/MySynchronizationOld.java b/app/src/main/java/kz/istt/locust/MySynchronizationOld.java index 6b66e92..c24f1b2 100644 --- a/app/src/main/java/kz/istt/locust/MySynchronizationOld.java +++ b/app/src/main/java/kz/istt/locust/MySynchronizationOld.java @@ -73,6 +73,7 @@ public class MySynchronizationOld { public static String URL="https://ccalm.org"; //public static String URL="http://192.168.200.100:8080"; + public static int SyncDays=30; private Context _context; //От какого контекста показывать алерты //private boolean _showAlert; //Показывать ли окно подождите пожалуйста (его нельзя создавать если в сервисе) @@ -138,6 +139,7 @@ public class MySynchronizationOld String URL = MySynchronizationOld.URL; SharedPreferences prefs = _context.getSharedPreferences("CommonPrefs", Activity.MODE_PRIVATE); URL = prefs.getString("URL", ""); + MySynchronizationOld.SyncDays = prefs.getInt("SynDays", MySynchronizationOld.SyncDays); if(URLUtil.isValidUrl(URL)) MySynchronizationOld.URL = URL; } diff --git a/app/src/main/java/kz/istt/locust/SetupActivity.java b/app/src/main/java/kz/istt/locust/SetupActivity.java index 3d43d0c..9ff6544 100644 --- a/app/src/main/java/kz/istt/locust/SetupActivity.java +++ b/app/src/main/java/kz/istt/locust/SetupActivity.java @@ -60,6 +60,7 @@ public class SetupActivity extends Activity { public Button btnQR = null; public Button btnDeleteAllData = null; public EditText edtURL = null; + public EditText edtSyncDays = null; public CheckBox cbIdentifyCountryRegion = null; public CheckBox cbShowAdvancedSettings = null; @@ -101,7 +102,10 @@ public class SetupActivity extends Activity { //Загрузка сохранёного языка Tools.loadLocale(this); - + + //Прячу всё что должно быть спрятано + ((LinearLayout)findViewById(R.id.llShowAdvancedSettings)).setVisibility(View.GONE); + tvSynchronization = (TextView)findViewById(R.id.tvSynchronization); //Кнопочка синхронизировать @@ -338,6 +342,28 @@ public class SetupActivity extends Activity { } }); + edtSyncDays = (EditText) findViewById(R.id.edtSyncDays); + edtSyncDays.setText(MySynchronizationOld.SyncDays); + + edtSyncDays.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {} + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {} + @Override + public void afterTextChanged(Editable editable) { + try { + MySynchronizationOld.SyncDays=Integer.parseInt(edtSyncDays.toString()); + SharedPreferences prefs = SetupActivity.this.getSharedPreferences("CommonPrefs", Activity.MODE_PRIVATE); + SharedPreferences.Editor editor = prefs.edit(); + editor.putInt("SyncDays", MySynchronizationOld.SyncDays); + editor.apply(); // or editor.commit(); if you want to save synchronously + } catch (NumberFormatException e) { + Toast.makeText(SetupActivity.this, "Invalid integer", Toast.LENGTH_SHORT).show(); + } + } + }); + //Button delete all data OnClickListener oclDeleteAllData = new OnClickListener() { diff --git a/app/src/main/res/layout/activity_setup.xml b/app/src/main/res/layout/activity_setup.xml index e7423c6..782d857 100644 --- a/app/src/main/res/layout/activity_setup.xml +++ b/app/src/main/res/layout/activity_setup.xml @@ -225,34 +225,45 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/Show_advanced_settings"/> + - - - + android:orientation="vertical"> + + + + + + + + diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index fb518ef..f965e33 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -336,4 +336,6 @@ Ticarət məhsulu seyreltilirmi? İşçi mayenin seyreltmə nisbəti Qabaqcıl parametrləri göstərin + + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index dd5af49..5924367 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -446,6 +446,7 @@ Мониторинг здоровья человека и окружающей среды URL путь к серверу Вы действительно хотите удалить все данные из приложения? + Дней синхронизации diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4efbf52..eda0d0e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -447,7 +447,7 @@ URL path to the server Do you really want to delete all data from the app? - + Days of synchronization