From 84c967c436f9e643fe30de2f99e9f88d80fe1bf0 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 24 七月 2017 20:52:55 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DataSynchronService.java |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DataSynchronService.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DataSynchronService.java
index b9296e2..846b96a 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DataSynchronService.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DataSynchronService.java
@@ -1,10 +1,13 @@
 package cn.com.basic.face.service;
 
+import com.alibaba.fastjson.JSONArray;
+
 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.discern.common.BaseCommonCallBack;
 import cn.com.basic.face.discern.common.SqliteSqlBean;
@@ -59,28 +62,39 @@
     /***
      * 鍙屽悜鍚屾
      * @param synDate               鍚屾鏃堕棿
-     * @param data                  鍚屾鏁版嵁
      * @param deviceCompanyId       璁惧鎵�鍦ㄦ満鏋刬d
      * @param tableName             琛ㄥ悕
      */
-       public void  twoWaySynchron(Date synDate,String data,String deviceCompanyId,String tableName){
+       public void  twoWaySynchron(Date synDate, final String deviceCompanyId, String tableName){
           try{
-              RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.DOWN_SYNCHRON);
+              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));
               if("company".equals(tableName)){
-                  params.addBodyParameter("data", CompanyDao.getInstance().getCompanyList(deviceCompanyId).toString());
+                  params.addBodyParameter("data", JSONArray.toJSONString(CompanyDao.getInstance().getCompanyList(deviceCompanyId)));
               }
               if("device".equals(tableName)){
-                  params.addBodyParameter("data", DeviceDao.getInstance().getDeviceList(deviceCompanyId).toString());
+                  params.addBodyParameter("data", JSONArray.toJSONString(DeviceDao.getInstance().getDeviceList(deviceCompanyId)));
               }
               if("dictionary".equals(tableName)){
-                  params.addBodyParameter("data", DictionaryDao.getInstance().getDictionayList(deviceCompanyId).toString());
+                  params.addBodyParameter("data", JSONArray.toJSONString(DictionaryDao.getInstance().getDictionayList(deviceCompanyId)));
               }
               params.addBodyParameter("deviceCompanyId",deviceCompanyId);
               x.http().post(params, new BaseCommonCallBack() {
                   public void success() {
+                      if("company".equals(temp)){
+                          CompanyDao.getInstance().delCompanyList(deviceCompanyId);
+                      }
+                      if("device".equals(temp)){
+                          DeviceDao.getInstance().delDevice(deviceCompanyId);
+                      }
+                      if("dictionary".equals(temp)){
+                          DictionaryDao.getInstance().delDictionary(deviceCompanyId);
+                      }
+
+                      List<SqliteSqlBean> result= getExtraList(SqliteSqlBean.class);
                       SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
                   }
               });
@@ -90,4 +104,6 @@
 
        }
 
+
+
 }

--
Gitblit v1.8.0