From 1fe32685a2839bf3f4e2e84765609d4fcbbc7cf0 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 27 七月 2017 10:20:45 +0800
Subject: [PATCH] Failed commit: Default
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/RegisterUpSync.java | 15 ++-------------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/VisitUpSync.java | 15 ++-------------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/OfflineSurveillanceUpSync.java | 17 +++++------------
3 files changed, 9 insertions(+), 38 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 494f179..00fb6b6 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
@@ -68,27 +68,20 @@
e.printStackTrace();
}
}
+
+ /**
+ *offline_surveillance琛ㄥ悜涓婂悓姝�
+ */
@Override
public void doSync() {
try{
final String tableName = "offline_surveillance";
- RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.TWO_WAY_SYNCHRON);
+ RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.UP_SYNCHRON);
params.addBodyParameter("tableName", tableName);
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();
}
});
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/RegisterUpSync.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/RegisterUpSync.java
index 1ac6dd1..5e06af2 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/RegisterUpSync.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/RegisterUpSync.java
@@ -23,28 +23,17 @@
/***
- * register琛ㄥ弻鍚戝悓姝�
+ * register琛ㄥ悜涓婂悓姝�
*/
public void doSync() {
try{
final String tableName = "register";
- RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.TWO_WAY_SYNCHRON);
+ RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.UP_SYNCHRON);
params.addBodyParameter("tableName", tableName);
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();
- 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);
- }
- RegisterDao.getInstance().delRegiterList();
- List<SqliteSqlBean> result= getExtraList(SqliteSqlBean.class);
- SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));*/
sync();
}
});
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/VisitUpSync.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/VisitUpSync.java
index 6f677bc..fe57ccb 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/VisitUpSync.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/VisitUpSync.java
@@ -23,28 +23,17 @@
/***
- * visit琛ㄥ弻鍚戝悓姝�
+ * visit琛ㄥ悜涓婂悓姝�
*/
public void doSync() {
try{
final String tableName = "visit";
- RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.TWO_WAY_SYNCHRON);
+ RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.UP_SYNCHRON);
params.addBodyParameter("tableName", tableName);
params.addBodyParameter("data", JSONArray.toJSONString(VisitDao.getInstance().getVisitList(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();
- 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);
- }
- VisitDao.getInstance().delVisitList();
- List<SqliteSqlBean> result= getExtraList(SqliteSqlBean.class);
- SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));*/
sync();
}
});
--
Gitblit v1.8.0