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 I
2024-08-12 19:28:31 +05:00
parent e58241b321
commit 4f6c156571
9 changed files with 108 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/deploymentTargetSelector.xml generated
View File

@ -4,10 +4,10 @@
<selectionStates> <selectionStates>
<SelectionState runConfigName="app"> <SelectionState runConfigName="app">
<option name="selectionMode" value="DROPDOWN" /> <option name="selectionMode" value="DROPDOWN" />
<DropdownSelection timestamp="2024-08-08T11:32:33.898603700Z"> <DropdownSelection timestamp="2024-08-12T08:19:00.432171100Z">
<Target type="DEFAULT_BOOT"> <Target type="DEFAULT_BOOT">
<handle> <handle>
<DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\ivanov.i\.android\avd\Pixel_3a_API_34_extension_level_7_x86_64.avd" /> <DeviceId pluginId="PhysicalDevice" identifier="serial=8293a1b0" />
</handle> </handle>
</Target> </Target>
</DropdownSelection> </DropdownSelection>

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

@ -183,13 +183,23 @@ public class DBGUITable
if(type.equals("integer") || type.equals("boolean")) if(type.equals("integer") || type.equals("boolean"))
{ {
Integer val=null; Integer val=null;
if(value!=null) val= Integer.parseInt(value); if(value!=null) {
try {
val = Integer.parseInt(value);
} catch (NumberFormatException e) {
}
}
cv.put(field, val); cv.put(field, val);
}else }else
if(type.equals("double") || type.equals("float")) if(type.equals("double") || type.equals("float"))
{ {
Double val=null; Double val=null;
if(value!=null) val= Double.parseDouble(value); if(value!=null) {
try {
val = Double.parseDouble(value);
} catch (NumberFormatException e) {
}
}
cv.put(field, val); cv.put(field, val);
}else }else
{ {

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

@ -736,7 +736,7 @@ public class DbOpenHelper extends SQLiteOpenHelper
//Информация об инсектицидах //Информация об инсектицидах
"insecticide_part_number text," + //Номер партии препарата (если указан на контейнере) "insecticide_part_number text," + //Номер партии препарата (если указан на контейнере)
"insecticide_manufactured_date integer," + //Дата производства или срок годности (срок хранения) "insecticide_manufactured_date text," + //Дата производства или срок годности (срок хранения)
"insecticide_expiration_date integer," + //********** На всякий случай, может и не пригодиться ********** "insecticide_expiration_date integer," + //********** На всякий случай, может и не пригодиться **********
"insecticide_container_state_id integer," + //Состояние пакетов или контейнеров с инсектицидами "insecticide_container_state_id integer," + //Состояние пакетов или контейнеров с инсектицидами

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

@ -2,6 +2,7 @@ package kz.istt.locust;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
@ -34,6 +35,7 @@ import android.widget.ListView;
import android.widget.ScrollView; import android.widget.ScrollView;
import android.widget.Toast; import android.widget.Toast;
import androidx.core.content.FileProvider;
import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
@ -54,6 +56,8 @@ import dbfields.fieldDB;
import dbfields.selectDB; import dbfields.selectDB;
import tools.LatLonListener; import tools.LatLonListener;
import tools.OnClickListenerDateTime; import tools.OnClickListenerDateTime;
import tools.OnClickListenerImage;
import tools.OnClickListenerImageShow;
public class LocustHealthActivity extends FragmentActivity implements LocationListener, LatLonListener public class LocustHealthActivity extends FragmentActivity implements LocationListener, LatLonListener
{ {
@ -72,8 +76,8 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
// public Long created = null; // Дата создания записи секунд с 1970 года // public Long created = null; // Дата создания записи секунд с 1970 года
//public Integer user_id = null; //public Integer user_id = null;
public String ImageName = null; // Название файла рисунка //public String ImageName = null; // Название файла рисунка
public String tmp_ImageName = null; // Временное название файла //public String tmp_ImageName = null; // Временное название файла
//public EditText edtImage1 = null; // Фото //public EditText edtImage1 = null; // Фото
//public EditText edtImage2 = null; // Фото //public EditText edtImage2 = null; // Фото
@ -316,14 +320,20 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
public View btnImage1 = null; public View btnImage1 = null;
public View btnImage2 = null; public View btnImage2 = null;
public View btnImage3 = null; public View btnImage3 = null;
public View btnShowImage1 = null; public View btnImage4 = null;
public View btnShowImage2 = null; public View btnImage5 = null;
public View btnShowImage3 = null; //public View btnShowImage1 = null;
//public View btnShowImage2 = null;
//public View btnShowImage3 = null;
//public View btnShowImage4 = null;
//public View btnShowImage5 = null;
public View btnDelImage1 = null; public View btnDelImage1 = null;
public View btnDelImage2 = null; public View btnDelImage2 = null;
public View btnDelImage3 = null; public View btnDelImage3 = null;
public View btnDelImage4 = null;
public View btnDelImage5 = null;
private Uri mImageUri = null; //private Uri mImageUri = null;
private DBGUITable guiTableDel = null; private DBGUITable guiTableDel = null;
private DBGUITable guiTableHealth = null; private DBGUITable guiTableHealth = null;
@ -1122,7 +1132,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
findViewById(R.id.btnEffControl).setOnClickListener(new OnClickListener() { findViewById(R.id.btnEffControl).setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
alert(getString(R.string.Control_efficacy_conducted_control_team)); alert(getString(R.string.Information),getString(R.string.Control_efficacy_conducted_control_team));
} }
}); });
} }
@ -1195,7 +1205,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
findViewById(R.id.btnEffControl2).setOnClickListener(new OnClickListener() { findViewById(R.id.btnEffControl2).setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
alert(getString(R.string.Control_efficacy_conducted_monitoring_team)); alert(getString(R.string.Information),getString(R.string.Control_efficacy_conducted_monitoring_team));
} }
}); });
} }
@ -1451,7 +1461,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
findViewById(R.id.btnSafNonTargetEffectPerson).setOnClickListener(new OnClickListener() { findViewById(R.id.btnSafNonTargetEffectPerson).setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
alert(getString(R.string.If_reported_by_another_person_by_whom)); alert(getString(R.string.Information),getString(R.string.If_reported_by_another_person_by_whom));
} }
}); });
} }
@ -1512,7 +1522,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
findViewById(R.id.btnRiskHouse).setOnClickListener(new OnClickListener() { findViewById(R.id.btnRiskHouse).setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
alert(getString(R.string.Any_dwellings_or_housing_nearby_the_treatment)); alert(getString(R.string.Information),getString(R.string.Any_dwellings_or_housing_nearby_the_treatment));
} }
}); });
} }
@ -1575,7 +1585,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
findViewById(R.id.btnRiskWater).setOnClickListener(new OnClickListener() { findViewById(R.id.btnRiskWater).setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
alert(getString(R.string.Any_surface_waters_nearby_the_treatment)); alert(getString(R.string.Information),getString(R.string.Any_surface_waters_nearby_the_treatment));
} }
}); });
} }
@ -1628,7 +1638,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
findViewById(R.id.btnRiskApiary).setOnClickListener(new OnClickListener() { findViewById(R.id.btnRiskApiary).setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
alert(getString(R.string.Any_apiculture_nearby_the_treatment)); alert(getString(R.string.Information),getString(R.string.Any_apiculture_nearby_the_treatment));
} }
}); });
} }
@ -1741,7 +1751,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
findViewById(R.id.btnRiskSilk).setOnClickListener(new OnClickListener() { findViewById(R.id.btnRiskSilk).setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
alert(getString(R.string.Any_sericulture_nearby_the_treatment)); alert(getString(R.string.Information),getString(R.string.Any_sericulture_nearby_the_treatment));
} }
}); });
} }
@ -1859,7 +1869,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
findViewById(R.id.btnRiskPark).setOnClickListener(new OnClickListener() { findViewById(R.id.btnRiskPark).setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
alert(getString(R.string.Any_other_ecologically_sensitive_areas_nearby_the_treatment)); alert(getString(R.string.Information),getString(R.string.Any_other_ecologically_sensitive_areas_nearby_the_treatment));
} }
}); });
} }
@ -2810,8 +2820,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
Intent intent = new Intent(LocustHealthActivity.this, MapsActivity.class); Intent intent = new Intent(LocustHealthActivity.this, MapsActivity.class);
intent.putParcelableArrayListExtra("LatLon", ((LatLonAdapter)latlonList.getAdapter()).latlonList); intent.putParcelableArrayListExtra("LatLon", ((LatLonAdapter)latlonList.getAdapter()).latlonList);
intent.putExtra("uid", frmlocustdel_uid); intent.putExtra("uid", frmlocustdel_uid);
startActivityForResult(intent,4); startActivityForResult(intent,10);
startActivity(intent);
} }
}; };
btnOnMap.setOnClickListener(oclBtnOnMap); btnOnMap.setOnClickListener(oclBtnOnMap);
@ -2855,204 +2864,23 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
}; };
btnCancel.setOnClickListener(oclBtnCancel); btnCancel.setOnClickListener(oclBtnCancel);
// /* ((View) findViewById(R.id.btnImage1)).setOnClickListener(new OnClickListenerImage(this,1));
// * btnImage = (View) findViewById(R.id.btnImage); OnClickListener oclBtnImage = new OnClickListener() { ((View) findViewById(R.id.btnImage2)).setOnClickListener(new OnClickListenerImage(this,2));
// * ((View) findViewById(R.id.btnImage3)).setOnClickListener(new OnClickListenerImage(this,3));
// * @Override public void onClick(View v) { File directory = new File(Environment.getExternalStorageDirectory() + File.separator + "Pictures" + File.separator + "Locust"); directory.mkdirs(); ((View) findViewById(R.id.btnImage4)).setOnClickListener(new OnClickListenerImage(this,4));
// * ((View) findViewById(R.id.btnImage5)).setOnClickListener(new OnClickListenerImage(this,5));
// * tmp_ImageName = "locust_" + (System.currentTimeMillis() / 1000L) + ".jpg";
// * ((View) findViewById(R.id.btnShowImage1)).setOnClickListener(new OnClickListenerImageShow(this,edtImage1));
// * File file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + tmp_ImageName); mImageUri = Uri.fromFile(file); ((View) findViewById(R.id.btnShowImage2)).setOnClickListener(new OnClickListenerImageShow(this,edtImage2));
// * ((View) findViewById(R.id.btnShowImage3)).setOnClickListener(new OnClickListenerImageShow(this,edtImage3));
// * Intent intent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE); intent.putExtra(MediaStore.EXTRA_OUTPUT, mImageUri); startActivityForResult(intent, 1); } }; btnImage.setOnClickListener(oclBtnImage); ((View) findViewById(R.id.btnShowImage4)).setOnClickListener(new OnClickListenerImageShow(this,edtImage4));
// */ ((View) findViewById(R.id.btnShowImage5)).setOnClickListener(new OnClickListenerImageShow(this,edtImage5));
//
// btnImage1 = (View) findViewById(R.id.btnImage1); ((View) findViewById(R.id.btnDelImage1)).setOnClickListener(new OnClickListener(){ @Override public void onClick(View v){ edtImage1.setText(""); } });
// OnClickListener oclBtnImage = new OnClickListener() ((View) findViewById(R.id.btnDelImage2)).setOnClickListener(new OnClickListener(){ @Override public void onClick(View v){ edtImage2.setText(""); } });
// { ((View) findViewById(R.id.btnDelImage3)).setOnClickListener(new OnClickListener(){ @Override public void onClick(View v){ edtImage3.setText(""); } });
// @Override ((View) findViewById(R.id.btnDelImage4)).setOnClickListener(new OnClickListener(){ @Override public void onClick(View v){ edtImage4.setText(""); } });
// public void onClick(View v) ((View) findViewById(R.id.btnDelImage5)).setOnClickListener(new OnClickListener(){ @Override public void onClick(View v){ edtImage5.setText(""); } });
// {
// // Создаём папку если её нет
// File directory = new File(Environment.getExternalStorageDirectory() + File.separator + "Pictures" + File.separator + "Locust");
// directory.mkdirs();
//
// tmp_ImageName = "locust_" + (System.currentTimeMillis() / 1000L) + ".jpg";
//
// File file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + tmp_ImageName);
//
// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
// mImageUri = FileProvider.getUriForFile(LocustHealthActivity.this, BuildConfig.APPLICATION_ID + ".provider",file);
// else
// mImageUri = Uri.fromFile(file);
//
// Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
// intent.putExtra(MediaStore.EXTRA_OUTPUT, mImageUri);
// startActivityForResult(intent, 1);
// }
// };
// btnImage1.setOnClickListener(oclBtnImage);
//
// btnImage2 = (View) findViewById(R.id.btnImage2);
// oclBtnImage = new OnClickListener()
// {
// @Override
// public void onClick(View v)
// {
// // Создаём папку если её нет
// File directory = new File(Environment.getExternalStorageDirectory() + File.separator + "Pictures" + File.separator + "Locust");
// directory.mkdirs();
//
// tmp_ImageName = "locust_" + (System.currentTimeMillis() / 1000L) + ".jpg";
//
// File file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + tmp_ImageName);
// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
// mImageUri = FileProvider.getUriForFile(LocustHealthActivity.this, BuildConfig.APPLICATION_ID + ".provider",file);
// else
// mImageUri = Uri.fromFile(file);
//
//
// Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
// intent.putExtra(MediaStore.EXTRA_OUTPUT, mImageUri);
// startActivityForResult(intent, 2);
// }
// };
// btnImage2.setOnClickListener(oclBtnImage);
//
// btnImage3 = (View) findViewById(R.id.btnImage3);
// oclBtnImage = new OnClickListener()
// {
// @Override
// public void onClick(View v)
// {
// // Создаём папку если её нет
// File directory = new File(Environment.getExternalStorageDirectory() + File.separator + "Pictures" + File.separator + "Locust");
// directory.mkdirs();
//
// tmp_ImageName = "locust_" + (System.currentTimeMillis() / 1000L) + ".jpg";
//
// File file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + tmp_ImageName);
// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
// mImageUri = FileProvider.getUriForFile(LocustHealthActivity.this, BuildConfig.APPLICATION_ID + ".provider",file);
// else
// mImageUri = Uri.fromFile(file);
//
// Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
// intent.putExtra(MediaStore.EXTRA_OUTPUT, mImageUri);
// startActivityForResult(intent, 3);
// }
// };
// btnImage3.setOnClickListener(oclBtnImage);
//
// /*
// * btnShowImage = (View) findViewById(R.id.btnShowImage1); OnClickListener oclBtnShowImage = new OnClickListener() {
// *
// * @Override public void onClick(View v) { File file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + edtImage1.getText().toString()); Intent i = new Intent(); i.setAction(android.content.Intent.ACTION_VIEW); i.setDataAndType(Uri.fromFile(file), "image/jpg"); startActivity(i); } }; btnShowImage.setOnClickListener(oclBtnShowImage);
// */
//
// btnShowImage1 = (View) findViewById(R.id.btnShowImage1); // Отобразить фотографию 1 в новом окне
// OnClickListener oclBtnShowImage = new OnClickListener()
// {
// @Override
// public void onClick(View v)
// {
// File file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + edtImage1.getText().toString());
// if(!file.isFile()) file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/_" + edtImage1.getText().toString());
// if (file.isFile()) {
// //Uri uri = Uri.fromFile(file);
// Uri uri = FileProvider.getUriForFile(LocustHealthActivity.this, BuildConfig.APPLICATION_ID + ".provider", file);
//
// Intent i = new Intent();
// i.setAction(Intent.ACTION_VIEW);
// i.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
// i.setDataAndType(uri, "image/jpg");
// startActivity(i);
// }
// }
// };
// btnShowImage1.setOnClickListener(oclBtnShowImage);
//
// btnShowImage2 = (View) findViewById(R.id.btnShowImage2); // Отобразить фотографию 1 в новом окне
// oclBtnShowImage = new OnClickListener()
// {
// @Override
// public void onClick(View v)
// {
// File file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + edtImage2.getText().toString());
// if(!file.isFile()) file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/_" + edtImage2.getText().toString());
// if (file.isFile()) {
// //Uri uri = Uri.fromFile(file);
// Uri uri = FileProvider.getUriForFile(LocustHealthActivity.this, BuildConfig.APPLICATION_ID + ".provider", file);
//
// Intent i = new Intent();
// i.setAction(Intent.ACTION_VIEW);
// i.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
// i.setDataAndType(uri, "image/jpg");
// startActivity(i);
// }
// }
// };
// btnShowImage2.setOnClickListener(oclBtnShowImage);
//
// btnShowImage3 = (View) findViewById(R.id.btnShowImage3); // Отобразить фотографию 3 в новом окне
// oclBtnShowImage = new OnClickListener()
// {
// @Override
// public void onClick(View v)
// {
// File file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + edtImage3.getText().toString());
// if(!file.isFile()) file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/_" + edtImage3.getText().toString());
// if (file.isFile()) {
// //Uri uri = Uri.fromFile(file);
// Uri uri = FileProvider.getUriForFile(LocustHealthActivity.this, BuildConfig.APPLICATION_ID + ".provider", file);
//
// Intent i = new Intent();
// i.setAction(Intent.ACTION_VIEW);
// i.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
// i.setDataAndType(uri, "image/jpg");
// startActivity(i);
// }
// }
// };
// btnShowImage3.setOnClickListener(oclBtnShowImage);
//
// btnDelImage1 = (View) findViewById(R.id.btnDelImage1);
// btnDelImage1.setOnClickListener(
// new OnClickListener()
// {
// @Override
// public void onClick(View v)
// {
// edtImage1.setText("");
// }
// }
// );
//
// btnDelImage2 = (View) findViewById(R.id.btnDelImage2);
// btnDelImage2.setOnClickListener(
// new OnClickListener()
// {
// @Override
// public void onClick(View v)
// {
// edtImage2.setText("");
// }
// }
// );
//
// btnDelImage3 = (View) findViewById(R.id.btnDelImage3);
// btnDelImage3.setOnClickListener(
// new OnClickListener()
// {
// @Override
// public void onClick(View v)
// {
// edtImage3.setText("");
// }
// }
// );
//
//
// Взависимости от параметров создание или редактирование // Взависимости от параметров создание или редактирование
editDataDel(frmlocustdel_uid); editDataDel(frmlocustdel_uid);
@ -3148,12 +2976,12 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
protected void onSaveInstanceState(Bundle outState) protected void onSaveInstanceState(Bundle outState)
{ {
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
if (mImageUri != null) //if (mImageUri != null)
{ //{
outState.putString("cameraImageUri", mImageUri.toString()); // outState.putString("cameraImageUri", mImageUri.toString());
} //}
// Сохраняем название рисунка (Не знаю почему но автоматом не сохраняет) // Сохраняем название рисунка (Не знаю почему но автоматом не сохраняет) TODO почему 1 файл а не много и как рабоает в других активити там что кроме первого рисунка при повороте пропадают названия файлов?
outState.putString("ImageName", edtImage1.getText().toString()); //outState.putString("ImageName", edtImage1.getText().toString());
//Сохраняю список координат LatLon //Сохраняю список координат LatLon
LatLonAdapter adapter = (LatLonAdapter)latlonList.getAdapter(); LatLonAdapter adapter = (LatLonAdapter)latlonList.getAdapter();
ArrayList<LatLon> list = adapter.latlonList; ArrayList<LatLon> list = adapter.latlonList;
@ -3167,6 +2995,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
protected void onRestoreInstanceState(Bundle savedInstanceState) protected void onRestoreInstanceState(Bundle savedInstanceState)
{ {
super.onRestoreInstanceState(savedInstanceState); super.onRestoreInstanceState(savedInstanceState);
/*
if (savedInstanceState.containsKey("cameraImageUri")) if (savedInstanceState.containsKey("cameraImageUri"))
{ {
mImageUri = Uri.parse(savedInstanceState.getString("cameraImageUri")); mImageUri = Uri.parse(savedInstanceState.getString("cameraImageUri"));
@ -3174,6 +3003,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
tmp_ImageName = f.getName(); tmp_ImageName = f.getName();
} }
edtImage1.setText(savedInstanceState.getString("ImageName")); // Восстанавливаем название рисунка edtImage1.setText(savedInstanceState.getString("ImageName")); // Восстанавливаем название рисунка
*/
//Загружаю список координат LatLon //Загружаю список координат LatLon
LatLonAdapter adapter = (LatLonAdapter)latlonList.getAdapter(); LatLonAdapter adapter = (LatLonAdapter)latlonList.getAdapter();
adapter.latlonList=savedInstanceState.getParcelableArrayList("LatLon"); adapter.latlonList=savedInstanceState.getParcelableArrayList("LatLon");
@ -3202,14 +3032,17 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
@Override @Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) protected void onActivityResult(int requestCode, int resultCode, Intent data)
{ {
if (requestCode == 1 || requestCode == 2 || requestCode == 3) if (requestCode == 1 || requestCode == 2 || requestCode == 3 || requestCode == 4 || requestCode == 5)
{ {
switch (resultCode) switch (resultCode)
{ {
case 0: case 0:
break; break;
case -1: case -1:
ImageName = tmp_ImageName; //Читаем из локального хранилища название файла
SharedPreferences preferences = getSharedPreferences("CommonPrefs", Context.MODE_PRIVATE);
String tmp_ImageName = preferences.getString("IMAGE_NAME", null);
InputStream file = null; InputStream file = null;
try try
{ {
@ -3232,7 +3065,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
crc.update(cnt); crc.update(cnt);
} }
// ImageName = Long.toHexString(crc.getValue()) + "_" + ImageName; // ImageName = Long.toHexString(crc.getValue()) + "_" + ImageName;
ImageName = Long.toHexString(crc.getValue()) + "_" + tmp_ImageName; String ImageName = Long.toHexString(crc.getValue()) + "_" + tmp_ImageName;
file.close(); file.close();
// Переименовываем файл // Переименовываем файл
@ -3245,6 +3078,10 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
edtImage2.setText(ImageName); edtImage2.setText(ImageName);
if (requestCode == 3) if (requestCode == 3)
edtImage3.setText(ImageName); edtImage3.setText(ImageName);
if (requestCode == 4)
edtImage4.setText(ImageName);
if (requestCode == 5)
edtImage5.setText(ImageName);
} catch (IOException e) } catch (IOException e)
{ {
@ -3255,27 +3092,9 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
break; break;
} }
} }
if (requestCode == 4) if (requestCode == 10)
{ {
switch (resultCode) //I removed copying the geozone perimeter because it cannot be done in this questionnaire.
{
case 0:
break;
case -1:
ArrayList<LatLon> points = data.getParcelableArrayListExtra("LatLon");
LatLonAdapter adapter = (LatLonAdapter)latlonList.getAdapter();
ArrayList<LatLon> list = adapter.latlonList;
list.clear();
for(int i=0;i<points.size();i++){
if(points.get(i)!=null && points.get(i).lon!=0 && points.get(i).lat!=0) {
list.add(new LatLon(points.get(i).uid,points.get(i).lat, points.get(i).lon));
}
}
list.add(new LatLon(UUID.randomUUID().toString(),0, 0));
adapter.notifyDataSetChanged();
Tools.setListViewHeightBasedOnItems(latlonList);
break;
}
} }
} }
@ -3629,10 +3448,10 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
} }
} }
public void alert(String text) public void alert(String title,String text)
{ {
AlertDialog.Builder adb = new AlertDialog.Builder(this,R.style.AlertDialogTheme); AlertDialog.Builder adb = new AlertDialog.Builder(this,R.style.AlertDialogTheme);
adb.setTitle(getString(R.string.Warning)); adb.setTitle(title);
adb.setMessage(text); adb.setMessage(text);
adb.setPositiveButton("OK", new DialogInterface.OnClickListener() // Кнопка открыть adb.setPositiveButton("OK", new DialogInterface.OnClickListener() // Кнопка открыть
{ {

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

@ -509,6 +509,27 @@ public class MySynchronizationOld
} }
dboh.close(); dboh.close();
//Последовательно отправляю изменёные пользователям записи (send=0 и они заполнены)
dboh = new DbOpenHelper(_context);
rdb = null;
try {
rdb = dboh.getReadableDatabase();
Cursor cursor = rdb.rawQuery("select uid from frmlocusthealth where send=0 and filled=1 and device_id=?", new String[]{ android_id });
if(cursor.moveToFirst())
{
do{
sendFrmLocustHealth(cursor.getString(0));
}while (cursor.moveToNext());
}
cursor.close();
}catch(Exception e){
e.printStackTrace();
}finally{
if(rdb!=null){ rdb.close(); }
}
dboh.close();
//Запрос в очередь на получение списка стран, направлений, итд. //Запрос в очередь на получение списка стран, направлений, итд.
rid_LocustsTypes = makeRequest("locuststypes",null,null); rid_LocustsTypes = makeRequest("locuststypes",null,null);
rid_sprayers = makeRequest("sprayers",null,null); rid_sprayers = makeRequest("sprayers",null,null);

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

@ -71,6 +71,8 @@ public class Tools
} }
public static Date setYMD(Date date, int year, int monthOfYear, int dayOfMonth){ public static Date setYMD(Date date, int year, int monthOfYear, int dayOfMonth){
if(date==null)
date=new Date();
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.setTime(date); calendar.setTime(date);
calendar.set(Calendar.YEAR, year); calendar.set(Calendar.YEAR, year);

8
app/src/main/res/menu/locust_health_list.xml
View File

@ -1,16 +1,16 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" > <menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item <!--item
android:id="@+id/itemCreate" android:id="@+id/itemCreate"
android:orderInCategory="100" android:orderInCategory="100"
android:showAsAction="never" android:showAsAction="never"
android:title="@string/action_add"/> android:title="@string/action_add"/-->
<item <!--item
android:id="@+id/itemDelete" android:id="@+id/itemDelete"
android:orderInCategory="101" android:orderInCategory="101"
android:showAsAction="never" android:showAsAction="never"
android:title="@string/action_delete"/> android:title="@string/action_delete"/-->
<!-- item <!-- item
android:id="@+id/itemExport" android:id="@+id/itemExport"

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

@ -447,6 +447,7 @@
<string name="URL_path_to_the_server">URL путь к серверу</string> <string name="URL_path_to_the_server">URL путь к серверу</string>
<string name="Do_you_really_want_to_delete_all_data_from_the_app">Вы действительно хотите удалить все данные из приложения?</string> <string name="Do_you_really_want_to_delete_all_data_from_the_app">Вы действительно хотите удалить все данные из приложения?</string>
<string name="Days_of_synchronization">Дней синхронизации</string> <string name="Days_of_synchronization">Дней синхронизации</string>
<string name="Information">Информация</string>
</resources> </resources>

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

@ -448,6 +448,7 @@
<string name="Do_you_really_want_to_delete_all_data_from_the_app">Do you really want to delete all data from the app?</string> <string name="Do_you_really_want_to_delete_all_data_from_the_app">Do you really want to delete all data from the app?</string>
<string name="Days_of_synchronization">Days of synchronization</string> <string name="Days_of_synchronization">Days of synchronization</string>
<string name="Information">Information</string>
</resources> </resources>