From 04f0f13b23281e38578b92d29809511a04b770ba Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 18 四月 2017 16:47:29 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 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 96c2fad..841368a 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
@@ -116,30 +116,29 @@
}
}
- 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 (m < checkInList.size()) {
+ item = checkInList.get(m);
+ } else {
+ item = getBlankItem();
+ }
n++;
- }
- blenderList.add(item);
- }
-
- for (SurveillanceQueryItem item : blenderList) {
- if (doubleList.size() % 2 == 0 && item.getType() != Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
- doubleList.add(getBlankItem());
- }
- if (doubleList.size() % 2 != 0 && item.getType() != Constant.Surveillance.VISIT_CHECK_IN_ITEM_TYPE) {
- doubleList.add(getBlankItem());
}
doubleList.add(item);
}
+
}
private SurveillanceQueryItem getBlankItem() {
--
Gitblit v1.8.0