igor/org.ccalm.asdc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Анкета здоровья

Browse Source
This commit is contained in:
igor
2024-04-29 07:43:50 +05:00
parent bf93c88af3
commit 55d2ca1997
31 changed files with 9935 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
.idea/deploymentTargetDropDown.xml generated Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<value>
<entry key="app">
<State>
<targetSelectedWithDropDown>
<Target>
<type value="QUICK_BOOT_TARGET" />
<deviceKey>
<Key>
<type value="VIRTUAL_DEVICE_PATH" />
<value value="C:\Users\ivanov.i\.android\avd\Medium_Phone_API_31.avd" />
</Key>
</deviceKey>
</Target>
</targetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2024-04-03T08:03:53.092785200Z" />
</State>
</entry>
</value>
</component>
</project>

5
.idea/gradle.xml generated
View File

@ -5,16 +5,15 @@
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="delegatedBuild" value="false" />
<option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="jbr-17" />
<option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
</set>
</option>
<option name="resolveExternalAnnotations" value="false" />
</GradleProjectSettings>
</option>
</component>

10
.idea/migrations.xml generated Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectMigrations">
<option name="MigrateToGradleLocalJavaHome">
<set>
<option value="$PROJECT_DIR$" />
</set>
</option>
</component>
</project>

30
app/build.gradle
View File

@ -9,14 +9,13 @@ android {
storePassword 'locustg@h0km'
}
}
compileSdkVersion 33
defaultConfig {
applicationId "kz.istt.locust"
minSdkVersion 15
versionCode 100
versionName "2.4.4"
targetSdkVersion 33
versionCode 99
versionName "2.4.3"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
@ -34,13 +33,13 @@ android {
}
}
buildToolsVersion '30.0.3'
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
namespace 'kz.istt.locust'
compileSdk 33
buildToolsVersion '34.0.0'
}
dependencies {
@ -57,23 +56,4 @@ dependencies {
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
/*
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
implementation 'com.google.android.gms:play-services-maps:17.0.0'
implementation 'androidx.appcompat:appcompat:1.0.2'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
*/
/*compile files('libs/commons-codec-1.6.jar')
compile files('libs/commons-logging-1.1.1.jar')
compile files('libs/fluent-hc-4.5.2.jar')
compile files('libs/httpclient-4.5.2.jar')
compile files('libs/httpclient-cache-4.5.2.jar')
compile files('libs/httpcore-4.4.4.jar')
compile files('libs/httpmime-4.5.2.jar')*/
}

BIN
app/release/app-release.apk
View File

Binary file not shown.

4
app/release/output-metadata.json
View File

@ -11,8 +11,8 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 99,
"versionName": "2.4.3",
"versionCode": 100,
"versionName": "2.4.4",
"outputFile": "app-release.apk"
}
],

10
app/src/main/java/kz/istt/locust/DbOpenHelper.java
View File

@ -615,7 +615,7 @@ public class DbOpenHelper extends SQLiteOpenHelper
"insecticide_dose float," + //норма расхода(л/га)
"insecticide_rate float," + //расход рабочей жидкости(л/га)
"insecticide_used_volume float," + //Общий объем использованной рабочей жидкости (л)
"insecticide_number_spores float," + //Концентрация спор (/мл)
"insecticide_number_spores float," + //Концентрация спор (/мл) (--------- В 2024 ссказали удалить поэтому не используется ---------)
"insecticide_expiry_date integer," + //окончание срока действия (в нов. версии не используется)
"insecticide_mixed text," + //смешивается ли инсектицид с водой или растворителем? (в нов. версии не используется)
"insecticide_mixed_name text," + //если да, то с чем (в нов. версии не используется)
@ -649,13 +649,13 @@ public class DbOpenHelper extends SQLiteOpenHelper
"spray_platform_g integer," + //2) «Наземное» - выпадающий список:«Трактор», «Машина», «Аэроз.генераторG».
"spray_platform_h integer," + //3) «Ручное» - выпадающий список:«Ранцевый», «Моторный», «Батарейный».
"spray_capacity_id integer," + //Поле “Вид опрыскивания” (Объём) «Полнообъемное», «Малообъемное», «Ультрамалообъемное».
"spray_capacity_id integer," + //Поле “Вид опрыскивания” (Объём) «Полнообъемное», «Малообъемное», «Ультрамалообъемное». (Сказали поле удалить удалил)
//"spray_operator text," + //Оператор (пилот, водитель, др...)
"spray_operatortype_id integer," + //Оператор (пилот, водитель, др...)
//"spray_operator_name text," + //<2F>?мя оператора
"spray_manufacturer_name text," + //Марка опрыскивателя
"spray_model_name text," + //Модель опрыскивателя
"spray_manufacturer_name text," + //Марка опрыскивателя/модель
"spray_model_name text," + //Модель опрыскивателя (теперь не используется всё пишется в поле выше)
//"spray_date_calibration integer," + //Дата последней калибровки
"spray_height float," + //Высота над поверхностью почвы (м)
"spray_width float," + //Ширина захвата (м)
@ -798,7 +798,7 @@ public class DbOpenHelper extends SQLiteOpenHelper
"spray_platform_a integer," +
"spray_platform_g integer," +
"spray_platform_h integer," +
"spray_capacity_id integer," +
"spray_capacity_id integer," + //Сказали удалить удалил
"spray_operatortype_id integer," +
"spray_manufacturer_name text," +
"spray_model_name text," +

73
app/src/main/java/kz/istt/locust/LocustDelActivity.java
View File

@ -131,7 +131,6 @@ public class LocustDelActivity extends FragmentActivity implements LocationListe
public EditText edtInsRate = null; // расход рабочей жидкости(л/га)
public EditText edtInsUsedVolume = null; // Общий объем использованной рабочей жидкости (л)
public EditText edtInsNumberSpores = null; // Концентрация спор (/мл)
// public DateInput edtInsExpiryDate = null; // окончание срока действия (дата)
// public SpinnerDB spiInsMixed = null; // смешивается ли инсектицид с водой или растворителем?
@ -166,7 +165,6 @@ public class LocustDelActivity extends FragmentActivity implements LocationListe
public View spiSprPlatformA = null; // «Авиа» - выпадающий список:«Самолет», «Вертолет», «Дельтаплан».
public View spiSprPlatformG = null; // «Наземное» - выпадающий список:«Трактор», «Машина», «Аэроз.генераторG».
public View spiSprPlatformH = null; // «Ручное» - выпадающий список:«Ранцевый», «Моторный», «Батарейный».
public View spiSprCapacity = null; // Объём опрыскивателя
// public SpinnerDB spiSprOperator = null; // Оператор (пилот, водитель, др...)
// public EditText edtSprOperatorName = null; // <20>?мя оператора
@ -180,7 +178,6 @@ public class LocustDelActivity extends FragmentActivity implements LocationListe
public EditText edtSprBarrierWidth = null; // ширина (м)
public EditText edtSprBarrierSpace = null; // промежуток (м)
public EditText edtSprSpeed = null; // Скорость движения (км/ч)
public View spiSprGPS = null; // Антена: DGPS использовалась
public View spiSprMarking = null; // Наземная маркировка(Сиг-нальщики, GPS, Машина, Нет)
public CheckBox cbEffectiveness = null; // Галочка чтоб сделать поля не обязательными
@ -199,7 +196,6 @@ public class LocustDelActivity extends FragmentActivity implements LocationListe
public EditText edtClothing = null; // Сборная колонка
public View spiProtectiveClothingClean = null;
public View spiOperatorExposedInsecticide = null;
public EditText edtDescription = null;
public CheckBox cbTest; //Тестовая ли анкета
@ -583,18 +579,8 @@ public class LocustDelActivity extends FragmentActivity implements LocationListe
guiTable.add(edtInsDose, "insecticide_dose");
edtInsRate = (EditText) findViewById(R.id.edtInsRate); // расход рабочей жидкости(л/га)
guiTable.add(edtInsRate, "insecticide_rate");
/*
* edtInsExpiryDate = (DateInput) findViewById(R.id.edtInsExpiryDate); // окончание срока годности (дата) guiTable.add(edtInsExpiryDate,"insecticide_expiry_date"); edtInsExpiryDate.setVisibleDMY("my"); //Кроме дня
*
* spiInsMixed = findViewById(R.id.spiInsMixed); // смешивается ли инсектицид с водой или растворителем? guiTable.add(spiInsMixed,"insecticide_mixed"); spiInsMixed.addField(this, "", ""); spiInsMixed.addField(this, getString(R.string.Yes),"1"); spiInsMixed.addField(this, getString(R.string.No),"0");
*
* edtInsMixedName = (EditText) findViewById(R.id.edtInsMixedName); guiTable.add(edtInsMixedName,"insecticide_mixed_name"); edtInsMixedRatio = (EditText) findViewById(R.id.edtInsMixedRatio); // если да, то в каком соотношении (%) guiTable.add(edtInsMixedRatio,"insecticide_mixed_ratio"); edtInsMixedRatio.setFilters(new InputFilter[]{ new InputFilterMinMax("0", "100")});
*/
edtInsUsedVolume = (EditText) findViewById(R.id.edtInsUsedVolume); // Общий объем использованной рабочей жидкости (л)
guiTable.add(edtInsUsedVolume, "insecticide_used_volume");
edtInsNumberSpores = (EditText) findViewById(R.id.edtInsNumberSpores); // Концентрация спор (/мл)
guiTable.add(edtInsNumberSpores, "insecticide_number_spores");
spiWeaTimeStart = findViewById(R.id.spiWeaTimeStart); // время начала
guiTable.add(spiWeaTimeStart, "weather_time_start");
@ -874,25 +860,6 @@ public class LocustDelActivity extends FragmentActivity implements LocationListe
cursor.close();
dboh.close();
spiSprCapacity = findViewById(R.id.spiSprCapacity);
guiTable.add(spiSprCapacity, "spray_capacity_id");
((selectDB)spiSprCapacity).addField("", "");
dboh = new DbOpenHelper(this);
cursor = dboh
.getReadableDatabase()
.rawQuery(
"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
+ Tools.getLang() + "' LIMIT 1),d.name) name from list_capacities d where d.del=0 order by d.sort,d.name", null);
if (cursor.moveToFirst())
{
do
{
((selectDB)spiSprCapacity).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
} while (cursor.moveToNext());
}
cursor.close();
dboh.close();
/*
* spiSprOperator = findViewById(R.id.spiSprOperator); // Оператор (пилот, водитель, др...) guiTable.add(spiSprOperator,"spray_operatortype_id"); spiSprOperator.addField(this, "", ""); dboh = new DbOpenHelper(this); cursor =
* dboh.getReadableDatabase().rawQuery("select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"+Tools.getLang()+"' LIMIT 1),d.name) name from list_operatorstypes d where d.del=0 order by d.sort,d.name", null); if (cursor.moveToFirst()) { do { spiSprOperator.addField(this, cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id"))); } while
@ -903,8 +870,8 @@ public class LocustDelActivity extends FragmentActivity implements LocationListe
// guiTable.add(edtSprOperatorName,"spray_operator_name");
edtSprManufacturer = (EditText) findViewById(R.id.edtSprManufacturer); // Марка опрыскивателя
guiTable.add(edtSprManufacturer, "spray_manufacturer_name");
edtSprModel = (EditText) findViewById(R.id.edtSprModel); // Модель опрыскивателя
guiTable.add(edtSprModel, "spray_model_name");
//edtSprModel = (EditText) findViewById(R.id.edtSprModel); // Модель опрыскивателя
//guiTable.add(edtSprModel, "spray_model_name");
// edtDateCalibration = (DateInput) findViewById(R.id.edtDateCalibration); // Дата последней калибровки
// guiTable.add(edtDateCalibration,"spray_date_calibration");
@ -929,12 +896,6 @@ public class LocustDelActivity extends FragmentActivity implements LocationListe
edtSprSpeed = (EditText) findViewById(R.id.edtSprSpeed); // Скорость движения (км/ч)
guiTable.add(edtSprSpeed, "spray_speed");
spiSprGPS = findViewById(R.id.spiSprGPS); // Антена: DGPS использовалась
guiTable.add(spiSprGPS, "spray_gps");
((selectDB)spiSprGPS).addField("", "");
((selectDB)spiSprGPS).addField(getString(R.string.Yes), "1");
((selectDB)spiSprGPS).addField(getString(R.string.No), "0");
spiSprMarking = findViewById(R.id.spiSprMarking); // Наземная маркировка(Сиг-нальщики, GPS, Машина, Нет)
guiTable.add(spiSprMarking, "spray_marking_id");
((selectDB)spiSprMarking).addField("", "");
@ -1107,12 +1068,6 @@ public class LocustDelActivity extends FragmentActivity implements LocationListe
}
});
spiProtectiveClothingClean = findViewById(R.id.spiProtectiveClothingClean);
guiTable.add(spiProtectiveClothingClean, "safety_clothing_clean");
((selectDB)spiProtectiveClothingClean).addField("", "");
((selectDB)spiProtectiveClothingClean).addField(getString(R.string.Yes), "1");
((selectDB)spiProtectiveClothingClean).addField(getString(R.string.No), "0");
spiOperatorExposedInsecticide = findViewById(R.id.spiOperatorExposedInsecticide);
guiTable.add(spiOperatorExposedInsecticide, "safety_operator_health");
((selectDB)spiOperatorExposedInsecticide).addField("", "");
@ -1640,12 +1595,9 @@ public class LocustDelActivity extends FragmentActivity implements LocationListe
if(spiSprPlatformA.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSprPlatformA).updateAdapter(this);
if(spiSprPlatformG.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSprPlatformG).updateAdapter(this);
if(spiSprPlatformH.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSprPlatformH).updateAdapter(this);
if(spiSprCapacity.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSprCapacity).updateAdapter(this);
if(spiSprBarrier.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSprBarrier).updateAdapter(this);
if(spiSprGPS.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSprGPS).updateAdapter(this);
if(spiSprMarking.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSprMarking).updateAdapter(this);
if(spiEffMethod.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiEffMethod).updateAdapter(this);
if(spiProtectiveClothingClean.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiProtectiveClothingClean).updateAdapter(this);
if(spiOperatorExposedInsecticide.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiOperatorExposedInsecticide).updateAdapter(this);
if(spiSafNonTarget.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSafNonTarget).updateAdapter(this);
if(spiSafIncident.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSafIncident).updateAdapter(this);
@ -2176,6 +2128,12 @@ public class LocustDelActivity extends FragmentActivity implements LocationListe
}
if (!eFields && !isGONE(edtInsUsedVolume))
{
if(edtInsUsedVolume.getText().toString().equals(""))
{
scrollTo(edtInsUsedVolume);
atxt = atxt + ": \"" + getResources().getString(R.string.Total_volume_of_working_solution_actually_applied_l) + "\"!";
eFields = true;
}else
if(checkMinMaxI(edtInsUsedVolume,1,450000)!="")
{
scrollTo(edtInsUsedVolume);
@ -2183,15 +2141,6 @@ public class LocustDelActivity extends FragmentActivity implements LocationListe
eFields = true;
}
}
if (!eFields && !isGONE(edtInsNumberSpores))
{
if(checkMinMaxI(edtInsNumberSpores,1f,1000000000)!="")
{
scrollTo(edtInsNumberSpores);
atxt = checkMinMaxI(edtInsNumberSpores,1f,1000000000) + " \"" + getResources().getString(R.string.Number_of_spores_ml) + "\"!";
eFields = true;
}
}
if (!eFields && !isGONE(spiWeaTimeStart) && ((selectDB)spiWeaTimeStart).getText().toString().equals(""))
{
scrollTo(spiWeaTimeStart);
@ -2337,6 +2286,12 @@ public class LocustDelActivity extends FragmentActivity implements LocationListe
}
if (!eFields && !isGONE(edtSprBarrierSpace))
{
if(edtSprBarrierSpace.getText().toString().equals(""))
{
scrollTo(edtSprBarrierSpace);
atxt = atxt + ": \"" + getResources().getString(R.string.Spacing_of_barriers_m) + "\"!";
eFields = true;
}else
if(checkMinMaxI(edtSprBarrierSpace,1,1000)!="")
{
scrollTo(edtSprBarrierSpace);

3
app/src/main/java/kz/istt/locust/LocustDelListActivity.java
View File

@ -282,8 +282,7 @@ public class LocustDelListActivity extends AppCompatActivity
html += "<td bgcolor=\"#d1d1d1\" width=\"100px\"><b>" + getString(R.string.Spray_platform_h) + "</b></td>";
//html += "<td bgcolor=\"#d1d1d1\" width=\"100px\"><b>" + getString(R.string.Spray_operator) + "</b></td>";
html += "<td bgcolor=\"#d1d1d1\" width=\"100px\"><b>" + getString(R.string.Name_of_operator) + "</b></td>";
html += "<td bgcolor=\"#d1d1d1\" width=\"100px\"><b>" + getString(R.string.Spray_manufacturer) + "</b></td>";
html += "<td bgcolor=\"#d1d1d1\" width=\"100px\"><b>" + getString(R.string.Model_sprayer) + "</b></td>";
html += "<td bgcolor=\"#d1d1d1\" width=\"100px\"><b>" + getString(R.string.Spray_manufacturer_model) + "</b></td>";
html += "<td bgcolor=\"#d1d1d1\" width=\"100px\"><b>" + getString(R.string.Date_of_last_calibration) + "</b></td>";
html += "<td bgcolor=\"#d1d1d1\" width=\"100px\"><b>" + getString(R.string.Atomizer_height_above_ground_m) + "</b></td>";
html += "<td bgcolor=\"#d1d1d1\" width=\"100px\"><b>" + getString(R.string.Coverage_width) + "</b></td>";

2428
app/src/main/java/kz/istt/locust/LocustHealthActivity.java Normal file
View File

File diff suppressed because it is too large Load Diff

20
app/src/main/java/kz/istt/locust/MainActivity.java
View File

@ -52,6 +52,7 @@ public class MainActivity extends Activity {
private Button btnSetup;
private Button btnLocust;
private Button btnLocustDel;
private Button btnLocustHealth;
private TextView tvAndroidID;
private TextView tvCountTasks;
@ -154,7 +155,7 @@ public class MainActivity extends Activity {
//Кнопка вызова формы настроек
btnSetup = (Button) findViewById(R.id.btnSetup);
OnClickListener oclBtnSetup = new OnClickListener(){@Override
public void onClick(View v){ onGetPermissions(3); }};
public void onClick(View v){ onGetPermissions(4); }};
btnSetup.setOnClickListener(oclBtnSetup);
//Кнопка вызова формы
@ -169,6 +170,10 @@ public class MainActivity extends Activity {
public void onClick(View v){ onGetPermissions(2); }};
btnLocustDel.setOnClickListener(oclBtnLocustDel);
btnLocustHealth = (Button) findViewById(R.id.btnLocustHealth);
OnClickListener oclBtnLocustHealth = new OnClickListener(){@Override
public void onClick(View v){ onGetPermissions(3); }};
btnLocustHealth.setOnClickListener(oclBtnLocustHealth);
tvAndroidID = (TextView) findViewById(R.id.tvAndroidID);
String android_id = Secure.getString(getContentResolver(), Secure.ANDROID_ID);
@ -247,13 +252,14 @@ public class MainActivity extends Activity {
if (ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
list.add(Manifest.permission.CAMERA);
}
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2){
if (ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
list.add(Manifest.permission.WRITE_EXTERNAL_STORAGE);
}
if (ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
list.add(Manifest.permission.READ_EXTERNAL_STORAGE);
}
}
if(!list.isEmpty())
{
@ -277,6 +283,10 @@ public class MainActivity extends Activity {
ShowLocustDelActivity();
}
if(granted && button==3)
{
ShowLocustHealthActivity();
}
if(granted && button==4)
{
ShowSetupActivity();;
}
@ -331,6 +341,12 @@ public class MainActivity extends Activity {
startActivity(intent);
}
public void ShowLocustHealthActivity()
{
Intent intent = new Intent(this, LocustHealthActivity.class);
startActivity(intent);
}
public void ShowLocustDelActivity()
{
//_translations

84
app/src/main/res/layout-land/activity_locust_del.xml
View File

@ -1026,8 +1026,11 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingLeft="@dimen/activity_horizontal_margin">
android:gravity="center">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_star" />
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -1066,7 +1069,7 @@
android:inputType="numberDecimal" />
</LinearLayout-->
<LinearLayout
<!--LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -1088,7 +1091,7 @@
android:singleLine="true"
android:inputType="numberDecimal"/>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</LinearLayout-->
<LinearLayout
android:layout_width="match_parent"
@ -1727,7 +1730,7 @@
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout
<!--LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -1742,7 +1745,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</LinearLayout-->
<LinearLayout
android:layout_width="match_parent"
@ -1761,31 +1764,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:hint="@string/Spray_manufacturer"
android:maxLines="1"
android:singleLine="true"
android:inputType="text"/>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingLeft="@dimen/activity_horizontal_margin">
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtSprModel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:hint="@string/Model_sprayer"
android:hint="@string/Spray_manufacturer_model"
android:maxLines="1"
android:singleLine="true"
android:inputType="text"/>
@ -1863,8 +1842,11 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingLeft="@dimen/activity_horizontal_margin">
android:gravity="center">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_star" />
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -1912,22 +1894,6 @@
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingLeft="@dimen/activity_horizontal_margin">
<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/Antenna_DGPS_used">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiSprGPS"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -2138,26 +2104,6 @@
android:visibility="invisible" />
</GridLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_star"/>
<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/Protective_clothing_clean_and_in_good_state">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiProtectiveClothingClean"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

2493
app/src/main/res/layout-land/activity_locust_health.xml Normal file
View File

File diff suppressed because it is too large Load Diff

77
app/src/main/res/layout-large/activity_locust_del.xml
View File

@ -975,8 +975,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/Total_volume_of_working_solution_actually_applied_l"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/star"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="#ff0000" />
<EditText
android:id="@+id/edtInsUsedVolume"
android:layout_width="0dp"
@ -986,7 +992,7 @@
android:inputType="numberDecimal" />
</LinearLayout>
<LinearLayout
<!--LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
@ -1004,7 +1010,7 @@
android:layout_weight="1"
android:ems="10"
android:inputType="numberDecimal" />
</LinearLayout>
</LinearLayout-->
<LinearLayout
android:layout_width="match_parent"
@ -1535,7 +1541,7 @@
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
<!--LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
@ -1550,7 +1556,7 @@
android:id="@+id/spiSprCapacity"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout-->
<LinearLayout
android:layout_width="match_parent"
@ -1560,7 +1566,7 @@
android:id="@+id/tvSprManufacturer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/Spray_manufacturer"
android:text="@string/Spray_manufacturer_model"
android:textAppearance="?android:attr/textAppearanceSmall" />
<EditText
@ -1572,7 +1578,7 @@
android:inputType="text" />
</LinearLayout>
<LinearLayout
<!--LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
@ -1590,7 +1596,7 @@
android:layout_weight="1"
android:ems="10"
android:inputType="text" />
</LinearLayout>
</LinearLayout-->
<LinearLayout
android:layout_width="match_parent"
@ -1668,8 +1674,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/Spacing_of_barriers_m"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/star"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="#ff0000" />
<EditText
android:id="@+id/edtSprBarrierSpace"
android:layout_width="0dp"
@ -1709,23 +1721,6 @@
</EditText>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<TextView
android:id="@+id/tvSprGPS"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/Antenna_DGPS_used"
android:textAppearance="?android:attr/textAppearanceSmall" />
<dbfields.SpinnerDB
android:id="@+id/spiSprGPS"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
@ -1948,32 +1943,6 @@
android:visibility="invisible" />
</GridLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<TextView
android:id="@+id/tvProtectiveClothingClean"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/Protective_clothing_clean_and_in_good_state"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/star"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="#ff0000" />
<dbfields.SpinnerDB
android:id="@+id/spiProtectiveClothingClean"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >

2323
app/src/main/res/layout-large/activity_locust_health.xml Normal file
View File

File diff suppressed because it is too large Load Diff

85
app/src/main/res/layout/activity_locust_del.xml
View File

@ -1131,8 +1131,11 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingLeft="@dimen/activity_horizontal_margin">
android:gravity="center">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_star" />
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -1152,7 +1155,7 @@
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout
<!--LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -1174,7 +1177,7 @@
android:singleLine="true"
android:inputType="numberDecimal"/>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</LinearLayout-->
<LinearLayout
android:layout_width="match_parent"
@ -1714,7 +1717,7 @@
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout
<!--LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -1729,7 +1732,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</LinearLayout-->
<LinearLayout
android:layout_width="match_parent"
@ -1748,31 +1751,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:hint="@string/Spray_manufacturer"
android:maxLines="1"
android:singleLine="true"
android:inputType="text"/>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingLeft="@dimen/activity_horizontal_margin">
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtSprModel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:hint="@string/Model_sprayer"
android:hint="@string/Spray_manufacturer_model"
android:maxLines="1"
android:singleLine="true"
android:inputType="text"/>
@ -1850,8 +1829,11 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingLeft="@dimen/activity_horizontal_margin">
android:gravity="center">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_star" />
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -1899,23 +1881,6 @@
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingLeft="@dimen/activity_horizontal_margin">
<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/Antenna_DGPS_used">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiSprGPS"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -2140,26 +2105,6 @@
android:visibility="invisible" />
</GridLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_star" />
<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/Protective_clothing_clean_and_in_good_state">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiProtectiveClothingClean"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

2483
app/src/main/res/layout/activity_locust_health.xml Normal file
View File

File diff suppressed because it is too large Load Diff

13
app/src/main/res/layout/activity_main.xml
View File

@ -89,7 +89,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginBottom="62dp"
android:layout_marginLeft="62dp"
android:layout_marginRight="62dp"
android:minHeight="70dp"
@ -100,6 +99,18 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginTop="52dp"
android:layout_marginLeft="62dp"
android:layout_marginRight="62dp"
android:minHeight="70dp"
android:text="@string/title_activity_locust_del"/>
<Button
android:id="@+id/btnLocustHealth"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginTop="52dp"
android:layout_marginLeft="62dp"
android:layout_marginRight="62dp"
android:minHeight="70dp"

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

@ -202,19 +202,18 @@
<string name="Ground">Yerüstü</string>
<string name="Spray_platform_h">Əl</string>
<string name="Spray_type">Çiləmə növü</string>
<string name="Spray_manufacturer">Çiləyicinin markası</string>
<string name="Model_sprayer">Çiləyicinin modeli</string>
<string name="Spray_manufacturer_model">Çiləyicinin markası/modeli</string>
<string name="Atomizer_height_above_ground_m">Torpaq səthi üzərindən püskürdücünün hündürlüyü (m)</string>
<string name="Barriers">Zolaqlar (baryerlər)</string>
<string name="Barrier_width_m">Zolaqların eni (m)</string>
<string name="Spacing_of_barriers_m">Zolaqlar arasında məsafə (m)</string>
<string name="Spacing_of_barriers_m">Keçidlər arasındakı interval (m)</string>
<string name="Forward_speed_km_h">Hərəkətin orta sürəti (km/saat)</string>
<string name="Antenna_DGPS_used">DGPS antennası istifadə olunub</string>
<string name="Ground_marking">Yerüstü nişanlama</string>
<string name="CONTROL_EFFICACY">Yerüstü nişanlama</string>
<string name="Biological_efficiency_of_treatment">Çiləmələrin bioloji səmərəliliyi (%) </string>
<string name="Biological_efficiency_of_treatment">Müşahidə olunan müalicə effektivliyi (%)</string>
<string name="Time_after_treatment_hours">Çiləmədən sonra keçən müddət (saat)</string>
<string name="Method_of_biological_efficiency_estimation">Bioloji səmərəliliyin hesablanması üsulu</string>
<string name="Method_of_biological_efficiency_estimation">Müalicələrin effektivliyinin qiymətləndirilməsi üsulu</string>
<string name="SAFETY_AND_ENVIRONMENT">Təhlükəsizlik və ətraf mühit</string>
<string name="Protective_clothing"><![CDATA[Fərdi mühafizə vasitələri]]></string>
<string name="Protective_clothing_clean_and_in_good_state">Mühafizə geyimləri təmiz və yaxşı vəziyyətdədir</string>
@ -327,4 +326,5 @@
<string name="Please_update_your_phone_tablet">Telefonunuz/planşetiniz köhnəlib, onu yeniləyin</string>
<string name="Test_questionnaire">Test anketi</string>
<string name="Copy_polygon">Çoxbucaqlı kopyalansın?</string>
<string name="title_activity_locust_health">İnsan sağlığı və ətraf mühit</string>
</resources>

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

@ -209,19 +209,18 @@
<string name="Ground">Մեքենայացված</string>
<string name="Spray_platform_h">Ձեռքով</string>
<string name="Spray_type">Սրսկման տեսակը</string>
<string name="Spray_manufacturer">Սրսկիչի անվանումը</string>
<string name="Model_sprayer"> Սրսկիչի մոդելը</string>
<string name="Spray_manufacturer_model">Սրսկիչի անվանումը/մոդելը</string>
<string name="Atomizer_height_above_ground_m">Սրսկման բարձրությունը հողի մակերևույթից (մ)</string>
<string name="Barriers">Արգելապատնեշներ</string>
<string name="Barrier_width_m">Արգելապատնեշի լայնությունը (մ)</string>
<string name="Spacing_of_barriers_m">Միջարգելապատնեշային տարածությունը (մ)</string>
<string name="Spacing_of_barriers_m">Անցումների միջև ընդմիջում (մ)</string>
<string name="Forward_speed_km_h">Շարժման միջին արագությունը</string>
<string name="Antenna_DGPS_used">Օգտագործվել է DGPS ալեհավաք</string>
<string name="Ground_marking">Տեղանշում</string>
<string name="CONTROL_EFFICACY">Արդյունավետության վերահսկում</string>
<string name="Biological_efficiency_of_treatment">Սրսկման կենսաբանական արդյունավետություն (%)</string>
<string name="Biological_efficiency_of_treatment">Դիտարկված բուժման արդյունավետություն (%)</string>
<string name="Time_after_treatment_hours">Սրսկումներից անցել է (ժամ)</string>
<string name="Method_of_biological_efficiency_estimation">Կենսաբանական արդյունավետության հաշվարկման մեթոդ</string>
<string name="Method_of_biological_efficiency_estimation">Բուժման արդյունավետության գնահատման մեթոդ</string>
<string name="SAFETY_AND_ENVIRONMENT">Անվտանգություն և շրջակա միջավայր</string>
<string name="Protective_clothing"><![CDATA[Անվտանգության անհատական միջոցներ]]></string>
<string name="Protective_clothing_clean_and_in_good_state">Արտահագուստը մաքուր և լավ վիճակում է</string>
@ -337,4 +336,5 @@
<string name="Please_update_your_phone_tablet">Ձեր հեռախոսը/պլանշետը հնացած է, խնդրում ենք թարմացնել այն</string>
<string name="Test_questionnaire">Թեստային հարցաթերթիկ</string>
<string name="Copy_polygon">Պատճենե՞լ բազմանկյունը:</string>
<string name="title_activity_locust_health">Մարդու և շրջակա միջավայրի առողջություն</string>
</resources>

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

@ -204,19 +204,18 @@
<string name="Ground">სახმელეთო</string>
<string name="Spray_platform_h">ხელის</string>
<string name="Spray_type">შესხურების სახეობა</string>
<string name="Spray_manufacturer">შემასხურებელის მარკა</string>
<string name="Model_sprayer">შემასხურებელის მოდელი</string>
<string name="Spray_manufacturer_model">შემასხურებელის მარკა/მოდელი</string>
<string name="Atomizer_height_above_ground_m">შემასხურებელის სიმაღლე მიწის ზედაპირიდან (მ)</string>
<string name="Barriers">ბარიერები</string>
<string name="Barrier_width_m">ბარიერების სიგანე (მ)</string>
<string name="Spacing_of_barriers_m">მანძილი ბარიერებს შორის (მ)</string>
<string name="Spacing_of_barriers_m">პასებს შორის ინტერვალი (მ)</string>
<string name="Forward_speed_km_h">მოძრაობის საშუალო სიჩქარე (კმ/სთ)</string>
<string name="Antenna_DGPS_used">DGPS ანტენა გამოიყენებოდა</string>
<string name="Ground_marking">სახმელეთო - საორიენტაცია ნიშნები</string>
<string name="CONTROL_EFFICACY">ეფექტურობის კონტროლი</string>
<string name="Biological_efficiency_of_treatment">დამუშავების ბიოლოგიური ეფექტურობა (%)</string>
<string name="Biological_efficiency_of_treatment">დაკვირვებული მკურნალობის ეფექტურობა (%)</string>
<string name="Time_after_treatment_hours">დამუშავების შემდეგ გასული დრო</string>
<string name="Method_of_biological_efficiency_estimation">ბიოლოგიური ეფექტურობის შეფასების მეთოდი</string>
<string name="Method_of_biological_efficiency_estimation">მკურნალობის ეფექტურობის შეფასების მეთოდი</string>
<string name="SAFETY_AND_ENVIRONMENT">უსაფრთხოება და ეკოლოგია</string>
<string name="Protective_clothing"><![CDATA[ინდივიდუალური დაცვის საშუალებები]]></string>
<string name="Protective_clothing_clean_and_in_good_state">დამცავი ტანსაცმელი სუფთაა და კარგ მდგომარეობაში?</string>
@ -328,4 +327,5 @@
<string name="Please_update_your_phone_tablet">თქვენი ტელეფონი/ტაბლეტი მოძველებულია, გთხოვთ განაახლოთ იგი</string>
<string name="Test_questionnaire">ტესტის კითხვარი</string>
<string name="Copy_polygon">დააკოპირეთ მრავალკუთხედი?</string>
<string name="title_activity_locust_health">ადამიანის და გარე გარემოცვას ჯანმრთელობა</string>
</resources>

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

@ -203,19 +203,18 @@
<string name="Ground">Жердеги</string>
<string name="Spray_platform_h">Кол менен</string>
<string name="Spray_type">Уу чачуу түрү</string>
<string name="Spray_manufacturer">Уу чачкычтын маркасы</string>
<string name="Model_sprayer">Уу чачкычтын модели</string>
<string name="Spray_manufacturer_model">Уу чачкычтын маркасы/модели</string>
<string name="Atomizer_height_above_ground_m">Уу чачкычтын жерден бийиктиги (м) </string>
<string name="Barriers">Сап калтырып иштетүүлөр</string>
<string name="Barrier_width_m">Саптын туурасы (м)</string>
<string name="Spacing_of_barriers_m">Саптын аралыгы (м)</string>
<string name="Spacing_of_barriers_m">Өтүүлөрдүн ортосундагы интервал (м)</string>
<string name="Forward_speed_km_h">Кыймылдын орточо ылдамдыгы (км/саат)</string>
<string name="Antenna_DGPS_used">DGPS антеннасы колдонулдубу?</string>
<string name="Ground_marking">Жер бетине белги коюу</string>
<string name="CONTROL_EFFICACY">Эффективдүүлүктү контролдоо</string>
<string name="Biological_efficiency_of_treatment">Иштетүүлөрдүн биологиялык эффективдүүлүгү (%)</string>
<string name="Biological_efficiency_of_treatment">Байланган дарылоо натыйжалуулугу (%)</string>
<string name="Time_after_treatment_hours">Иштетүүдөн кийин өткөн убакыт (саат)</string>
<string name="Method_of_biological_efficiency_estimation">Биологиялык эффективдүүлүктү эсептөө ыкмасы</string>
<string name="Method_of_biological_efficiency_estimation">Дарылоонун натыйжалуулугун баалоо ыкмасы</string>
<string name="SAFETY_AND_ENVIRONMENT">Коопсуздук жана курчап турган чөйрө</string>
<string name="Protective_clothing"><![CDATA[Өздүк коргоо каражаттары]]></string>
<string name="Protective_clothing_clean_and_in_good_state">Коргоочу кийим таза жана жакшы абалдабы?</string>
@ -332,5 +331,5 @@
<string name="Please_update_your_phone_tablet">Телефонуңуз/планшетиңиз эскирген, аны жаңыртыңыз</string>
<string name="Test_questionnaire">Тест анкетасы</string>
<string name="Copy_polygon">Көп бурчтук көчүрүлсүнбү?</string>
<string name="title_activity_locust_health">Инсандын сагаты жана айылдык мойнунун сагынуусы.</string>
</resources>

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

@ -206,19 +206,18 @@
<string name="Ground">Жер үсті</string>
<string name="Spray_platform_h">Қолмен</string>
<string name="Spray_type">Бүркудің түрі</string>
<string name="Spray_manufacturer">Бүріккіштің маркасы</string>
<string name="Model_sprayer">Бүріккіштің моделі</string>
<string name="Spray_manufacturer_model">Бүріккіштің маркасы/моделі</string>
<string name="Atomizer_height_above_ground_m">Бүріккіш шашқышының жер бетінен биіктігі (м)</string> <!-- Last value: Бүріккіштің жер бетінен биіктігі (м) -->
<string name="Barriers">Тосқауылдар</string>
<string name="Barrier_width_m">Тосқауылдың ені (м)</string>
<string name="Spacing_of_barriers_m">Тосқауылдардың арасы (м)</string>
<string name="Spacing_of_barriers_m">Өтулер арасындағы интервал (м)</string>
<string name="Forward_speed_km_h">Орташа жүру жылдамдығы (км/ч)</string>
<string name="Antenna_DGPS_used"> DGPS антеннасы қолданылды</string>
<string name="Ground_marking">Жер үсті маркировкасы</string>
<string name="CONTROL_EFFICACY">Тиімділікті бақылау</string>
<string name="Biological_efficiency_of_treatment">Өңдеудің биологиялық тиімділігі (%)</string>
<string name="Biological_efficiency_of_treatment">Бақыланатын емдеу тиімділігі (%)</string>
<string name="Time_after_treatment_hours">Өңдеуден кейін өткен уақыт (сағат)</string>
<string name="Method_of_biological_efficiency_estimation">Биологиялық тиімділікті анықтау үшін есептеу тәсілі</string>
<string name="Method_of_biological_efficiency_estimation">Емдеу тиімділігін бағалау әдісі</string>
<string name="SAFETY_AND_ENVIRONMENT">Қауіпсіздік және қоршаған орта</string>
<string name="Protective_clothing"><![CDATA[Жеке қорғаныс заттары]]></string>
<string name="Protective_clothing_clean_and_in_good_state">Қорғау киімі таза және жақсы қалыпта?</string>
@ -335,5 +334,6 @@
<string name="Please_update_your_phone_tablet">Телефоныңыз/планшетіңіз ескірген, оны жаңартыңыз</string>
<string name="Test_questionnaire">Тест сауалнамасы</string>
<string name="Copy_polygon">Көпбұрышты көшіру керек пе?</string>
<string name="title_activity_locust_health">Адамның денсаулығы мен шектеулі аурухана.</string>
</resources>

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

@ -208,19 +208,18 @@
<string name="Ground">زمینی</string>
<string name="Spray_platform_h">فرد/ شخص</string>
<string name="Spray_type">نوع محلول پاشی/ سمپاشی</string>
<string name="Spray_manufacturer">ساخت محلول پاش </string>
<string name="Model_sprayer">مودل محلول پاش</string>
<string name="Spray_manufacturer_model">ساخت محلول پاش\مودل</string>
<string name="Atomizer_height_above_ground_m">ارتفاع اتومایزر بالای زمین ( m)</string>
<string name="Barriers">ساحه باقی مانده</string>
<string name="Barrier_width_m">عرض (m)</string>
<string name="Spacing_of_barriers_m">فاصله (m)</string>
<string name="Spacing_of_barriers_m">فاصله بین پاس ها (m)</string>
<string name="Forward_speed_km_h">سرعت حرکت (km/h)</string>
<string name="Antenna_DGPS_used">DGPS استفاده شده</string>
<string name="Ground_marking">علامت گذاری زمینی</string>
<string name="CONTROL_EFFICACY">مؤثریت کنترول</string>
<string name="Biological_efficiency_of_treatment">تآثیرات بیولوژیکی کنترول (%)</string>
<string name="Biological_efficiency_of_treatment">بازده درمان مشاهده شده (%)</string>
<string name="Time_after_treatment_hours">زمان بعد از کنترول ( ساعت )</string>
<string name="Method_of_biological_efficiency_estimation">طریقه تخمین مؤثریت بیولوژیکی</string>
<string name="Method_of_biological_efficiency_estimation">روشی برای ارزیابی اثربخشی درمان ها</string>
<string name="SAFETY_AND_ENVIRONMENT">ایمنی و محیط</string>
<string name="Protective_clothing"><![CDATA[لباس تحفظی ]]></string>
<string name="Protective_clothing_clean_and_in_good_state">پاکی لباس تحفظی و حالت خوب بودن آن</string>
@ -340,4 +339,5 @@
<string name="Please_update_your_phone_tablet">ستاسو تلیفون / ټابلیټ زوړ دی، مهرباني وکړئ تازه یې کړئ</string>
<string name="Test_questionnaire">د ازموینې پوښتنلیک</string>
<string name="Copy_polygon">کاپي پولیګون؟</string>
<string name="title_activity_locust_health">زنده وجود د صحت او د محیطي خلکو سلامتي.</string>
</resources>

14
app/src/main/res/values-ru/strings.xml
View File

@ -55,10 +55,10 @@
<string name="Time_coincide">Время сервера и время КПК не совпадают</string>
<string name="Select">Выбрать</string>
<string name="title_activity_locust">Обследование саранчи</string>
<string name="title_activity_locust_list">Список обследований саранчи</string>
<string name="title_activity_locust_del">Противосаранчовые обработки</string>
<string name="title_activity_locust_health">Здоровье человека и окружающей среды</string>
<string name="title_activity_locust_del_list">Список стандартных форм по борьбе с саранчой</string>
<string name="title_activity_login">ASDC</string> <!-- Авторизация -->
<string name="title_activity_setup">Настройки</string>
@ -199,7 +199,7 @@
<string name="Spray_direction_start">Направление опрыскивания нач.</string>
<string name="Spray_direction_end">Направление опрыскивания кон.</string>
<string name="Type">Вид</string>
<string name="Locust_type">Вид</string>
<string name="Locust_type">Тип</string> <!-- Должно быть тип ! Не менять. -->
<string name="Del_Hopper_stages">Возраст личинок</string>
<string name="Density_m2">Плотность на м²</string>
<string name="Del_Swarms">Стаи</string>
@ -211,19 +211,18 @@
<string name="Ground">Наземное</string>
<string name="Spray_platform_h">Ручное</string>
<string name="Spray_type">Вид опрыскивания</string>
<string name="Spray_manufacturer">Марка опрыскивателя</string>
<string name="Model_sprayer">Модель опрыскивателя</string>
<string name="Spray_manufacturer_model">Марка/модель опрыскивателя</string>
<string name="Atomizer_height_above_ground_m">Высота распылителя над поверхностью почвы (м)</string>
<string name="Barriers">Барьеры</string>
<string name="Barrier_width_m">Ширина барьера (м)</string>
<string name="Spacing_of_barriers_m">Промежуток барьера (м)</string>
<string name="Spacing_of_barriers_m">Интервал между проходами (м)</string>
<string name="Forward_speed_km_h">Средняя скорость движения (км/ч)</string>
<string name="Antenna_DGPS_used">Антенна: DGPS использовалась</string>
<string name="Ground_marking">Наземная маркировка</string>
<string name="CONTROL_EFFICACY">Контроль эффективности</string>
<string name="Biological_efficiency_of_treatment">Биологическая эффективность обработки (%)</string>
<string name="Biological_efficiency_of_treatment">Наблюдаемая эффективность обработки (%)</string>
<string name="Time_after_treatment_hours">Прошло времени после обработки (часов)</string>
<string name="Method_of_biological_efficiency_estimation">Метод подсчета биологической эффективности</string>
<string name="Method_of_biological_efficiency_estimation">Метод оценки эффективности обработок</string>
<string name="SAFETY_AND_ENVIRONMENT">Безопасность и окружающая среда</string>
<string name="Protective_clothing"><![CDATA[Индивидуальные средства защиты]]></string>
<string name="Protective_clothing_clean_and_in_good_state">Защитная одежда чистая и в хорошем состоянии?</string>
@ -344,5 +343,4 @@
<string name="Please_update_your_phone_tablet">Ваш смартфон/планшет устарел, пожалуйста обновите его</string>
<string name="Test_questionnaire">Тестовая анкета</string>
<string name="Copy_polygon">Скопировать полигон?</string>
</resources>

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

@ -204,19 +204,18 @@
<string name="Ground">Заминӣ</string>
<string name="Spray_platform_h">Дастӣ</string>
<string name="Spray_type">Намуди дорупошӣ</string>
<string name="Spray_manufacturer">Тамғаи дорупошак</string>
<string name="Model_sprayer">Модели дорупошак</string>
<string name="Spray_manufacturer_model">Тамғаи/модели дорупошак</string>
<string name="Atomizer_height_above_ground_m">Баландии пошдиҳак аз сатҳи хок (м)</string>
<string name="Barriers">Монеаҳо</string>
<string name="Barrier_width_m">Васеъгии монеа (м)</string>
<string name="Spacing_of_barriers_m">Фосилаи монеа (м)</string>
<string name="Spacing_of_barriers_m">Фосилаи байни гузаришҳо (м)</string>
<string name="Forward_speed_km_h">Суръати миёнаи ҳаракат (км/с)</string>
<string name="Antenna_DGPS_used">Истифодаи антенаи DGPS</string>
<string name="Ground_marking">Аломатгузории заминӣ</string>
<string name="CONTROL_EFFICACY">Назорати самаранокӣ</string>
<string name="Biological_efficiency_of_treatment">Самаранокии биологии коркард (%)</string>
<string name="Biological_efficiency_of_treatment">Самаранокии табобат (%)</string>
<string name="Time_after_treatment_hours">Гузаштани вақт пас аз коркард (соат)</string>
<string name="Method_of_biological_efficiency_estimation">Усули ҳисоб кардани самаранокии биологӣ</string>
<string name="Method_of_biological_efficiency_estimation">Усули арзёбии самаранокии табобат</string>
<string name="SAFETY_AND_ENVIRONMENT">Бехатарӣ ва муҳити зист</string>
<string name="Protective_clothing"><![CDATA[Либосҳои муҳофизавии шахсӣ]]></string>
<string name="Protective_clothing_clean_and_in_good_state">Либосҳои муҳофизавӣ тоза ва дар ҳолати хуб аст?</string>
@ -339,4 +338,5 @@
<string name="Please_update_your_phone_tablet">Телефон/планшети шумо кӯҳна шудааст, лутфан онро навсозӣ кунед</string>
<string name="Test_questionnaire">Саволномаи тестӣ</string>
<string name="Copy_polygon">Бисёркунҷаро нусхабардорӣ кунед?</string>
<string name="title_activity_locust_health">Саломатии инсон ва муҳити зист</string>
</resources>

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

@ -205,19 +205,18 @@
<string name="Ground">Ýeriň üstünden</string>
<string name="Spray_platform_h">El bilen</string>
<string name="Spray_type">Sepilişiň görnüşi</string>
<string name="Spray_manufacturer">Pürküji enjamyň markasy</string>
<string name="Model_sprayer">Pürküji enjamyň modeli</string>
<string name="Spray_manufacturer_model">Pürküji enjamyň markasy/modeli</string>
<string name="Atomizer_height_above_ground_m">Pürküjiniň ýerden beýikligi (m)</string>
<string name="Barriers">Zolaklar</string>
<string name="Barrier_width_m">Pürkülýän zolaklaryň ini (m)</string>
<string name="Spacing_of_barriers_m">Zolakara meýdanyň ini (m)</string>
<string name="Spacing_of_barriers_m">Geçişleriň (m) aralygy</string>
<string name="Forward_speed_km_h">Hereketiň ortaça tizligi(km/sag)</string>
<string name="Antenna_DGPS_used">Antena DGPS ulanyldy</string>
<string name="Ground_marking">Ýer üsti belgilenişi</string>
<string name="CONTROL_EFFICACY">Serişdäniň netijeliliginiň barlagy</string>
<string name="Biological_efficiency_of_treatment">Işiň biologiki netijeliligi (%)</string>
<string name="Biological_efficiency_of_treatment">Göz öňünde tutulan bejerginiň netijeliligi (%)</string>
<string name="Time_after_treatment_hours">Işlenenden soň geçen wagt</string>
<string name="Method_of_biological_efficiency_estimation">Biýologiki netijeliligi hasaplamagyň usullary</string>
<string name="Method_of_biological_efficiency_estimation">Bejerginiň netijeliligini bahalandyrmagyň usuly</string>
<string name="SAFETY_AND_ENVIRONMENT">Howpsuzlyk we daşky gurşaw</string>
<string name="Protective_clothing"><![CDATA[Şahsy goranyş eşigi]]></string>
<string name="Protective_clothing_clean_and_in_good_state">Şahsy goranyş eşigi arassa we gowy ýagdaýda</string>
@ -338,4 +337,5 @@
<string name="Number_of_bands">Toparlaryň sany</string>
<string name="Test_questionnaire">Synag anketasy</string>
<string name="Copy_polygon">Köpburçlygy göçüriň?</string>
<string name="title_activity_locust_health">Adam döwleti we goraýyş ortalygyň saýlamlylygy.</string>
</resources>

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

@ -206,19 +206,18 @@
<string name="Ground">Erdan</string>
<string name="Spray_platform_h">Qo\'l purkagichi</string>
<string name="Spray_type">Purkash turi</string>
<string name="Spray_manufacturer">Purkagich rusumi</string>
<string name="Model_sprayer">Purkagich modeli</string>
<string name="Spray_manufacturer_model">Purkagich rusumi/modeli</string>
<string name="Atomizer_height_above_ground_m">Purkashning er yuzasidan balandligi (m)</string>
<string name="Barriers">To\'siq</string>
<string name="Barrier_width_m">To\'siq uzunligi (m)</string>
<string name="Spacing_of_barriers_m">To\'siq oralig\'i (m)</string>
<string name="Spacing_of_barriers_m">O\'tishlar orasidagi interval (m)</string>
<string name="Forward_speed_km_h">Harakatning o\'rtacha tezligi (km/s)</string>
<string name="Antenna_DGPS_used">DGPS antennalardan foydalanilganligi </string>
<string name="Ground_marking">Purkash joyini belgilash</string>
<string name="CONTROL_EFFICACY">Samaradorligini tekshirish</string>
<string name="Biological_efficiency_of_treatment">Ishlovning biologik samaradorligi (%)</string>
<string name="Biological_efficiency_of_treatment">Kuzatilgan davolash samaradorligi (%)</string>
<string name="Time_after_treatment_hours">Ishlovdan keyin o\'tgan vaqt (soat)</string>
<string name="Method_of_biological_efficiency_estimation">Biologik samaradorlikni aniqlash usuli</string>
<string name="Method_of_biological_efficiency_estimation">Davolashning samaradorligini baholash usuli</string>
<string name="SAFETY_AND_ENVIRONMENT">Xavfsizlik va atrof muhit</string>
<string name="Protective_clothing"><![CDATA[Maxsus himoya vositalari]]></string>
<string name="Protective_clothing_clean_and_in_good_state">Himoya kiyimi toza va yaxshi holatdami?</string>
@ -340,4 +339,5 @@
<string name="Number_of_bands">Bantlar soni</string>
<string name="Test_questionnaire">Test anketasi</string>
<string name="Copy_polygon">Ko‘pburchak nusxalansinmi?</string>
<string name="title_activity_locust_health">Inson va atrof-muhit salomatligi</string>
</resources>

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

@ -221,12 +221,11 @@
<string name="Ground">Ground</string>
<string name="Spray_platform_h">Person</string>
<string name="Spray_type">Spray type</string>
<string name="Spray_manufacturer">Sprayer manufacturer</string>
<string name="Model_sprayer">Sprayer model</string>
<string name="Spray_manufacturer_model">Sprayer manufacturer/model</string>
<string name="Atomizer_height_above_ground_m">Atomizer height above ground (m)</string>
<string name="Barriers">Barriers</string>
<string name="Barrier_width_m">Barrier Width (m)</string>
<string name="Spacing_of_barriers_m">Spacing of barriers (m)</string>
<string name="Spacing_of_barriers_m">Interval between passes (m)</string>
<string name="Forward_speed_km_h">Forward speed (km/h)</string>
<string name="Antenna_DGPS_used">Antenna: DGPS used</string>
<string name="Ground_marking">Ground marking</string>
@ -344,4 +343,5 @@
<string name="Please_update_your_phone_tablet">Your smartphone/tablet is out of date, please update it</string>
<string name="Test_questionnaire">Test questionnaire</string>
<string name="Copy_polygon">Copy polygon?</string>
<string name="title_activity_locust_health">Human and environmental health</string>
</resources>

2
build.gradle
View File

@ -7,7 +7,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.1.2'
classpath 'com.android.tools.build:gradle:8.3.2'
// NOTE: Do not place your application dependencies here; they belong

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip