Failed commit: Default

sujinwen

2017-07-26 25bafe4739ae921fb72fb3d6c8e037611eba1686

Failed commit: Default

git-svn-id: http://192.168.1.226/svn/proxy@923 454eff88-639b-444f-9e54-f578c98de674

 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/OfflineSurveillanceUpSync.java

@@ -7,19 +7,14 @@


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 {



@@ -79,12 +74,11 @@
            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();

                   /* 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){

@@ -94,7 +88,7 @@
                    }

                    SurveillanceDao.getInstance().delSurllanceList();

                    List<SqliteSqlBean> result= getExtraList(SqliteSqlBean.class);

                    SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));

                    SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));*/

                    sync();

                }

            });


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/RegisterUpSync.java

@@ -5,16 +5,10 @@
import org.xutils.http.RequestParams;

import org.xutils.x;



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.SqliteSqlBean;

import cn.com.basic.face.service.sqlite.RegisterDao;

import cn.com.basic.face.service.sqlite.SynchronRecordDao;

import cn.com.basic.face.util.AppApi;

import cn.com.basic.face.util.SqliteSqlUtil;



/**

 * Created by SJW on 2017/7/26 0026.

@@ -36,12 +30,11 @@
            final String tableName = "register";

            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(RegisterDao.getInstance().getRegisterList(BaseApplication.getInstance().getAndroidDevice().getCompanyId())));

            params.addBodyParameter("deviceCompanyId",BaseApplication.getInstance().getAndroidDevice().getCompanyId());

            x.http().post(params, new BaseCommonCallBack() {

                public void success() {

                    Long time=(Long)resultBean.getData();

                  /*  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){

@@ -51,7 +44,7 @@
                    }

                    RegisterDao.getInstance().delRegiterList();

                    List<SqliteSqlBean> result= getExtraList(SqliteSqlBean.class);

                    SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));

                    SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));*/

                    sync();

                }

            });