From 3e3ef29b3327a0acfee4da9ba5273db5388a1acb Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 05 五月 2017 11:41:43 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java |   54 ++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 46 insertions(+), 8 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 3189a6b..5ee8067 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
@@ -30,14 +30,6 @@
         if (!BaseApplication.deviceAvailable) {
             return;
         }
-        List attendanceList = new ArrayList();
-        for (int i = 0; i < 10; i++) {
-            SurveillanceQueryItem item = new SurveillanceQueryItem();
-            item.setInOrOutCamera(CommonVariables.Camera.IN);
-            item.setUsername("zhangsan");
-            attendanceList.add(item);
-        }
-        SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_attendance_list_view().show(attendanceList);
     }
 
     public void addBitmap(final List<SurveillanceQueryItem> bitmapList, byte[] byteArray, int len, String cameraInOrOut) {
@@ -70,12 +62,21 @@
                             SurveillanceQueryItem surveillanceQueryItem = bitmapList.get(i);
                             item.setBitmap(surveillanceQueryItem.getBitmap());
                             item.setBase64Image(surveillanceQueryItem.getBase64Image());
+                            item.setNativeImg(surveillanceQueryItem.getNativeImg());
                             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());
+                            item.setBase64Image(surveillanceQueryItem.getBase64Image());
+                            item.setNativeImg(surveillanceQueryItem.getNativeImg());
+                            item.setWidth(surveillanceQueryItem.getWidth());
+                            item.setHeight(surveillanceQueryItem.getHeight());
+                        }
                     }
                 }
 
@@ -97,6 +98,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