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

Merge branch 'master' of https://git.dirt.kz/igor/ASDC

Browse Source 
# Conflicts:
#	app/src/main/java/kz/istt/locust/LocustHealthActivity.java
This commit is contained in:
igor
2024-08-15 17:13:42 +05:00
parent bb99f1644e 7cfe8f1ff4
commit 0b7bd6e428
11 changed files with 519 additions and 897 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/kz/istt/locust/DBGUITable.java
View File

@ -304,7 +304,7 @@ public class DBGUITable
Log.e("CCALM", "1 field " + cursor.getColumnName(i) + " = " + cursor.getString(i) + " type= " + cursor.getType(i));
}
if(cursor.getType(i)==2){ //Because cutting double
if(cursor.getType(i)==Cursor.FIELD_TYPE_FLOAT){ //Because cutting double
setValue(obj, ""+cursor.getDouble(i));
}else {
setValue(obj, cursor.getString(i));

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

@ -2474,7 +2474,7 @@ public class LocustDelActivity extends FragmentActivity implements LocationListe
if(!eFields && !isGONE(spiSafNonTarget) && ((selectDB)spiSafNonTarget).getText().toString().isBlank()) // воздействие на нецелевые организмы
{
scrollTo(spiSafNonTarget);
atxt = atxt + ": \"" + getResources().getString(R.string.Effect_on_non_terget_organism) + "\"!";
atxt = atxt + ": \"" + getResources().getString(R.string.Effect_on_non_target_organism) + "\"!";
eFields = true;
}
if (eFields) // Если не заполнены все обязательные поля

1100
app/src/main/java/kz/istt/locust/LocustHealthActivity.java
View File

File diff suppressed because it is too large Load Diff

14
app/src/main/java/kz/istt/locust/MySynchronizationOld.java
View File

@ -231,7 +231,7 @@ public class MySynchronizationOld
{
String val="";
if(!cursor.isNull(i)) {
if (cursor.getType(i) == 2) { //Because cutting double
if (cursor.getType(i) == Cursor.FIELD_TYPE_FLOAT) { //Because cutting double
val = "" + cursor.getDouble(i);
} else {
val = cursor.getString(i);
@ -307,7 +307,7 @@ public class MySynchronizationOld
{
String val="";
if(!cursor.isNull(i)) {
if (cursor.getType(i) == 2) { //Because cutting double
if (cursor.getType(i) == Cursor.FIELD_TYPE_FLOAT) { //Because cutting double
val = "" + cursor.getDouble(i);
} else {
val = cursor.getString(i);
@ -413,11 +413,17 @@ public class MySynchronizationOld
if(fname!=null && !fname.equals(""))
myThread.addRequest("pic5","xml",MySynchronizationOld.URL+"/get/?fn=6", null, null,Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + fname,null);
for(int i=0;i<cursor.getColumnCount();i++)
{
String columnName = cursor.getColumnName(i);
String value = cursor.getString(i);
String value=null;
if(!cursor.isNull(i)) {
if (cursor.getType(i) == Cursor.FIELD_TYPE_FLOAT) { //Because cutting double
value = "" + cursor.getDouble(i);
} else {
value = cursor.getString(i);
}
}
try {
jsonObject.put(columnName, value);
} catch (JSONException e) {

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

@ -2347,7 +2347,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/Effect_on_non_terget_organism">
android:hint="@string/Effect_on_non_target_organism">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiSafNonTarget"
android:layout_width="match_parent"

99
app/src/main/res/layout-land/activity_locust_health.xml
View File

@ -501,6 +501,92 @@
app:iconSize="24dp" />
</LinearLayout>
<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" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false"
android:divider="@drawable/spacer_medium"
android:gravity="center"
android:showDividers="middle">
<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/edtLatCenter2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/transparent"
android:enabled="false"
android:hint="@string/Lat_center"
android:maxLines="1"
android:singleLine="true" />
</com.google.android.material.textfield.TextInputLayout>
<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/edtLonCenter2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/transparent"
android:enabled="false"
android:hint="@string/Lon_center"
android:maxLines="1"
android:singleLine="true" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/btnGetGPSCenter2"
style="@style/Widget.MaterialComponents.Button.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:insetLeft="0dp"
android:insetTop="0dp"
android:insetRight="0dp"
android:insetBottom="0dp"
android:minWidth="40dp"
app:icon="@drawable/ic_location"
app:iconGravity="textStart"
app:iconPadding="0dp"
app:iconSize="24dp" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btnDelGPSCenter2"
style="@style/Widget.MaterialComponents.Button.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:insetLeft="0dp"
android:insetTop="0dp"
android:insetRight="0dp"
android:insetBottom="0dp"
android:minWidth="40dp"
app:icon="@drawable/ic_delete"
app:iconGravity="textStart"
app:iconPadding="0dp"
app:iconSize="24dp" />
</LinearLayout>
</LinearLayout>
<!--LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -1760,6 +1846,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llSprLeakPlace"
android:baselineAligned="false"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -1773,7 +1860,7 @@
android:background="@color/transparent"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtSprLeakPlase"
android:id="@+id/edtSprLeakPlace"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
@ -1803,8 +1890,8 @@
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<!-- TODO в коде сделать android:visibility="gone" -->
<LinearLayout
android:id="@+id/llSprDamagePlace"
android:baselineAligned="false"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -1818,7 +1905,7 @@
android:background="@color/transparent"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtSprDamagePlase"
android:id="@+id/edtSprDamagePlace"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
@ -2169,6 +2256,7 @@
<!-- The following 3 submenus (fields) appear if yes is selected, by default the fields below are hidden -->
<LinearLayout
android:id="@+id/llCalibrTime"
android:baselineAligned="false"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -2195,6 +2283,7 @@
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/llCalibrVolume"
android:baselineAligned="false"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -2221,6 +2310,7 @@
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/llCalibrRate"
android:baselineAligned="false"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -3229,7 +3319,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:hint="@string/Effect_on_non_terget_organism">
android:hint="@string/Effect_on_non_target_organism">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiSafNonTarget"
android:layout_width="match_parent"
@ -3451,6 +3541,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llSafControlActions"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"

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

@ -2193,7 +2193,7 @@
android:id="@+id/tvSafNonTarget"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/Effect_on_non_terget_organism"
android:text="@string/Effect_on_non_target_organism"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold" />
<dbfields.SpinnerDB

95
app/src/main/res/layout-large/activity_locust_health.xml
View File

@ -505,6 +505,85 @@
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:divider="@drawable/spacer_medium"
android:showDividers="middle">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_star"
android:contentDescription="@null"
android:layout_gravity="center_vertical"/>
<TextView
android:id="@+id/tvLatCenter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/Lat_center"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold" />
<EditText
android:id="@+id/edtLatCenter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ems="10"
android:enabled="false"
android:inputType="numberDecimal" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_star"
android:contentDescription="@null"
android:layout_gravity="center_vertical"/>
<TextView
android:id="@+id/tvLonCenter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/Lon_center"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold" />
<EditText
android:id="@+id/edtLonCenter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ems="10"
android:enabled="false"
android:inputType="numberDecimal" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btnGetGPSCenter"
style="@style/Widget.MaterialComponents.Button.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:insetLeft="0dp"
android:insetTop="0dp"
android:insetRight="0dp"
android:insetBottom="0dp"
android:minWidth="40dp"
app:icon="@drawable/ic_location"
app:iconGravity="textStart"
app:iconPadding="0dp"
app:iconSize="24dp" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btnDelGPSCenter"
style="@style/Widget.MaterialComponents.Button.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:insetLeft="0dp"
android:insetTop="0dp"
android:insetRight="0dp"
android:insetBottom="0dp"
android:minWidth="40dp"
app:icon="@drawable/ic_delete"
app:iconGravity="textStart"
app:iconPadding="0dp"
app:iconSize="24dp" />
</LinearLayout>
<!--LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<ImageView
@ -531,7 +610,7 @@
android:layout_height="wrap_content"
style="@style/SpinnerStyle"
android:minHeight="@dimen/minHeight"/>
</LinearLayout>
</LinearLayout-->
<LinearLayout
android:layout_width="match_parent"
@ -1701,14 +1780,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/Mechanical_safety_any_insecticide_leakage_observed"
android:textAppearance="?android:attr/textAppearanceSmall" />
<dbfields.SpinnerDB
android:id="@+id/spiSprLeak"
android:layout_width="match_parent"
@ -1718,6 +1795,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llSprLeakPlace"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin">
@ -1727,7 +1805,7 @@
android:text="@string/If_Yes_which_part_of_the_sprayer_shows_leakage"
android:textAppearance="?android:attr/textAppearanceSmall"/>
<EditText
android:id="@+id/edtSprLeakPlase"
android:id="@+id/edtSprLeakPlace"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@ -1756,6 +1834,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llSprDamagePlace"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin">
@ -1765,7 +1844,7 @@
android:text="@string/If_Yes_what_kind_of_damage"
android:textAppearance="?android:attr/textAppearanceSmall"/>
<EditText
android:id="@+id/edtSprDamagePlase"
android:id="@+id/edtSprDamagePlace"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@ -2105,6 +2184,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llCalibrTime"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin">
@ -2124,6 +2204,7 @@
android:inputType="numberDecimal" />
</LinearLayout>
<LinearLayout
android:id="@+id/llCalibrVolume"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin">
@ -2143,6 +2224,7 @@
android:inputType="numberDecimal" />
</LinearLayout>
<LinearLayout
android:id="@+id/llCalibrRate"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin">
@ -3125,7 +3207,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/Effect_on_non_terget_organism"
android:text="@string/Effect_on_non_target_organism"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold"
android:enabled="false"/>
@ -3376,6 +3458,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llSafControlActions"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin">

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

@ -2338,7 +2338,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/Effect_on_non_terget_organism">
android:hint="@string/Effect_on_non_target_organism">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiSafNonTarget"
android:layout_width="match_parent"

96
app/src/main/res/layout/activity_locust_health.xml
View File

@ -573,6 +573,91 @@
app:iconSize="24dp" />
</LinearLayout>
<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" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false"
android:divider="@drawable/spacer_medium"
android:gravity="center"
android:showDividers="middle">
<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/edtLatCenter2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/transparent"
android:enabled="false"
android:hint="@string/Lat_center"
android:maxLines="1"
android:singleLine="true" />
</com.google.android.material.textfield.TextInputLayout>
<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/edtLonCenter2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/transparent"
android:enabled="false"
android:hint="@string/Lon_center"
android:maxLines="1"
android:singleLine="true" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/btnGetGPSCenter2"
style="@style/Widget.MaterialComponents.Button.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:insetLeft="0dp"
android:insetTop="0dp"
android:insetRight="0dp"
android:insetBottom="0dp"
android:minWidth="40dp"
app:icon="@drawable/ic_location"
app:iconGravity="textStart"
app:iconPadding="0dp"
app:iconSize="24dp" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btnDelGPSCenter2"
style="@style/Widget.MaterialComponents.Button.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:insetLeft="0dp"
android:insetTop="0dp"
android:insetRight="0dp"
android:insetBottom="0dp"
android:minWidth="40dp"
app:icon="@drawable/ic_delete"
app:iconGravity="textStart"
app:iconPadding="0dp"
app:iconSize="24dp" />
</LinearLayout>
</LinearLayout>
<!--LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -1843,6 +1928,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llSprLeakPlace"
android:baselineAligned="false"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -1887,8 +1973,8 @@
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<!-- TODO в коде сделать android:visibility="gone" -->
<LinearLayout
android:id="@+id/llSprDamagePlace"
android:baselineAligned="false"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -2247,6 +2333,7 @@
<!-- The following 3 submenus (fields) appear if yes is selected, by default the fields below are hidden -->
<LinearLayout
android:id="@+id/llCalibrTime"
android:baselineAligned="false"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -2273,6 +2360,7 @@
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/llCalibrVolume"
android:baselineAligned="false"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -2299,6 +2387,7 @@
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/llCalibrRate"
android:baselineAligned="false"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -2348,6 +2437,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llCalibrWidthCard"
android:baselineAligned="false"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -2375,6 +2465,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llCalibrWindSpeed"
android:baselineAligned="false"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -2401,6 +2492,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llCalibrDropletCoating"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -2425,6 +2517,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llCalibrPassesInterval"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -3530,6 +3623,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llSafControlActions"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"

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

@ -415,7 +415,7 @@
<string name="Were_inhabitants_informed_about_the_insecticide_application">Были ли проинформированы жители о применении инсектицидов? (проверка бригадой по мониторингу)</string>
<string name="Any_surface_waters_nearby_the_treatment">Имеются ли в непосредственной близости от обработок поверхностные воды (в радиусе 2 км вокруг обрабатываемого участка)</string>
<string name="Distance_from_the_closest_edge_of_the_treated_area_m_to_the_nearest_surface_water">Расстояние от ближайшего края обрабатываемого участка (м) до ближайшего источника поверхностной воды</string>
<string name="Was_exposure_of_the_surface_water_probable">Was exposure of the surface water probable?</string>
<string name="Was_exposure_of_the_surface_water_probable">Существует ли вероятность воздействия на поверхностные воды?</string>
<string name="Any_apiculture_nearby_the_treatment">Имеются ли в непосредственной близости от обработок пчеловодства (в радиусе 5 км вокруг обрабатываемого участка)</string>
<string name="Distance_from_the_closest_edge_of_the_treated_area_m_to_the_apiary">Расстояние от ближайшего края обрабатываемого участка (м) до пасеки</string>
<string name="Were_beekeepers_informed_about_the_insecticide_application">Были ли пчеловоды проинформированы о применении инсектицидов</string>