From d343b71cd89f59a87e85c46ce7a04d47c357462d Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 七月 2017 15:46:45 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DeviceUpSync.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/DeviceUpSync.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DeviceUpSync.java
index c4a188c..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,7 +6,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;
@@ -38,15 +37,13 @@
         try{
             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());
+                    DeviceDao.getInstance().delDevice();
                     List<SqliteSqlBean> result= getExtraList(SqliteSqlBean.class);
                     SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
                     sync();

--
Gitblit v1.8.0