From 15d0c49e85159b9e27870aff5280c0cd95b103c4 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 04 五月 2017 17:16:56 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 76 +++++++++++++++++++++++++++++++++----
1 files changed, 67 insertions(+), 9 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 0b849c3..291ecdb 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
@@ -44,9 +44,12 @@
x.http().post(params, new BaseCommonCallBack() {
public void success() {
List<SurveillanceQueryItem> items = getList(SurveillanceQueryItem.class);
- List prevList = SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().getPrevList();
+ List prevVisitorList = SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visitor_list_view().getPrevList();
+ List prevAttendanceList = SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_attendance_list_view().getPrevList();
- List newList = new ArrayList();
+ List newVisitorList = new ArrayList();
+
+ List newAttendanceList = new ArrayList();
for (int i = 0; items != null && i < items.size(); i++) {
SurveillanceQueryItem item = items.get(i);
@@ -54,7 +57,17 @@
if (type == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE
|| type == CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE
) {
- newList.add(0, item);
+ newVisitorList.add(0, item);
+ if (i < bitmapList.size()) {
+ SurveillanceQueryItem surveillanceQueryItem = bitmapList.get(i);
+ item.setBitmap(surveillanceQueryItem.getBitmap());
+ item.setBase64Image(surveillanceQueryItem.getBase64Image());
+ item.setWidth(surveillanceQueryItem.getWidth());
+ item.setHeight(surveillanceQueryItem.getHeight());
+ }
+ }
+ if (type == CommonVariables.Surveillance.VISIT_ATTENDANCE_ITEM_TYPE) {
+ newAttendanceList.add(item);
if (i < bitmapList.size()) {
SurveillanceQueryItem surveillanceQueryItem = bitmapList.get(i);
item.setBitmap(surveillanceQueryItem.getBitmap());
@@ -65,14 +78,59 @@
}
}
- if (newList.size() > 0) {
- prevList.addAll(0, newList);
- registerTopAndCheckInBottom(prevList);
- SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().show(prevList);
+ if (newVisitorList.size() > 0) {
+ prevVisitorList.addAll(0, newVisitorList);
+ registerTopAndCheckInBottom(prevVisitorList);
+ SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visitor_list_view().show(prevVisitorList);
+ }
+
+ if (newAttendanceList.size() > 0) {
+ prevAttendanceList.addAll(0, newAttendanceList);
+ if (prevAttendanceList.size() > 20) {
+ prevAttendanceList = prevAttendanceList.subList(0, 20);
+ }
+ SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_attendance_list_view().show(prevAttendanceList);
}
}
});
+ }
+
+ public List getSurveillancePhotoList() {
+ List<SurveillanceQueryItem> prevVisitorList = SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visitor_list_view().getPrevList();
+ List<SurveillanceQueryItem> registerList = new ArrayList();
+ for (SurveillanceQueryItem surveillanceQueryItem : prevVisitorList) {
+ if (surveillanceQueryItem.getRegisterOrCheckIn() == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
+ if (registerList.size() > 16) {
+ break;
+ }
+ surveillanceQueryItem.setSurveillancePhotoSelected(false);
+ registerList.add(surveillanceQueryItem);
+ }
+ }
+ SurveillanceQueryItem item;
+ List items = new ArrayList();
+ int m = 0;
+ int n = 8;
+ for (int i = 0; i < 16; i++) {
+ if (i % 2 == 0) {
+ if (m < registerList.size()) {
+ item = registerList.get(m);
+ m++;
+ } else {
+ item = getBlankItem();
+ }
+ } else {
+ if (n < registerList.size()) {
+ item = registerList.get(n);
+ n++;
+ } else {
+ item = getBlankItem();
+ }
+ }
+ items.add(item);
+ }
+ return items;
}
private void registerTopAndCheckInBottom(List<SurveillanceQueryItem> list) {
@@ -80,8 +138,8 @@
List<SurveillanceQueryItem> checkInList = new ArrayList<SurveillanceQueryItem>();
removeDuplicateCheckIn(list);
int i1 = 0, j = 0;
- int maxRegister = 20;
- int maxCheckIn = 20;
+ int maxRegister = 50;
+ int maxCheckIn = 50;
for (SurveillanceQueryItem item : list) {
if (item.getRegisterOrCheckIn() == Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
if (i1 < maxRegister) {
--
Gitblit v1.8.0