From b96e8c8ba2bc11461d1ea6c80a167392ef09cb8a Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 24 四月 2017 15:11:27 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 141 +++++++++++++++++++++++++++++++++++------------
1 files changed, 105 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 87f08fc..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
@@ -1,12 +1,19 @@
package cn.com.basic.face.service;
+import android.graphics.Bitmap;
+import android.util.Base64;
+
import org.xutils.http.RequestParams;
import org.xutils.x;
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.SurveillanceFragment;
import cn.com.basic.face.util.AppApi;
@@ -20,78 +27,140 @@
return instance;
}
- public void findSupervisoryBottomList(final boolean isVisit) {
+ public void findSurveillanceBottomList(final boolean isVisit) {
+ 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.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);
+// }
+// }
+// });
+ }
- RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.SURVEILLANCE_QUERY);
-// params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getDevice().getCompanyId());
+ 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", cameraInOrOut+"");
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);
+ List<SurveillanceQueryItem> items = getList(SurveillanceQueryItem.class);
+ 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.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));
}
- i++;
}
+ }
+
+ if (newList.size() > 0) {
List<SurveillanceQueryItem> doubleList = new ArrayList<SurveillanceQueryItem>();
- fillBlank(list, doubleList);
+
+ prevList.addAll(0, newList);
+
+ fillBlank(prevList, 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);
}
+
}
});
-
}
private void fillBlank(List<SurveillanceQueryItem> list, List<SurveillanceQueryItem> doubleList) {
+ doubleList.clear();
List<SurveillanceQueryItem> registerList = new ArrayList<SurveillanceQueryItem>();
List<SurveillanceQueryItem> checkInList = new ArrayList<SurveillanceQueryItem>();
-
+ removeDuplicate(list);
for (SurveillanceQueryItem item : list) {
- if (item.getType() == Constant.Supervisory.VISIT_REGISTER_ITEM_TYPE) {
+ if (item.getRegisterOrCheckIn() == Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
registerList.add(item);
}
- if (item.getType() == Constant.Supervisory.VISIT_CHECK_IN_ITEM_TYPE) {
+ if (item.getRegisterOrCheckIn() == Constant.Surveillance.VISIT_CHECK_IN_ITEM_TYPE) {
checkInList.add(item);
}
}
- List<SurveillanceQueryItem> blenderList = new ArrayList<SurveillanceQueryItem>();
+ int max = registerList.size() > checkInList.size() ? registerList.size() : checkInList.size();
- int i = 0, m = 0, n = 0;
- for (i = 0; i < registerList.size() + checkInList.size(); i++) {
+ int m = 0, n = 0;
+ for (int i = 0; i < max * 2; i++) {
SurveillanceQueryItem item;
- if (i % 2 == 0 && m < registerList.size()) {
- item = registerList.get(m);
+ if (i % 2 == 0) {
+ if (m < registerList.size()) {
+ item = registerList.get(m);
+ } else {
+ item = getBlankItem();
+ }
m++;
} else {
- item = checkInList.get(n);
+ if (n < checkInList.size()) {
+ item = checkInList.get(n);
+ } else {
+ item = getBlankItem();
+ }
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 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.Supervisory.VISIT_BLANK_ITEM_TYPE);
+ blankItem.setRegisterOrCheckIn(Constant.Surveillance.VISIT_BLANK_ITEM_TYPE);
return blankItem;
}
--
Gitblit v1.8.0