From a427ed1add0d1f919fe592c7cfb664cdf976b5bb Mon Sep 17 00:00:00 2001 From: igor Date: Fri, 12 Jul 2024 07:13:26 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=20=D0=BF=D0=BE=D0=BD=D0=B8=D0=BC?= =?UTF-8?q?=D0=B0=D1=8E=20=D0=BF=D0=BE=D1=87=D0=B5=D0=BC=D1=83=20=D0=BD?= =?UTF-8?q?=D0=B5=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B0=D0=B5?= =?UTF-8?q?=D1=82=20frmlocustdel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/kz/istt/locust/DbOpenHelper.java | 3 +++ app/src/main/java/kz/istt/locust/LocustDelListActivity.java | 3 ++- app/src/main/java/kz/istt/locust/MySynchronizationOld.java | 2 -- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/kz/istt/locust/DbOpenHelper.java b/app/src/main/java/kz/istt/locust/DbOpenHelper.java index 02afd86..c8364fd 100644 --- a/app/src/main/java/kz/istt/locust/DbOpenHelper.java +++ b/app/src/main/java/kz/istt/locust/DbOpenHelper.java @@ -1455,6 +1455,9 @@ public class DbOpenHelper extends SQLiteOpenHelper //Переписываем значения существующих полей и выполняем запросы while(tbl.ReadNextRecord()) { + if(tbl.name.equals("frmlocustdel")){ + Log.i("igor","tbl.name="+tbl.name); + } String sql="select 1 from "+tbl.name+" where id = ?"; String[] par = new String[] { tbl.getRowByName("id").getStrVal() }; diff --git a/app/src/main/java/kz/istt/locust/LocustDelListActivity.java b/app/src/main/java/kz/istt/locust/LocustDelListActivity.java index 3ceb6bb..f6b7332 100644 --- a/app/src/main/java/kz/istt/locust/LocustDelListActivity.java +++ b/app/src/main/java/kz/istt/locust/LocustDelListActivity.java @@ -609,7 +609,8 @@ public class LocustDelListActivity extends AppCompatActivity cursor = dboh.getReadableDatabase().rawQuery("select uid, coalesce(district,'') || ' ' || coalesce(terrain,'') terrain, date from frmlocustdel where del=0 and send=1", null); //Отправленные break; default: - cursor = dboh.getReadableDatabase().rawQuery("select uid, coalesce(district,'') || ' ' || coalesce(terrain,'') terrain, date from frmlocustdel where del=0", null); //Все + //cursor = dboh.getReadableDatabase().rawQuery("select uid, coalesce(district,'') || ' ' || coalesce(terrain,'') terrain, date from frmlocustdel where del=0", null); //Все + cursor = dboh.getReadableDatabase().rawQuery("select uid, coalesce(district,'') || ' ' || coalesce(terrain,'') terrain, date from frmlocustdel", null); //Все break; } diff --git a/app/src/main/java/kz/istt/locust/MySynchronizationOld.java b/app/src/main/java/kz/istt/locust/MySynchronizationOld.java index 473ae65..e97eb1e 100644 --- a/app/src/main/java/kz/istt/locust/MySynchronizationOld.java +++ b/app/src/main/java/kz/istt/locust/MySynchronizationOld.java @@ -321,10 +321,8 @@ public class MySynchronizationOld }else{ return myThread.addRequest(MySynchronizationOld.URL+"/get/?fn=1&r=0&n="+tableName+"&s=" + seq + "&l=1000","", null); } - } - /** * Синхронизовать данные с сервером (добавляет задания в поток) * Если в задании синхронизации есть хоть 1 задание не должно синхронизироваться