From 6d25cbae7fd9bd66ed79c6de7c77d78e309da6ed Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 15 五月 2017 11:24:16 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 51 +++++++++++++++++++++++++++++++--------------------
1 files changed, 31 insertions(+), 20 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 2f33c39..9706ef3 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
@@ -12,6 +12,7 @@
import java.util.Set;
import cn.com.basic.face.base.BaseApplication;
+import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
@@ -27,20 +28,21 @@
return instance;
}
- public void findSurveillanceBottomList(final boolean isVisit) {
- if (!BaseApplication.deviceAvailable) {
- return;
- }
- }
-
public static class SurveillanceListThread extends Thread {
@Override
public void run() {
try {
- List prevList = SurveillanceMng.getInstance().removeTimeoutItem(null);
- SurveillanceMng.getInstance().registerTopAndCheckInBottom(prevList);
- SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visitor_list_view().show(prevList);
- Thread.sleep(1000*60*10);
+ while (true) {
+ MainActivity.getInstance().runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ List prevList = SurveillanceMng.getInstance().removeTimeoutItem(null);
+ SurveillanceMng.getInstance().registerTopAndCheckInBottom(prevList);
+ SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visitor_list_view().show(prevList);
+ }
+ });
+ Thread.sleep(1000*60*5);
+ }
} catch (Exception e) {
e.printStackTrace();
}
@@ -56,8 +58,8 @@
if (item.getRegisterOrCheckIn() == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
Date now = new Date();
Date createTime = item.getCreateTime();
- long minutes = (now.getTime() - createTime.getTime()) / 1000 / 60;
- if (minutes*1.0 / 10 >= 1) {
+ long secs = (now.getTime() - createTime.getTime()) / 1000 ;
+ if (secs*1.0 / 60*5 >= 1) {
continue;
}
newPrevList.add(item);
@@ -91,6 +93,11 @@
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()) {
SurveillanceQueryItem surveillanceQueryItem = bitmapList.get(i);
@@ -132,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);
@@ -157,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