From a54e2c8ed81ec720f45470292cdd97e3fc86d8e9 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 四月 2017 15:34:10 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 66 ++++++++++++--------------------
1 files changed, 25 insertions(+), 41 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 9b2ec4d..b42df6c 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,7 +6,6 @@
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;
@@ -16,7 +15,6 @@
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;
@@ -33,35 +31,9 @@
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);
- }
- }
- });
}
- public void addBitmap(final List<Bitmap> bitmapList, byte[] byteArray, int len) {
+ public void addBitmap(final List<SurveillanceQueryItem> bitmapList, byte[] byteArray, int len, String cameraInOrOut) {
if (!BaseApplication.deviceAvailable) {
return;
}
@@ -69,7 +41,7 @@
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);
@@ -79,13 +51,17 @@
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
) {
newList.add(0, item);
if (i < bitmapList.size()) {
- item.setBitmap(bitmapList.get(i));
+ SurveillanceQueryItem surveillanceQueryItem = bitmapList.get(i);
+ item.setBitmap(surveillanceQueryItem.getBitmap());
+ item.setBase64Image(surveillanceQueryItem.getBase64Image());
+ item.setWidth(surveillanceQueryItem.getWidth());
+ item.setHeight(surveillanceQueryItem.getHeight());
}
}
}
@@ -110,12 +86,21 @@
List<SurveillanceQueryItem> registerList = new ArrayList<SurveillanceQueryItem>();
List<SurveillanceQueryItem> checkInList = new ArrayList<SurveillanceQueryItem>();
removeDuplicate(list);
+ int maxRegister = 20;
+ int i1 = 0, j = 0;
+ int maxCheckIn = 20;
for (SurveillanceQueryItem item : list) {
- if (item.getType() == Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
- registerList.add(item);
+ if (item.getRegisterOrCheckIn() == Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
+ if (i1 < maxRegister) {
+ registerList.add(item);
+ i1++;
+ }
}
- if (item.getType() == Constant.Surveillance.VISIT_CHECK_IN_ITEM_TYPE) {
- checkInList.add(item);
+ if (item.getRegisterOrCheckIn() == Constant.Surveillance.VISIT_CHECK_IN_ITEM_TYPE) {
+ if (j < maxCheckIn) {
+ checkInList.add(item);
+ j++;
+ }
}
}
@@ -148,13 +133,12 @@
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())) {
+ 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());
+ registerIds.add(item.getRegisterId()+"_"+item.getInOrOutCamera());
}
-
}
}
list.removeAll(itemsToRemove);
@@ -162,7 +146,7 @@
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