development-history/proxy.git

parent: c2911fa6 | 补丁 | 提交 | ignore whitespace

sujinwen

2017-07-25 c7caa54d8d58af6159f2c758ad5d6687d461a333



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

4个文件已修改

	VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/CompanyUpSync.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DataTableUpSync.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DeviceUpSync.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DictionaryUpSync.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -6,13 +6,13 @@
import org.xutils.x;



import java.text.SimpleDateFormat;

import java.util.Date;

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

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

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

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



@@ -35,13 +35,12 @@
     */

    public void doSync() {

        try{

            Date synDate = new Date();

            String tableName = "company";

            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));

            params.addBodyParameter("synDate", SynchronRecordDao.getInstance().getSynRecord(tableName).getSynchronTime());

            params.addBodyParameter("data", JSONArray.toJSONString(CompanyDao.getInstance().getCompanyList(BaseApplication.getInstance().getAndroidDevice().getCompanyId())));

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

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

@@ -49,6 +48,7 @@
                    CompanyDao.getInstance().delCompanyList(BaseApplication.getInstance().getAndroidDevice().getCompanyId());

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

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

                    sync();

                }

            });

        }catch(Exception e){


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

@@ -9,6 +9,7 @@
import java.util.Date;

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

@@ -32,6 +33,7 @@
    //双向同步

    public void doSync(Date synDate, final String deviceCompanyId, String tableName) {

        try{

            BaseApplication.getInstance().getAndroidDevice().getCompanyId();

            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;


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

@@ -7,13 +7,13 @@
import org.xutils.x;



import java.text.SimpleDateFormat;

import java.util.Date;

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

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

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

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



@@ -36,13 +36,12 @@
     */

    public void doSync() {

        try{

            Date synDate = new Date();

            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",sdf.format(synDate));

            params.addBodyParameter("synDate", 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() {

@@ -50,6 +49,7 @@
                    DeviceDao.getInstance().delDevice(BaseApplication.getInstance().getAndroidDevice().getCompanyId());

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

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

                    sync();

                }

            });

        }catch(Exception e){


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

@@ -6,13 +6,13 @@
import org.xutils.x;



import java.text.SimpleDateFormat;

import java.util.Date;

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

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

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

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



@@ -35,13 +35,12 @@
     */

    public void doSync() {

        try{

            Date synDate = new Date();

            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",sdf.format(synDate));

            params.addBodyParameter("synDate", 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() {

@@ -49,6 +48,7 @@
                    DictionaryDao.getInstance().delDictionary(BaseApplication.getInstance().getAndroidDevice().getCompanyId());

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

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

                    sync();

                }

            });

        }catch(Exception e){

			@@ -6,13 +6,13 @@
			import org.xutils.x;

			import java.text.SimpleDateFormat;
			import java.util.Date;
			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.CompanyDao;
			import cn.com.basic.face.service.sqlite.SynchronRecordDao;
			import cn.com.basic.face.util.AppApi;
			import cn.com.basic.face.util.SqliteSqlUtil;

			@@ -35,13 +35,12 @@
			*/
			public void doSync() {
			try{
			Date synDate = new Date();
			String tableName = "company";
			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));
			params.addBodyParameter("synDate", SynchronRecordDao.getInstance().getSynRecord(tableName).getSynchronTime());
			params.addBodyParameter("data", JSONArray.toJSONString(CompanyDao.getInstance().getCompanyList(BaseApplication.getInstance().getAndroidDevice().getCompanyId())));
			params.addBodyParameter("deviceCompanyId",BaseApplication.getInstance().getAndroidDevice().getCompanyId());
			x.http().post(params, new BaseCommonCallBack() {
			@@ -49,6 +48,7 @@
			CompanyDao.getInstance().delCompanyList(BaseApplication.getInstance().getAndroidDevice().getCompanyId());
			List<SqliteSqlBean> result= getExtraList(SqliteSqlBean.class);
			SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
			sync();
			}
			});
			}catch(Exception e){

			@@ -9,6 +9,7 @@
			import java.util.Date;
			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.CompanyDao;
			@@ -32,6 +33,7 @@
			//双向同步
			public void doSync(Date synDate, final String deviceCompanyId, String tableName) {
			try{
			BaseApplication.getInstance().getAndroidDevice().getCompanyId();
			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;

			@@ -7,13 +7,13 @@
			import org.xutils.x;

			import java.text.SimpleDateFormat;
			import java.util.Date;
			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.DeviceDao;
			import cn.com.basic.face.service.sqlite.SynchronRecordDao;
			import cn.com.basic.face.util.AppApi;
			import cn.com.basic.face.util.SqliteSqlUtil;

			@@ -36,13 +36,12 @@
			*/
			public void doSync() {
			try{
			Date synDate = new Date();
			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",sdf.format(synDate));
			params.addBodyParameter("synDate", 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() {
			@@ -50,6 +49,7 @@
			DeviceDao.getInstance().delDevice(BaseApplication.getInstance().getAndroidDevice().getCompanyId());
			List<SqliteSqlBean> result= getExtraList(SqliteSqlBean.class);
			SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
			sync();
			}
			});
			}catch(Exception e){