From 83dc9220bca38cc681b0a310c93ab6b3fc5babe2 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 四月 2017 10:50:15 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 35 ++++++-----------------------------
1 files changed, 6 insertions(+), 29 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 b15977c..b42df6c 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
@@ -31,39 +31,12 @@
if (!BaseApplication.deviceAvailable) {
return;
}
-// RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.SURVEILLANCE_QUERY);
-// params.addBodyParameter(CommonVariables.Page.PAGE_NUM, "1");
-// params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "10");
-// x.http().post(params, new BaseCommonCallBack() {
-// public void success() {
-// List<SurveillanceQueryItem> list = getList(SurveillanceQueryItem.class);
-// if (isVisit) {
-// int i = 0;
-// for (SurveillanceQueryItem item : list) {
-// if (i % 5 == 0) {
-// item.setRegisterOrCheckIn(CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE);
-// } else {
-// item.setRegisterOrCheckIn(CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE);
-// }
-// i++;
-// }
-//
-// List<SurveillanceQueryItem> doubleList = new ArrayList<SurveillanceQueryItem>();
-// fillBlank(list, doubleList);
-//
-// SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().show(doubleList, true);
-// } else {
-// SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_attendance_list_view().show(list, true);
-// }
-// }
-// });
}
- public void addBitmap(final List<Bitmap> bitmapList, byte[] byteArray, int len, String cameraInOrOut) {
+ public void addBitmap(final List<SurveillanceQueryItem> bitmapList, byte[] byteArray, int len, String cameraInOrOut) {
if (!BaseApplication.deviceAvailable) {
return;
}
- //final int cameraInOrOut = Integer.parseInt(CommonVariables.Camera.IN);
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.SURVEILLANCE_UPLOAD);
params.addBodyParameter("base64Photo", Base64.encodeToString(byteArray, 0, len, Base64.DEFAULT));
params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getDevice().getDeviceCompanyId());
@@ -84,7 +57,11 @@
) {
newList.add(0, item);
if (i < bitmapList.size()) {
- item.setBitmap(bitmapList.get(i));
+ 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