From 2ae0446917184b36996823e9dbf452dba82e8994 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 21 四月 2017 12:31:44 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 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 8c3a5aa..07583d7 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
@@ -28,6 +28,9 @@
}
public void findSurveillanceBottomList(final boolean isVisit) {
+ 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");
@@ -57,25 +60,39 @@
}
public void addBitmap(final List<Bitmap> bitmapList, byte[] byteArray, int len) {
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
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().getCompanyId());
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getDevice().getDeviceCompanyId());
params.addBodyParameter("deviceId", BaseApplication.getInstance().getDevice().getDeviceId());
- params.addBodyParameter("enterOrExit", CommonVariables.EnterOrExit.ENTER+"");
+ params.addBodyParameter("InOrOutCamera", CommonVariables.Camera.IN+"");
x.http().post(params, new BaseCommonCallBack() {
public void success() {
- SurveillanceQueryItem item = getBean(SurveillanceQueryItem.class);
- if (item.getType() == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE
- || item.getType() == CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE
- ) {
- if (bitmapList != null && bitmapList.size() > 0) {
- item.setBitmap(bitmapList.get(0));
+ List<SurveillanceQueryItem> items = getList(SurveillanceQueryItem.class);
+ List list = SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().getPrevList();
+
+ List newList = new ArrayList();
+
+ for (int i = 0; items != null && i < items.size(); i++) {
+ SurveillanceQueryItem item = items.get(i);
+ int type = item.getType();
+ if (type == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE
+ || type == CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE
+ ) {
+ newList.add(0, item);
+ if (i < bitmapList.size()) {
+ item.setBitmap(bitmapList.get(i));
+ }
}
+ }
+
+ if (newList.size() > 0) {
List<SurveillanceQueryItem> doubleList = new ArrayList<SurveillanceQueryItem>();
- List list = SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().getPrevList();
- list.add(0, item);
+ list.addAll(0, newList);
fillBlank(list, doubleList);
--
Gitblit v1.8.0