From 2020f8a388a82b716f5956014c00b2d76a8a1a65 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 七月 2017 16:03:23 +0800
Subject: [PATCH] Failed commit: Default
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DeviceUpSync.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 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 97086bc..448a377 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
@@ -6,14 +6,13 @@
import org.xutils.http.RequestParams;
import org.xutils.x;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import java.util.List;
import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.common.SqliteSqlBean;
import cn.com.basic.face.service.sqlite.DeviceDao;
+import cn.com.basic.face.service.sqlite.SynchronRecordDao;
import cn.com.basic.face.util.AppApi;
import cn.com.basic.face.util.SqliteSqlUtil;
@@ -36,20 +35,18 @@
*/
public void doSync() {
try{
- Date synDate = new Date();
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",sdf.format(synDate));
+ 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());
+ DeviceDao.getInstance().delDevice();
List<SqliteSqlBean> result= getExtraList(SqliteSqlBean.class);
SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
+ sync();
}
});
}catch(Exception e){
--
Gitblit v1.8.0