From d70ed21047aa3f3c10334b418f193c9ff756aca2 Mon Sep 17 00:00:00 2001
From: qvyuanxin <qvyuanxin@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 21 七月 2017 11:17:17 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DepartmentDao.java |   10 ++++------
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/PostDao.java       |   11 +++++------
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DeviceDao.java     |   24 ++++++++++--------------
 3 files changed, 19 insertions(+), 26 deletions(-)

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 f1af8ab..0cdac10 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
@@ -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.Dictionary;
 
 public class DepartmentDao {
@@ -22,12 +23,11 @@
      */
     public List<Dictionary> loadDepartmentDictionary() {
         List<Dictionary> list = new ArrayList<Dictionary>();
-        SQLiteDatabase db = Config.sqlMap.getDb();
-        db.beginTransaction();
         try {
             String sql = "select  a.dept_id,a.dept_name from department a";
             Dictionary aqi = null;
-            Cursor c = db.rawQuery(sql, new String[]{});
+
+            Cursor c = MainActivity.getInstance().db.rawQuery(sql, new String[]{});
             while (c.moveToNext()) {
                 aqi = new Dictionary();
                 aqi.setDictId(c.getString(c.getColumnIndex("dept_id")));
@@ -35,11 +35,9 @@
                 list.add(aqi);
             }
             c.close();
-            db.setTransactionSuccessful();
+
         }catch (Exception e) {
             e.printStackTrace();
-        }finally {
-            db.endTransaction();
         }
         return list;
 
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..a295e32 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,7 +50,8 @@
 
 
             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")));
@@ -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,10 +108,9 @@
                 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")));
@@ -134,11 +132,9 @@
                 list.add(aqi);
             }
             c.close();
-            db.setTransactionSuccessful();
+
         }catch (Exception e) {
             e.printStackTrace();
-        }finally {
-            db.endTransaction();
         }
         return list;
     }
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 f847ea0..42b4d1c 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
@@ -8,6 +8,7 @@
 
 import cn.com.basic.face.base.BaseApplication;
 import cn.com.basic.face.base.Config;
+import cn.com.basic.face.base.MainActivity;
 import cn.com.basic.face.discern.entity.Dictionary;
 import cn.com.basic.face.discern.query.item.AttendanceQueryItem;
 
@@ -24,15 +25,15 @@
      */
     public List<Dictionary> loadPostDictionary() {
         List<Dictionary> list = new ArrayList<Dictionary>();
-        SQLiteDatabase db = Config.sqlMap.getDb();
-        db.beginTransaction();
+
         try {
 
             String sql = "select  a.post_id,a.post_name from post a";
 
 
             Dictionary aqi = null;
-            Cursor c = db.rawQuery(sql, new String[]{});
+
+            Cursor c = MainActivity.getInstance().db.rawQuery(sql, new String[]{});
             while (c.moveToNext()) {
                 aqi = new Dictionary();
                 aqi.setDictId(c.getString(c.getColumnIndex("post_id")));
@@ -40,11 +41,9 @@
                 list.add(aqi);
             }
             c.close();
-            db.setTransactionSuccessful();
+
         }catch (Exception e) {
             e.printStackTrace();
-        }finally {
-            db.endTransaction();
         }
         return list;
     }

--
Gitblit v1.8.0