From ff6a60614e60c3d3cc2ad57e1eafa066589c385f Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 七月 2017 12:00:18 +0800
Subject: [PATCH] Failed commit: Default
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DictionaryUpSync.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DictionaryUpSync.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DictionaryUpSync.java
index 1f65d09..67b902d 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DictionaryUpSync.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DictionaryUpSync.java
@@ -5,7 +5,6 @@
import org.xutils.http.RequestParams;
import org.xutils.x;
-import java.text.SimpleDateFormat;
import java.util.List;
import cn.com.basic.face.base.BaseApplication;
@@ -35,12 +34,10 @@
*/
public void doSync() {
try{
- String tableName = "dictionary";
+ String tableName = "dictionary";
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).getSynchronTime()==null?"":SynchronRecordDao.getInstance().getSynRecord(tableName).getSynchronTime());
params.addBodyParameter("data", JSONArray.toJSONString(DictionaryDao.getInstance().getDictionayList(BaseApplication.getInstance().getAndroidDevice().getCompanyId())));
params.addBodyParameter("deviceCompanyId",BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().post(params, new BaseCommonCallBack() {
--
Gitblit v1.8.0