From 9e5babf9db52e64bdae60137be7696e56241fca6 Mon Sep 17 00:00:00 2001
From: xingzilong <xingzilong@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 18 八月 2017 18:12:17 +0800
Subject: [PATCH] H264 NALU解析  并在RTSPServer判断

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 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 d68d7ac..6cc0f26 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
@@ -36,11 +36,16 @@
             String headPicture = "";
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             String createTime = sdf.format(new Date());
+            String surveillanceId = UUID.randomUUID().toString();
+            String deviceId = BaseApplication.getInstance().getAndroidDevice().getDeviceId();
             MainActivity.getInstance().db.execSQL(
-                    "insert into offline_surveillance(raw_data_path, camera_in_or_out, create_time) values('" +
+                    "insert into offline_surveillance(surveillance_id,device_id,raw_data_path, camera_in_or_out, create_time,device_company_id) values('" +
+                            surveillanceId + "','" +
+                            deviceId + "','" +
                             rawDataFileName + "','" +
                             cameraInOrOut + "','" +
-                            createTime + "'" +")"
+                            createTime + "','" +
+                            BaseApplication.getInstance().getAndroidDevice().getCompanyId() + "'" +")"
             );
 
         } catch (Exception e) {
@@ -105,8 +110,8 @@
             result=new OfflineSurveillance();
             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.setCameraInOrOut(c.getString(c.getColumnIndex("camera_in_or_out")));
+            result.setCreateTime(c.getString(c.getColumnIndex("create_time")));
             result.setRawDataPath(c.getString(c.getColumnIndex("raw_data_path")));
             result.setSurveillanceId(c.getString(c.getColumnIndex("surveillance_id")));
             list.add(result);

--
Gitblit v1.8.0