From 8dd085f78e4bcfbc89ede104108cd03053183865 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 01 八月 2017 15:37:00 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/BaseDownSync.java | 6 +++---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java | 5 +++--
2 files changed, 6 insertions(+), 5 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 d7aaf7d..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
@@ -39,12 +39,13 @@
String surveillanceId = UUID.randomUUID().toString();
String deviceId = BaseApplication.getInstance().getAndroidDevice().getDeviceId();
MainActivity.getInstance().db.execSQL(
- "insert into offline_surveillance(surveillance_id,device_id,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) {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/BaseDownSync.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/BaseDownSync.java
index b644acc..a0b2f5e 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/BaseDownSync.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/BaseDownSync.java
@@ -28,9 +28,9 @@
}
public void handleSynDate(ResultBean rb,String tableName){
- Long time=(Long)rb.getData();
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String synTime = format.format(time);
+ //Long time=(Long)rb.getData();
+ //SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String synTime = (String)rb.getData();
if(SynchronRecordDao.getInstance().getSynRecord(tableName)==null){
SynchronRecordDao.getInstance().insertSynRecord(tableName,synTime);
}else{
--
Gitblit v1.8.0