From d9129dafb57f57f629c5d6203eecba67a6c839f4 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期日, 23 七月 2017 11:39:49 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DepartmentDao.java | 2 --
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/PhoneCallDao.java | 2 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/PostDao.java | 2 --
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DeviceDao.java | 2 --
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java | 2 --
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java | 8 +++-----
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DataSynchronDao.java | 5 ++---
7 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java
index 3039207..94e57ba 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java
@@ -103,7 +103,6 @@
resultBean.setTotalPages(getTotalPageSize(total));
resultBean.setPageNum(pageNum);
resultBean.setData(list);
- c.close();
return resultBean;
} catch (Exception e) {
e.printStackTrace();
@@ -226,7 +225,6 @@
resultBean.setTotalPages(getTotalPageSize(total));
resultBean.setPageNum(1);
resultBean.setData(list);
- c.close();
return resultBean;
} catch (Exception e) {
e.printStackTrace();
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DataSynchronDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DataSynchronDao.java
index c1b4159..4308951 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DataSynchronDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DataSynchronDao.java
@@ -5,6 +5,7 @@
import android.database.sqlite.SQLiteDatabase;
import cn.com.basic.face.base.Config;
+import cn.com.basic.face.base.MainActivity;
/**
* 鏁版嵁鍚屾dao灞�
@@ -171,10 +172,8 @@
*/
public static void clientToService(String clientTable,String serviceTable){
- SQLiteDatabase db = Config.sqlMap.getDb();
- db.beginTransaction();
+ SQLiteDatabase db = MainActivity.getInstance().db;
db.execSQL("");
- db.endTransaction();
//1.鏍规嵁涓婃鍚屾鏃堕棿鎵惧嚭闇�瑕佷笂浼犵殑鏁版嵁
//2.鍙戦�佹暟鎹粰鏈嶅姟鍣ㄧ
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DepartmentDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DepartmentDao.java
index 0cdac10..2e63525 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DepartmentDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DepartmentDao.java
@@ -34,8 +34,6 @@
aqi.setName(c.getString((c.getColumnIndex("dept_name"))));
list.add(aqi);
}
- c.close();
-
}catch (Exception e) {
e.printStackTrace();
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DeviceDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DeviceDao.java
index aace98a..7dba226 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DeviceDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DeviceDao.java
@@ -72,8 +72,6 @@
list.add(aqi);
}
- c.close();
-
}catch (Exception e) {
e.printStackTrace();
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/PhoneCallDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/PhoneCallDao.java
index 67055af..7e11681 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/PhoneCallDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/PhoneCallDao.java
@@ -69,7 +69,7 @@
}
Integer total = null;
while (c_count.moveToNext()) {
- total = c.getInt(c.getColumnIndex("count"));
+ total = c.getInt(0);
}
resultBean.setTotalPages(getTotalPageSize(total));
resultBean.setPageNum(pageNum);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/PostDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/PostDao.java
index 42b4d1c..171436d 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/PostDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/PostDao.java
@@ -40,8 +40,6 @@
aqi.setName(c.getString((c.getColumnIndex("post_name"))));
list.add(aqi);
}
- c.close();
-
}catch (Exception e) {
e.printStackTrace();
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java
index 20614af..f5e2529 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java
@@ -82,13 +82,13 @@
}
public boolean hasOfflineVisitorRegisterData() {
- Cursor c = Config.sqlMap.getDb().rawQuery("select count(*) from register", new String[]{});
+ Cursor c = MainActivity.getInstance().db.rawQuery("select count(*) from register", new String[]{});
c.moveToFirst();
return c.getInt(0) > 0 ? true : false;
}
public boolean hasOfflineAttenderRegisterData() {
- Cursor c = Config.sqlMap.getDb().rawQuery("select count(*) from register", new String[]{});
+ Cursor c = MainActivity.getInstance().db.rawQuery("select count(*) from register", new String[]{});
c.moveToFirst();
return c.getInt(0) > 0 ? true : false;
}
@@ -164,10 +164,8 @@
public void removeOfflineVisitorRegister(OfflineVisitorRegisterItem item) {
try {
String sql = "delete from register where visitor_id='"+item.getRegisterId()+"' AND a.is_synchron = 'N'";
- SQLiteDatabase db = Config.sqlMap.getDb();
- db.beginTransaction();
+ SQLiteDatabase db = MainActivity.getInstance().db;
db.execSQL(sql);
- db.endTransaction();
item.deleteFiles();
}
catch (Exception e) {
--
Gitblit v1.8.0