From c34f11fb7407594f7c1eb69b11f84a45d13cfa1a Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 24 四月 2017 11:55:11 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 89 ++++++++++++++++++++++++++------------------
1 files changed, 53 insertions(+), 36 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 07583d7..0a78ae1 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
@@ -6,15 +6,15 @@
import org.xutils.http.RequestParams;
import org.xutils.x;
-import java.nio.ByteBuffer;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
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.SurveillanceQueryItem;
-import cn.com.basic.face.fragment.RegisterFragment;
import cn.com.basic.face.fragment.SurveillanceFragment;
import cn.com.basic.face.util.AppApi;
import cn.com.basic.face.util.Constant;
@@ -31,53 +31,54 @@
if (!BaseApplication.deviceAvailable) {
return;
}
- RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.SURVEILLANCE_QUERY);
- params.addBodyParameter(CommonVariables.Page.PAGE_NUM, "1");
- params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "10");
- 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(CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE);
- } else {
- item.setType(CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE);
- }
- 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);
- }
- }
- });
+// RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.SURVEILLANCE_QUERY);
+// params.addBodyParameter(CommonVariables.Page.PAGE_NUM, "1");
+// params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "10");
+// 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.setRegisterOrCheckIn(CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE);
+// } else {
+// item.setRegisterOrCheckIn(CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE);
+// }
+// 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);
+// }
+// }
+// });
}
public void addBitmap(final List<Bitmap> bitmapList, byte[] byteArray, int len) {
if (!BaseApplication.deviceAvailable) {
return;
}
+ final int cameraInOrOut = Integer.parseInt(CommonVariables.Camera.IN);
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.SURVEILLANCE_UPLOAD);
params.addBodyParameter("base64Photo", Base64.encodeToString(byteArray, 0, len, Base64.DEFAULT));
params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getDevice().getDeviceCompanyId());
params.addBodyParameter("deviceId", BaseApplication.getInstance().getDevice().getDeviceId());
- params.addBodyParameter("InOrOutCamera", CommonVariables.Camera.IN+"");
+ params.addBodyParameter("InOrOutCamera", cameraInOrOut+"");
x.http().post(params, new BaseCommonCallBack() {
public void success() {
List<SurveillanceQueryItem> items = getList(SurveillanceQueryItem.class);
- List list = SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().getPrevList();
+ List prevList = SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().getPrevList();
List newList = new ArrayList();
for (int i = 0; items != null && i < items.size(); i++) {
SurveillanceQueryItem item = items.get(i);
- int type = item.getType();
+ int type = item.getRegisterOrCheckIn();
if (type == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE
|| type == CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE
) {
@@ -92,9 +93,9 @@
List<SurveillanceQueryItem> doubleList = new ArrayList<SurveillanceQueryItem>();
- list.addAll(0, newList);
+ prevList.addAll(0, newList);
- fillBlank(list, doubleList);
+ fillBlank(prevList, doubleList);
SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().show(doubleList, true);
}
@@ -107,11 +108,12 @@
doubleList.clear();
List<SurveillanceQueryItem> registerList = new ArrayList<SurveillanceQueryItem>();
List<SurveillanceQueryItem> checkInList = new ArrayList<SurveillanceQueryItem>();
+ removeDuplicate(list);
for (SurveillanceQueryItem item : list) {
- if (item.getType() == Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
+ if (item.getRegisterOrCheckIn() == Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
registerList.add(item);
}
- if (item.getType() == Constant.Surveillance.VISIT_CHECK_IN_ITEM_TYPE) {
+ if (item.getRegisterOrCheckIn() == Constant.Surveillance.VISIT_CHECK_IN_ITEM_TYPE) {
checkInList.add(item);
}
}
@@ -141,9 +143,24 @@
}
+ private void removeDuplicate(List<SurveillanceQueryItem> list) {
+ List itemsToRemove = new ArrayList();
+ Set<String> registerIds = new HashSet<>();
+ for (SurveillanceQueryItem item : list) {
+ if (item.getRegisterOrCheckIn() == Constant.Surveillance.VISIT_CHECK_IN_ITEM_TYPE) {
+ if (registerIds.contains(item.getRegisterId()+"_"+item.getInOrOutCamera())) {
+ itemsToRemove.add(item);
+ } else {
+ registerIds.add(item.getRegisterId()+"_"+item.getInOrOutCamera());
+ }
+ }
+ }
+ list.removeAll(itemsToRemove);
+ }
+
private SurveillanceQueryItem getBlankItem() {
SurveillanceQueryItem blankItem = new SurveillanceQueryItem();
- blankItem.setType(Constant.Surveillance.VISIT_BLANK_ITEM_TYPE);
+ blankItem.setRegisterOrCheckIn(Constant.Surveillance.VISIT_BLANK_ITEM_TYPE);
return blankItem;
}
--
Gitblit v1.8.0