From b7fd23fb1b9d04eb8fa0d97a5d9747e145605612 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 03 五月 2017 14:33:42 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 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 449f9f8..c9efe5a 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,15 +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");
- item.setStatus("绛惧埌");
- 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,13 +61,20 @@
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());
}
}
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.setWidth(surveillanceQueryItem.getWidth());
+ item.setHeight(surveillanceQueryItem.getHeight());
+ }
}
}
--
Gitblit v1.8.0