From 1152a8616b519ff5124c32ed547340d811655b8f Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 21 四月 2017 17:29:05 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 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..1948e1e 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;
@@ -43,9 +41,9 @@
int i = 0;
for (SurveillanceQueryItem item : list) {
if (i % 5 == 0) {
- item.setType(CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE);
+ item.setRegisterOrCheckIn(CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE);
} else {
- item.setType(CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE);
+ item.setRegisterOrCheckIn(CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE);
}
i++;
}
@@ -65,11 +63,12 @@
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);
@@ -79,7 +78,7 @@
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
) {
@@ -111,10 +110,10 @@
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);
}
}
@@ -148,13 +147,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 +160,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