From 21b675418bc1c6ff3620483f3cd103fa0234fe26 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 04 五月 2017 14:51:15 +0800
Subject: [PATCH] optimize
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 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 6aaed08..2286421 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,29 +78,31 @@
}
}
- if (newList.size() > 0) {
+ if (newVisitorList.size() > 0) {
+ prevVisitorList.addAll(0, newVisitorList);
+ registerTopAndCheckInBottom(prevVisitorList);
+ SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visitor_list_view().show(prevVisitorList);
+ }
- List<SurveillanceQueryItem> doubleList = new ArrayList<SurveillanceQueryItem>();
-
- prevList.addAll(0, newList);
-
- registerTopAndCheckInBottom(prevList, doubleList);
-
- SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().show(doubleList, true);
+ 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);
}
}
});
}
- private void registerTopAndCheckInBottom(List<SurveillanceQueryItem> list, List<SurveillanceQueryItem> doubleList) {
- doubleList.clear();
+ private void registerTopAndCheckInBottom(List<SurveillanceQueryItem> list) {
List<SurveillanceQueryItem> registerList = new ArrayList<SurveillanceQueryItem>();
List<SurveillanceQueryItem> checkInList = new ArrayList<SurveillanceQueryItem>();
removeDuplicateCheckIn(list);
- int maxRegister = 20;
int i1 = 0, j = 0;
- 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) {
@@ -104,6 +119,8 @@
}
int max = registerList.size() > checkInList.size() ? registerList.size() : checkInList.size();
+
+ List tempList = new ArrayList();
int m = 0, n = 0;
for (int i = 0; i < max * 2; i++) {
@@ -123,9 +140,10 @@
}
n++;
}
- doubleList.add(item);
+ tempList.add(item);
}
-
+ list.clear();
+ list.addAll(tempList);
}
private void removeDuplicateCheckIn(List<SurveillanceQueryItem> list) {
--
Gitblit v1.8.0