From 3a5f09c61a87adb8dba2cc4a5366893886ba1c1d Mon Sep 17 00:00:00 2001
From: dupengyue <dupengyue@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 20 七月 2017 17:31:40 +0800
Subject: [PATCH] 接口初步完成
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 203 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 133 insertions(+), 70 deletions(-)
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 c6b3a1f..5299a05 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
@@ -3,14 +3,21 @@
import org.xutils.http.RequestParams;
import org.xutils.x;
-import java.util.ArrayList;
+import java.io.File;
+import java.io.FileWriter;
import java.util.List;
+import cn.com.basic.face.base.BaseApplication;
+import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.discern.common.BaseCommonCallBack;
+import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
-import cn.com.basic.face.fragment.SurveillanceFragment;
+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.Constant;
+import cn.com.basic.face.util.FileUtil;
+import cn.com.basic.face.util.SurveillanceQueryItemUtil;
+import cn.com.basic.face.util.UnknownSurveillanceQueryItemUtil;
public class SurveillanceMng {
@@ -20,79 +27,135 @@
return instance;
}
- public void findSurveillanceBottomList(final boolean isVisit) {
-
- RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.SURVEILLANCE_QUERY);
-// params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getDevice().getCompanyId());
- x.http().post(params, new BaseCommonCallBack() {
- public void success() {
- List<SurveillanceQueryItem> list = getList(SurveillanceQueryItem.class);
- if (isVisit) {
- int i = 0;
- for (SurveillanceQueryItem item : list) {
- if (i % 5 == 0) {
- item.setType(Constant.Supervisory.VISIT_REGISTER_ITEM_TYPE);
- } else {
- item.setType(Constant.Supervisory.VISIT_CHECK_IN_ITEM_TYPE);
+ public static class SurveillanceListThread extends Thread {
+ @Override
+ public void run() {
+ try {
+ while (true) {
+ MainActivity.getInstance().runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ if (BaseApplication.getInstance().networkAvailable()) {
+ SurveillanceQueryItemUtil.getInstance().removeTimeoutItemAndShow();
+ } else {
+ UnknownSurveillanceQueryItemUtil.getInstance().removeTimeoutItemAndShow();
+ }
}
- i++;
- }
-
- List<SurveillanceQueryItem> doubleList = new ArrayList<SurveillanceQueryItem>();
- fillBlank(list, doubleList);
-
- SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().show(doubleList, true);
- } else {
- SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_attendance_list_view().show(list, true);
+ });
+ Thread.sleep(1000*60*5);
}
+ } catch (Exception e) {
+ e.printStackTrace();
}
- });
-
- }
-
- private void fillBlank(List<SurveillanceQueryItem> list, List<SurveillanceQueryItem> doubleList) {
- List<SurveillanceQueryItem> registerList = new ArrayList<SurveillanceQueryItem>();
- List<SurveillanceQueryItem> checkInList = new ArrayList<SurveillanceQueryItem>();
-
- for (SurveillanceQueryItem item : list) {
- if (item.getType() == Constant.Supervisory.VISIT_REGISTER_ITEM_TYPE) {
- registerList.add(item);
- }
- if (item.getType() == Constant.Supervisory.VISIT_CHECK_IN_ITEM_TYPE) {
- checkInList.add(item);
- }
- }
-
- List<SurveillanceQueryItem> blenderList = new ArrayList<SurveillanceQueryItem>();
-
- int i = 0, m = 0, n = 0;
- for (i = 0; i < registerList.size() + checkInList.size(); i++) {
- SurveillanceQueryItem item;
- if (i % 2 == 0 && m < registerList.size()) {
- item = registerList.get(m);
- m++;
- } else {
- item = checkInList.get(n);
- n++;
- }
- blenderList.add(item);
- }
-
- for (SurveillanceQueryItem item : blenderList) {
- if (doubleList.size() % 2 == 0 && item.getType() != Constant.Supervisory.VISIT_REGISTER_ITEM_TYPE) {
- doubleList.add(getBlankItem());
- }
- if (doubleList.size() % 2 != 0 && item.getType() != Constant.Supervisory.VISIT_CHECK_IN_ITEM_TYPE) {
- doubleList.add(getBlankItem());
- }
- doubleList.add(item);
}
}
- private SurveillanceQueryItem getBlankItem() {
- SurveillanceQueryItem blankItem = new SurveillanceQueryItem();
- blankItem.setType(Constant.Supervisory.VISIT_BLANK_ITEM_TYPE);
- return blankItem;
+ int fileIndex = 1;
+
+ public void addBitmap(final List<SurveillanceQueryItem> bitmapList, final byte[] byteArray, int len, final String cameraInOrOut, byte[] surveillancePhotoBytes) {
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
+ try {
+ if (fileIndex > 30) {
+ fileIndex = 1;
+ }
+ fileIndex++;
+ RequestParams params = new RequestParams();
+ File rawSurveillancePhotoFile = FileUtil.writeToFile("rawSurveillancePhotoFile_"+fileIndex, byteArray);
+ File surveillancePhotoFile = FileUtil.writeToFile("surveillancePhotoFile_"+fileIndex, surveillancePhotoBytes);
+
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+ params.addBodyParameter("InOrOutCamera", cameraInOrOut + "");
+ params.addBodyParameter("deviceId", BaseApplication.getInstance().getAndroidDevice().getDeviceId());
+ params.addBodyParameter("rawSurveillancePhoto", rawSurveillancePhotoFile);
+ params.addBodyParameter("surveillancePhoto", surveillancePhotoFile);
+
+ File path = BaseApplication.getInstance().getFilesDir();
+ if (!rawSurveillancePhotoFile.exists()) {
+ rawSurveillancePhotoFile.createNewFile();
+ }
+ 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);
+ x.http().post(params, new BaseCommonCallBack() {
+ @Override
+ public void success() {
+ try {
+ SurveillanceQueryItemUtil.getInstance().addItems(resultBean.getList(SurveillanceQueryItem.class), bitmapList, cameraInOrOut);
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
+ }
+ });
+ }catch(Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ 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_UNKNOWN_ITEM_TYPE+"");
+ 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();
+ }
}
}
--
Gitblit v1.8.0