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) {