From 062e9ff8359a4eccba741d0c8c799f3ca3535d83 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 28 七月 2017 11:06:44 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java
index 83ef361..d68d7ac 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java
@@ -10,6 +10,7 @@
 import java.util.List;
 import java.util.UUID;
 
+import cn.com.basic.face.base.BaseApplication;
 import cn.com.basic.face.base.MainActivity;
 import cn.com.basic.face.discern.entity.OfflineSurveillance;
 import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
@@ -94,13 +95,16 @@
      * @return
      */
     public List<OfflineSurveillance>  getSurveillanceList(){
-            String sql="select * from offline_surveillance";
+        String sql="select surveillance_id,raw_data_path,camera_in_or_out,create_time,device_id from offline_surveillance limit 0, 10";
         List<OfflineSurveillance> list=new ArrayList<OfflineSurveillance>();
         OfflineSurveillance result=null;
         Cursor c =MainActivity.getInstance().db.rawQuery(sql,new String[]{});
-        if(c.moveToFirst()){
+        String deviceCompanyId = BaseApplication.getInstance().getAndroidDevice().getCompanyId();
+        String deviceId = BaseApplication.getInstance().getAndroidDevice().getDeviceId();
+        while (c.moveToNext()) {
             result=new OfflineSurveillance();
-            result.setDeviceCompanyId(c.getString(c.getColumnIndex("device_company_id")));
+            result.setDeviceCompanyId(deviceCompanyId);
+            result.setDeviceId(deviceId);
             result.setCamera_in_or_out(c.getString(c.getColumnIndex("camera_in_or_out")));
             result.setCreate_time(c.getString(c.getColumnIndex("create_time")));
             result.setRawDataPath(c.getString(c.getColumnIndex("raw_data_path")));
@@ -111,9 +115,11 @@
     }
 
     //鍒犻櫎宸蹭笂浼犵粰鏈嶅姟鍣ㄧ殑鏁版嵁
-    public void delSurllanceList(){
-        String sql="delete from offline_surveillance";
-        MainActivity.getInstance().db.execSQL(sql);
+    public void delSurllanceList(List<OfflineSurveillance> list){
+        for (OfflineSurveillance item : list) {
+            String sql="delete from offline_surveillance where 1=1 and surveillance_id='"+item.getSurveillanceId()+"'";
+            MainActivity.getInstance().db.execSQL(sql);
+        }
     }
 
     //鑾峰彇鏈悓姝ユ暟鎹�绘暟

--
Gitblit v1.8.0