From 4bee2fa9f76f7e200bf1bf01c24b709d16a58488 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期六, 22 七月 2017 14:33:34 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DeviceDao.java | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
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 db2ab4f..aace98a 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
@@ -7,6 +7,7 @@
import java.util.List;
import cn.com.basic.face.base.Config;
+import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.discern.entity.Device;
import cn.com.basic.face.discern.entity.Dictionary;
@@ -29,8 +30,7 @@
public List<Device> loadMainDevice(String type, String sn) {
List<Device> list = new ArrayList<Device>();
- SQLiteDatabase db = Config.sqlMap.getDb();
- db.beginTransaction();
+
try {
StringBuilder sb = new StringBuilder(40);
sb.append("select a.device_id, ").append("a.company_id, ").
@@ -50,14 +50,15 @@
Device aqi = null;
- Cursor c = db.rawQuery(sb.toString(), new String[]{});
+
+ Cursor c = MainActivity.getInstance().db.rawQuery(sb.toString(), new String[]{});
while (c.moveToNext()) {
aqi = new Device();
aqi.setDeviceId(c.getString(c.getColumnIndex("device_id")));
aqi.setCompanyId(c.getString((c.getColumnIndex("company_id"))));
aqi.setDeviceName(c.getString((c.getColumnIndex("device_name"))));
aqi.setType(c.getString(c.getColumnIndex("type")));
- aqi.setInstallAdress(c.getString((c.getColumnIndex("install_address"))));
+ aqi.setInstallAddress(c.getString((c.getColumnIndex("install_address"))));
aqi.setSchoolName(c.getString((c.getColumnIndex("school_name"))));
aqi.setBrandId(c.getString(c.getColumnIndex("brand_id")));
aqi.setIp(c.getString(c.getColumnIndex("ip")));
@@ -72,11 +73,9 @@
list.add(aqi);
}
c.close();
- db.setTransactionSuccessful();
+
}catch (Exception e) {
e.printStackTrace();
- }finally {
- db.endTransaction();
}
return list;
}
@@ -90,8 +89,8 @@
public List<Device> loadCamera(String type, String belongId) {
List<Device> list = new ArrayList<Device>();
- SQLiteDatabase db = Config.sqlMap.getDb();
- db.beginTransaction();
+
+
try {
StringBuilder sb = new StringBuilder(40);
@@ -109,17 +108,16 @@
sb.append(" AND a.belong_id = ").append(belongId) ;
}
-
-
Device aqi = null;
- Cursor c = db.rawQuery(sb.toString(), new String[]{});
+
+ Cursor c = MainActivity.getInstance().db.rawQuery(sb.toString(), new String[]{});
while (c.moveToNext()) {
aqi = new Device();
aqi.setDeviceId(c.getString(c.getColumnIndex("device_id")));
aqi.setCompanyId(c.getString((c.getColumnIndex("company_id"))));
aqi.setDeviceName(c.getString((c.getColumnIndex("device_name"))));
aqi.setType(c.getString(c.getColumnIndex("type")));
- aqi.setInstallAdress(c.getString((c.getColumnIndex("install_address"))));
+ aqi.setInstallAddress(c.getString((c.getColumnIndex("install_address"))));
aqi.setSchoolName(c.getString((c.getColumnIndex("school_name"))));
aqi.setBrandId(c.getString(c.getColumnIndex("brand_id")));
aqi.setIp(c.getString(c.getColumnIndex("ip")));
@@ -134,11 +132,9 @@
list.add(aqi);
}
c.close();
- db.setTransactionSuccessful();
+
}catch (Exception e) {
e.printStackTrace();
- }finally {
- db.endTransaction();
}
return list;
}
--
Gitblit v1.8.0