From 260206f45cce3d1238568af29d6410bf19facd7e Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 24 七月 2017 18:03:37 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 57 ---------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java | 114 -------------------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java | 12 +
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/AttenderRegisterUpSync.java | 61 ++++++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/OfflineSurveillanceUpSync.java | 58 +++++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java | 1
6 files changed, 129 insertions(+), 174 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
index 168983d..d052609 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
@@ -261,118 +261,4 @@
}
- public void sendOfflineVisitorRegisterToServer() {
- final OfflineVisitorRegisterItem item = RegisterDao.getInstance().readOfflineVisitorRegister();
- RequestParams params = new RequestParams();
-
- params.addBodyParameter(Register.FieldNames.username, item.getUsername());
- params.addBodyParameter(Register.FieldNames.mobilePhone, item.getMobilePhone());
- params.addBodyParameter(Register.FieldNames.genderId, item.getGenderId());
- params.addBodyParameter(Register.FieldNames.identityTypeId, item.getIdentityTypeId());
- params.addBodyParameter(Register.FieldNames.countryId, item.getCountryId());
- params.addBodyParameter(Register.FieldNames.visitorTypeId, item.getVisitorTypeId());
- params.addBodyParameter(Register.FieldNames.identifyNum, item.getIdentifyNum());
- params.addBodyParameter(Register.FieldNames.companyId, item.getCompanyId());
- params.addBodyParameter(Register.FieldNames.birthday, item.getBirthday());
- params.addBodyParameter(Register.FieldNames.remark, item.getRemark());
- params.addBodyParameter("width", item.getRawSurveillancePhotoWidth());
- params.addBodyParameter("height", item.getRawSurveillancePhotoHeight());
-
- item.loadFiles();
-
- params.addBodyParameter("rawSurveillancePhoto", item.getRawSurveillancePhotoPath());
- params.addBodyParameter("surveillancePhoto", item.getSurveillancePhoto());
- params.addBodyParameter("uploadCustomPhoto", item.getUploadCustomPhoto());
- params.addBodyParameter("idCardPhoto", item.getIdCardPhoto());
- params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
- try {
- File path = BaseApplication.getInstance().getFilesDir();
- File f0 = new File(path, "f0");
- if (!f0.exists()) {
- f0.createNewFile();
- }
- FileWriter fw0 = new FileWriter(f0);
- fw0.write("test1");
- fw0.close();
- params.setUri(AppApi.BASE_URL +AppApi.REGISTER_ADD);
- params.addBodyParameter("f0", f0);
- x.http().post(params, new BaseCommonCallBack() {
- @Override
- public void success() {
- SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
- Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
- VisitorRegisterFragment.getInstance().resetForm();
- RegisterDao.getInstance().removeOfflineVisitorRegister(item);
- }
- });
- }catch(Exception e) {
- e.printStackTrace();
- }
- }
-
- public boolean hasOfflineVisitorRegisterData() {
- return RegisterDao.getInstance().hasOfflineVisitorRegisterData();
- }
-
- public void sendOfflineAttenderRegisterToServer() {
- if (!BaseApplication.deviceAvailable) {
- return;
- }
- try {
- RequestParams params = new RequestParams();
- File path = BaseApplication.getInstance().getFilesDir();
- File rawSurveillancePhotoFile = new File(path, "rawSurveillancePhoto_attender");
- if (!rawSurveillancePhotoFile.exists()) {
- rawSurveillancePhotoFile.createNewFile();
- }
- File f0 = new File(path, "f0");
- if (!f0.exists()) {
- f0.createNewFile();
- }
- File surveillancePhotoFile = new File(path, "surveillancePhoto_attender");
- if (!surveillancePhotoFile.exists()) {
- surveillancePhotoFile.createNewFile();
- }
- File uploadCustomPhotoFile = new File(path, "uploadCustomPhoto_attender");
- if (!uploadCustomPhotoFile.exists()) {
- uploadCustomPhotoFile.createNewFile();
- }
- File idCardPhotoFile = new File(path, "idCardPhoto_attender");
- if (!idCardPhotoFile.exists()) {
- idCardPhotoFile.createNewFile();
- }
-
- FileWriter fw0 = new FileWriter(f0);
- fw0.write("test1");
- fw0.close();
- params.setUri(AppApi.BASE_URL +AppApi.ATTENDER_REGISTER_ADD);
- params.addBodyParameter("f0", f0);
- params.addBodyParameter("rawSurveillancePhoto", rawSurveillancePhotoFile);
- params.addBodyParameter("surveillancePhoto", surveillancePhotoFile);
- params.addBodyParameter("uploadCustomPhoto", uploadCustomPhotoFile);
- params.addBodyParameter("idCardPhoto", idCardPhotoFile);
- params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
-// if (idCardHeadPhoto != null && !"".equals(idCardHeadPhoto)) {
-// File f5 = new File(idCardHeadPhoto);
-// if (!f5.exists()) {
-// f5.createNewFile();
-// }
-// params.addBodyParameter("idCardHeadPhoto_attender", f5);
-// }
- x.http().post(params, new BaseCommonCallBack() {
- @Override
- public void success() {
- SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
- Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
- AttenderRegisterFragment.getInstance().resetForm();
- }
- });
- }catch(Exception e) {
- e.printStackTrace();
- }
- }
-
- public boolean hasOfflineAttenderRegisterData() {
- return RegisterDao.getInstance().hasOfflineAttenderRegisterData();
- }
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
index 081b9ca..3932137 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
@@ -109,62 +109,5 @@
}
}
- public void sendOfflineUnknownToServer() {
- if (!BaseApplication.deviceAvailable) {
- return;
- }
- UnknownQueryItem item = SurveillanceDao.getInstance().readOfflineUnknownFromLocal();
- if (item == null) {
- return;
- }
- syncOfflineData(item);
- }
-
- private void syncOfflineData(final UnknownQueryItem item) {
- try {
- if (fileIndex > 30) {
- fileIndex = 1;
- }
- fileIndex++;
- RequestParams params = new RequestParams();
-
- File rawSurveillancePhotoFile = FileUtil.getFile(item.getRawDataPath());
-
- params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
- params.addBodyParameter("InOrOutCamera", item.getCameraInOrOut() + "");
- params.addBodyParameter("deviceId", BaseApplication.getInstance().getAndroidDevice().getDeviceId());
- params.addBodyParameter("rawSurveillancePhoto", rawSurveillancePhotoFile);
-
- File path = BaseApplication.getInstance().getFilesDir();
- File f0 = new File(path, "f0");
- if (!f0.exists()) {
- f0.createNewFile();
- }
-
- FileWriter fw0 = new FileWriter(f0);
- fw0.write("test1");
- fw0.close();
- params.setUri(AppApi.BASE_URL + AppApi.SURVEILLANCE_UPLOAD);
- params.addBodyParameter("f0", f0);
- params.addBodyParameter("rawSurveillancePhoto", rawSurveillancePhotoFile);
- params.addBodyParameter("androidCreateTime", item.getCreateTime());
- params.addBodyParameter("offlineUnknown", CommonVariables.Surveillance.OFFLINE_SURVEILLANCE_ITEM_TYPE +"");
- params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
- x.http().post(params, new BaseCommonCallBack() {
- @Override
- public void success() {
- try {
- if (1==1) {
- SurveillanceDao.getInstance().removeLocalSqliteRecord(item);
- }
- } catch(Exception e) {
- e.printStackTrace();
- }
- }
- });
- }catch(Exception e) {
- e.printStackTrace();
- }
- }
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java
index 1d432e5..57aab24 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java
@@ -297,4 +297,5 @@
}
return hasMore;
}
+
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java
index f8ff6d0..400269f 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java
@@ -75,11 +75,21 @@
if (file.exists()) {
file.delete();
}
- MainActivity.getInstance().db.execSQL("delete from offline_unknown where raw_data_path='"+item.getRawDataPath()+"'");
+ MainActivity.getInstance().db.execSQL("delete from offline_surveillance where raw_data_path='"+item.getRawDataPath()+"'");
}
catch (Exception e) {
e.printStackTrace();
}
}
+ public boolean hasMoreOfflineSurveillance() {
+ boolean hasMore = false;
+ String sql = "select count(*) from offline_surveillance order by create_time ";
+ Cursor c = MainActivity.getInstance().db.rawQuery(sql, new String[]{});
+ if (c.moveToFirst()) {
+ hasMore = c.getInt(0) > 0;
+ }
+ return hasMore;
+ }
+
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/AttenderRegisterUpSync.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/AttenderRegisterUpSync.java
index 4d64655..a11ed8b 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/AttenderRegisterUpSync.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/AttenderRegisterUpSync.java
@@ -1,6 +1,20 @@
package cn.com.basic.face.service.sync.up;
+import android.widget.Toast;
+
+import org.xutils.http.RequestParams;
+import org.xutils.x;
+
+import java.io.File;
+import java.io.FileWriter;
+
+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.fragment.AttenderRegisterFragment;
import cn.com.basic.face.service.sqlite.RegisterDao;
+import cn.com.basic.face.util.AppApi;
+import cn.com.basic.face.util.SqliteSqlUtil;
public class AttenderRegisterUpSync extends BaseSync {
private BaseSync next;
@@ -17,7 +31,52 @@
}
public void doSync() {
-
+ try {
+ RequestParams params = new RequestParams();
+ File path = BaseApplication.getInstance().getFilesDir();
+ File rawSurveillancePhotoFile = new File(path, "rawSurveillancePhoto_attender");
+ if (!rawSurveillancePhotoFile.exists()) {
+ rawSurveillancePhotoFile.createNewFile();
+ }
+ File f0 = new File(path, "f0");
+ if (!f0.exists()) {
+ f0.createNewFile();
+ }
+ File surveillancePhotoFile = new File(path, "surveillancePhoto_attender");
+ if (!surveillancePhotoFile.exists()) {
+ surveillancePhotoFile.createNewFile();
+ }
+ File uploadCustomPhotoFile = new File(path, "uploadCustomPhoto_attender");
+ if (!uploadCustomPhotoFile.exists()) {
+ uploadCustomPhotoFile.createNewFile();
+ }
+ File idCardPhotoFile = new File(path, "idCardPhoto_attender");
+ if (!idCardPhotoFile.exists()) {
+ idCardPhotoFile.createNewFile();
+ }
+
+ FileWriter fw0 = new FileWriter(f0);
+ fw0.write("test1");
+ fw0.close();
+ params.setUri(AppApi.BASE_URL +AppApi.ATTENDER_REGISTER_ADD);
+ params.addBodyParameter("f0", f0);
+ params.addBodyParameter("rawSurveillancePhoto", rawSurveillancePhotoFile);
+ params.addBodyParameter("surveillancePhoto", surveillancePhotoFile);
+ params.addBodyParameter("uploadCustomPhoto", uploadCustomPhotoFile);
+ params.addBodyParameter("idCardPhoto", idCardPhotoFile);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+ x.http().post(params, new BaseCommonCallBack() {
+ @Override
+ public void success() {
+ SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
+ Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
+ AttenderRegisterFragment.getInstance().resetForm();
+ sync();
+ }
+ });
+ }catch(Exception e) {
+ e.printStackTrace();
+ }
}
public boolean hasMore() {
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 6f11149..f104689 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,5 +1,19 @@
package cn.com.basic.face.service.sync.up;
+import org.xutils.http.RequestParams;
+import org.xutils.x;
+
+import java.io.File;
+import java.io.FileWriter;
+
+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.query.item.UnknownQueryItem;
+import cn.com.basic.face.service.sqlite.SurveillanceDao;
+import cn.com.basic.face.util.AppApi;
+import cn.com.basic.face.util.FileUtil;
+
public class OfflineSurveillanceUpSync extends BaseSync {
private static OfflineSurveillanceUpSync instance = new OfflineSurveillanceUpSync();
@@ -9,11 +23,53 @@
@Override
public void doSync() {
+ final UnknownQueryItem item = SurveillanceDao.getInstance().readOfflineUnknownFromLocal();
+ try {
+ RequestParams params = new RequestParams();
+ File rawSurveillancePhotoFile = FileUtil.getFile(item.getRawDataPath());
+
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+ params.addBodyParameter("InOrOutCamera", item.getCameraInOrOut() + "");
+ params.addBodyParameter("deviceId", BaseApplication.getInstance().getAndroidDevice().getDeviceId());
+ params.addBodyParameter("rawSurveillancePhoto", rawSurveillancePhotoFile);
+
+ File path = BaseApplication.getInstance().getFilesDir();
+ File f0 = new File(path, "f0");
+ if (!f0.exists()) {
+ f0.createNewFile();
+ }
+
+ FileWriter fw0 = new FileWriter(f0);
+ fw0.write("test1");
+ fw0.close();
+ params.setUri(AppApi.BASE_URL + AppApi.SURVEILLANCE_UPLOAD);
+ params.addBodyParameter("f0", f0);
+ params.addBodyParameter("rawSurveillancePhoto", rawSurveillancePhotoFile);
+ params.addBodyParameter("androidCreateTime", item.getCreateTime());
+ params.addBodyParameter("offlineUnknown", CommonVariables.Surveillance.OFFLINE_SURVEILLANCE_ITEM_TYPE +"");
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+ x.http().post(params, new BaseCommonCallBack() {
+ @Override
+ public void success() {
+ try {
+ if (1==1) {
+ SurveillanceDao.getInstance().removeLocalSqliteRecord(item);
+ }
+ sync();
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
+ }
+ });
+ }catch(Exception e) {
+ e.printStackTrace();
+ }
}
@Override
public boolean hasMore() {
- return false;
+ return SurveillanceDao.getInstance().hasMoreOfflineSurveillance();
}
+
}
--
Gitblit v1.8.0