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 |   41 +++++++++++++++++++++++++++++++++++++++--
 1 files changed, 39 insertions(+), 2 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 c9efe5a..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
@@ -61,7 +61,7 @@
                         if (i < bitmapList.size()) {
                             SurveillanceQueryItem surveillanceQueryItem = bitmapList.get(i);
                             item.setBitmap(surveillanceQueryItem.getBitmap());
-//                            item.setBase64Image(surveillanceQueryItem.getBase64Image());
+                            item.setBase64Image(surveillanceQueryItem.getBase64Image());
                             item.setWidth(surveillanceQueryItem.getWidth());
                             item.setHeight(surveillanceQueryItem.getHeight());
                         }
@@ -71,7 +71,7 @@
                         if (i < bitmapList.size()) {
                             SurveillanceQueryItem surveillanceQueryItem = bitmapList.get(i);
                             item.setBitmap(surveillanceQueryItem.getBitmap());
-//                            item.setBase64Image(surveillanceQueryItem.getBase64Image());
+                            item.setBase64Image(surveillanceQueryItem.getBase64Image());
                             item.setWidth(surveillanceQueryItem.getWidth());
                             item.setHeight(surveillanceQueryItem.getHeight());
                         }
@@ -96,6 +96,43 @@
         });
     }
 
+    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) {
         List<SurveillanceQueryItem> registerList = new ArrayList<SurveillanceQueryItem>();
         List<SurveillanceQueryItem> checkInList = new ArrayList<SurveillanceQueryItem>();

--
Gitblit v1.8.0