From d56dfe791f22ddcccd7de6fb2c4be1255a80f9c5 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 27 七月 2017 20:39:23 +0800
Subject: [PATCH] Failed commit: Default
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DeviceUpSync.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DeviceUpSync.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DeviceUpSync.java
index c4a188c..f79875a 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DeviceUpSync.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DeviceUpSync.java
@@ -36,17 +36,23 @@
*/
public void doSync() {
try{
- String tableName = "device";
+ final String tableName = "device";
RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.TWO_WAY_SYNCHRON);
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- final String temp=tableName;
params.addBodyParameter("tableName", tableName);
- params.addBodyParameter("synDate", SynchronRecordDao.getInstance().getSynRecord(tableName).getSynchronTime());
+ params.addBodyParameter("synDate", SynchronRecordDao.getInstance().getSynRecord(tableName)==null?"":SynchronRecordDao.getInstance().getSynRecord(tableName).getSynchronTime());
params.addBodyParameter("data", JSONArray.toJSONString(DeviceDao.getInstance().getDeviceList(BaseApplication.getInstance().getAndroidDevice().getCompanyId())));
params.addBodyParameter("deviceCompanyId",BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().post(params, new BaseCommonCallBack() {
public void success() {
- DeviceDao.getInstance().delDevice(BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+ Long time=(Long)resultBean.getData();
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String synTime = format.format(time);
+ if(SynchronRecordDao.getInstance().getSynRecord(tableName)==null){
+ SynchronRecordDao.getInstance().insertSynRecord(tableName,synTime);
+ }else{
+ SynchronRecordDao.getInstance().updateSynRecord(tableName,synTime);
+ }
+ DeviceDao.getInstance().delDevice();
List<SqliteSqlBean> result= getExtraList(SqliteSqlBean.class);
SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
sync();
--
Gitblit v1.8.0