diff --git a/app/src/main/java/kz/istt/locust/MySynchronizationOld.java b/app/src/main/java/kz/istt/locust/MySynchronizationOld.java index cc13966..7a51de4 100644 --- a/app/src/main/java/kz/istt/locust/MySynchronizationOld.java +++ b/app/src/main/java/kz/istt/locust/MySynchronizationOld.java @@ -85,8 +85,11 @@ public class MySynchronizationOld public MyThread myThread = null; + private int rid_sendFrmLocust = -1; //Для отправки данных private int rid_sendFrmLocustDel = -1; //Для отправки данных + private int rid_sendFrmLocustHealth = -1; //Для отправки данных + private int rid_frmlocust = -1; //Для запроса данных private int rid_frmlocustdel = -1; //Для запроса данных @@ -175,60 +178,6 @@ public class MySynchronizationOld return 0; } - /** - * Отправить анкету для сохранения на сервер в виде JSON запроса - * @param uid Идентификатор записи - */ - public void sendFrmLocustHealth(String uid) - { - if(uid==null || uid.equals("")) return; - - JSONObject jsonObject = new JSONObject(); - - DbOpenHelper dboh = new DbOpenHelper(_context); - Cursor cursor = null; - cursor = dboh.getReadableDatabase().rawQuery("select * from frmlocusthealth where uid=?", new String[] { String.valueOf(uid) }); - if(cursor.moveToFirst()) - { - do{ - //Если задано имя файла то добавляем его в очередь на отправку на сервер - String fname; - fname=cursor.getString(cursor.getColumnIndex("image_name1")); - if(fname!=null && !fname.equals("")) - myThread.addRequest(MySynchronizationOld.URL+"/get/?fn=6", null, Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + fname); - fname = cursor.getString(cursor.getColumnIndex("image_name2")); - if(fname!=null && !fname.equals("")) - myThread.addRequest(MySynchronizationOld.URL+"/get/?fn=6", null, Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + fname); - fname = cursor.getString(cursor.getColumnIndex("image_name3")); - if(fname!=null && !fname.equals("")) - myThread.addRequest(MySynchronizationOld.URL+"/get/?fn=6", null, Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + fname); - fname = cursor.getString(cursor.getColumnIndex("image_name4")); - if(fname!=null && !fname.equals("")) - myThread.addRequest(MySynchronizationOld.URL+"/get/?fn=6", null, Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + fname); - fname = cursor.getString(cursor.getColumnIndex("image_name5")); - if(fname!=null && !fname.equals("")) - myThread.addRequest(MySynchronizationOld.URL+"/get/?fn=6", null, Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + fname); - - - for(int i=0;i