From 9366de779b7fec0a0e999e533bf0f4d910727c0c Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 26 七月 2017 15:57:06 +0800
Subject: [PATCH] Failed commit: Default

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/OfflineSurveillanceUpSync.java |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/OfflineSurveillanceUpSync.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/OfflineSurveillanceUpSync.java
index f104689..b8c172f 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/OfflineSurveillanceUpSync.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/OfflineSurveillanceUpSync.java
@@ -1,18 +1,25 @@
 package cn.com.basic.face.service.sync.up;
 
+import com.alibaba.fastjson.JSONArray;
+
 import org.xutils.http.RequestParams;
 import org.xutils.x;
 
 import java.io.File;
 import java.io.FileWriter;
+import java.text.SimpleDateFormat;
+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.CommonVariables;
+import cn.com.basic.face.discern.common.SqliteSqlBean;
 import cn.com.basic.face.discern.query.item.UnknownQueryItem;
 import cn.com.basic.face.service.sqlite.SurveillanceDao;
+import cn.com.basic.face.service.sqlite.SynchronRecordDao;
 import cn.com.basic.face.util.AppApi;
 import cn.com.basic.face.util.FileUtil;
+import cn.com.basic.face.util.SqliteSqlUtil;
 
 public class OfflineSurveillanceUpSync extends BaseSync {
 
@@ -21,8 +28,8 @@
         return instance;
     }
 
-    @Override
-    public void doSync() {
+
+    public void upSync() {
         final UnknownQueryItem item = SurveillanceDao.getInstance().readOfflineUnknownFromLocal();
         try {
             RequestParams params = new RequestParams();
@@ -66,9 +73,50 @@
             e.printStackTrace();
         }
     }
+    @Override
+    public void doSync() {
+        try{
+            final String tableName = "offline_surveillance";
+            RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.TWO_WAY_SYNCHRON);
+            params.addBodyParameter("tableName", tableName);
+            params.addBodyParameter("synDate", SynchronRecordDao.getInstance().getSynRecord(tableName)==null?"":SynchronRecordDao.getInstance().getSynRecord(tableName).getSynchronTime());
+            params.addBodyParameter("data", JSONArray.toJSONString(SurveillanceDao.getInstance().getSurveillanceList()));
+            params.addBodyParameter("deviceCompanyId",BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+            x.http().post(params, new BaseCommonCallBack() {
+                public void success() {
+                    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);
+                    }
+                    SurveillanceDao.getInstance().delSurllanceList();
+                    List<SqliteSqlBean> result= getExtraList(SqliteSqlBean.class);
+                    SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
+                    sync();
+                }
+            });
+        }catch(Exception e){
+            e.printStackTrace();
+        }
+    }
+
 
     @Override
     public boolean hasMore() {
+        int count= SurveillanceDao.getInstance().getSynDataCount();
+        if(count==0){
+            return false;
+        }
+        return true;
+    }
+
+
+
+
+    public boolean More() {
         return SurveillanceDao.getInstance().hasMoreOfflineSurveillance();
     }
 

--
Gitblit v1.8.0