From 785fd3c3e9984f301018b3b5deb91ecc2c8da124 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 01 八月 2017 17:44:35 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DeviceDao.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 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 73f456a..1ed6dc0 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 cn.com.basic.face.base.MainActivity;
 import cn.com.basic.face.discern.entity.Device;
+import cn.com.basic.face.discern.query.item.DeviceQueryItem;
 
 /**
  * 璁惧Dao
@@ -81,9 +82,9 @@
      * @param belongId 鎵�灞炶澶嘔d锛堜富璁惧锛�
      * @return
      */
-    public List<Device> loadCamera(String type, String belongId) {
+    public List<DeviceQueryItem> loadCamera(String type, String belongId) {
 
-        List<Device> list = new ArrayList<Device>();
+        List<DeviceQueryItem> list = new ArrayList<DeviceQueryItem>();
 
 
         try {
@@ -103,11 +104,11 @@
                 sb.append(" AND a.belong_id = ").append(belongId) ;
             }
 
-            Device aqi = null;
+            DeviceQueryItem aqi = null;
 
             Cursor c = MainActivity.getInstance().db.rawQuery(sb.toString(), new String[]{});
             while (c.moveToNext()) {
-                aqi = new Device();
+                aqi = new DeviceQueryItem();
                 aqi.setDeviceId(c.getString(c.getColumnIndex("device_id")));
                 aqi.setCompanyId(c.getString((c.getColumnIndex("company_id"))));
                 aqi.setDeviceName(c.getString((c.getColumnIndex("device_name"))));

--
Gitblit v1.8.0