From 3cceac30dc1c5a7cf5bd4f95e327e855cdcf304d Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 02 六月 2017 16:01:35 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 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 e1e3a76..4fedf2d 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,12 +28,6 @@
return instance;
}
- public void findSurveillanceBottomList(final boolean isVisit) {
- if (!BaseApplication.deviceAvailable) {
- return;
- }
- }
-
public static class SurveillanceListThread extends Thread {
@Override
public void run() {
@@ -80,7 +74,7 @@
}
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());
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getDevice().getCompanyId());
params.addBodyParameter("deviceId", BaseApplication.getInstance().getDevice().getDeviceId());
params.addBodyParameter("InOrOutCamera", cameraInOrOut+"");
x.http().post(params, new BaseCommonCallBack() {
@@ -99,6 +93,10 @@
if (type == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE
|| type == CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE
) {
+ //item.setRegisterOrCheckIn(CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE);
+ if (prevVisitorList.size() > 3 ) {
+
+ }
item.setCreateTime(new Date());
newVisitorList.add(0, item);
if (i < bitmapList.size()) {
@@ -141,23 +139,27 @@
});
}
- public List getSurveillancePhotoList() {
+ public List getSurveillancePhotoList(long selectedId) {
List<SurveillanceQueryItem> prevVisitorList = SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visitor_list_view().getPrevList();
List<SurveillanceQueryItem> registerList = new ArrayList();
- int n = 9;
+ int countPerRow = 9;
for (SurveillanceQueryItem surveillanceQueryItem : prevVisitorList) {
if (surveillanceQueryItem.getRegisterOrCheckIn() == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
- if (registerList.size() > n*2) {
+ if (registerList.size() > countPerRow*2) {
break;
}
- surveillanceQueryItem.setSurveillancePhotoSelected(false);
+ if (surveillanceQueryItem.getIdForSelect() == selectedId) {
+ surveillanceQueryItem.setSurveillancePhotoSelected(true);
+ } else {
+ surveillanceQueryItem.setSurveillancePhotoSelected(false);
+ }
registerList.add(surveillanceQueryItem);
}
}
SurveillanceQueryItem item;
List items = new ArrayList();
- int m = 0;
- for (int i = 0; i < n*2; i++) {
+ int m = 0, n = 0;
+ for (int i = 0; i < countPerRow*2; i++) {
if (i % 2 == 0) {
if (m < registerList.size()) {
item = registerList.get(m);
@@ -166,8 +168,8 @@
item = getBlankItem();
}
} else {
- if (n < registerList.size()) {
- item = registerList.get(n);
+ if (n < registerList.size() - countPerRow) {
+ item = registerList.get(countPerRow+n);
n++;
} else {
item = getBlankItem();
--
Gitblit v1.8.0