From 86a135cc416c8582f5effbfc5a91ece236775100 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 21 四月 2017 17:07:57 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 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 21a26e9..9b2ec4d 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
@@ -8,7 +8,9 @@
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;
@@ -67,30 +69,38 @@
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("enterOrExit", CommonVariables.EnterOrExit.ENTER+"");
+ params.addBodyParameter("InOrOutCamera", CommonVariables.Camera.IN+"");
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();
- for (int i = 0; i < items.size(); i++) {
+ List newList = new ArrayList();
+
+ for (int i = 0; items != null && i < items.size(); i++) {
SurveillanceQueryItem item = items.get(i);
int type = item.getType();
if (type == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE
|| type == CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE
) {
- list.add(0, item);
- }
- if (i < bitmapList.size()) {
- item.setBitmap(bitmapList.get(i));
+ newList.add(0, item);
+ if (i < bitmapList.size()) {
+ item.setBitmap(bitmapList.get(i));
+ }
}
}
- List<SurveillanceQueryItem> doubleList = new ArrayList<SurveillanceQueryItem>();
+ if (newList.size() > 0) {
- fillBlank(list, doubleList);
+ List<SurveillanceQueryItem> doubleList = new ArrayList<SurveillanceQueryItem>();
- SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().show(doubleList, true);
+ prevList.addAll(0, newList);
+
+ fillBlank(prevList, doubleList);
+
+ SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().show(doubleList, true);
+ }
+
}
});
}
@@ -99,6 +109,7 @@
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) {
registerList.add(item);
@@ -133,6 +144,22 @@
}
+ private void removeDuplicate(List<SurveillanceQueryItem> list) {
+ List itemsToRemove = new ArrayList();
+ Set<String> registerIds = new HashSet<>();
+ for (SurveillanceQueryItem item : list) {
+ if (item.getType() == Constant.Surveillance.VISIT_CHECK_IN_ITEM_TYPE) {
+ if (registerIds.contains(item.getRegisterId())) {
+ itemsToRemove.add(item);
+ } else {
+ registerIds.add(item.getRegisterId());
+ }
+
+ }
+ }
+ list.removeAll(itemsToRemove);
+ }
+
private SurveillanceQueryItem getBlankItem() {
SurveillanceQueryItem blankItem = new SurveillanceQueryItem();
blankItem.setType(Constant.Surveillance.VISIT_BLANK_ITEM_TYPE);
--
Gitblit v1.8.0