From 48f6bbfd957f1aba067d6ccf8e4bb00f811d35c8 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 11 五月 2017 15:20:21 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 35 +++++++++++++++++
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml | 4 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java | 12 ++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 14 ++++--
VisitFace/DemoForBsk/app/src/main/res/drawable/bg_shadow.9.png | 0
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java | 1
6 files changed, 58 insertions(+), 8 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java
index cf8e370..46a9ffa 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java
@@ -3,6 +3,7 @@
import android.graphics.Bitmap;
import java.io.ByteArrayOutputStream;
+import java.util.Date;
import android.net.Uri;
import android.util.Base64;
@@ -45,6 +46,8 @@
private boolean surveillancePhotoSelected;
private NativeImg nativeImg;
+
+ private Date createTime;
/**
* Get 浜哄憳涓婚敭
@@ -228,4 +231,13 @@
public void setNativeImg(NativeImg nativeImg) {
this.nativeImg = nativeImg;
}
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
index 0c4cf9f..0bcf130 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
@@ -225,6 +225,7 @@
public void fragment_check_in_right_visitor_reason_click(View view) {
}
+
@OnClick(R.id.fragment_check_in_right_visitor_reason_more)
public void fragment_check_in_right_visitor_reason_more_click(View view) {
InputMethodManager imm = (InputMethodManager)MainActivity.getInstance().getSystemService(
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
index 7df78f8..ec63f02 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
@@ -1,5 +1,7 @@
package cn.com.basic.face.fragment;
+import android.graphics.ImageFormat;
+import android.media.ImageReader;
import android.os.Build;
import android.os.Bundle;
import android.view.SurfaceView;
@@ -63,11 +65,12 @@
}
static {
-// if (isEmulator()) {
-// useNative = false;
-// } else {
-// useNative = true;
-// }
+ ImageReader imageReader = ImageReader.newInstance(100, 100, ImageFormat.JPEG, 3);
+ if (isEmulator()) {
+ useNative = false;
+ } else {
+ useNative = true;
+ }
if (useNative) {
System.loadLibrary("cvface_api");
System.loadLibrary("opencv_java3");
@@ -141,6 +144,7 @@
}
}).start();
reloadBottomList();
+ new SurveillanceMng.SurveillanceListThread().start();
}
@OnClick(R.id.fragment_supervisory_bottom_visitor_radio_button)
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 6acff39..2f33c39 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
@@ -6,12 +6,12 @@
import org.xutils.x;
import java.util.ArrayList;
+import java.util.Date;
import java.util.HashSet;
import java.util.List;
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;
@@ -33,6 +33,39 @@
}
}
+ 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);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ private List<SurveillanceQueryItem> removeTimeoutItem(List<SurveillanceQueryItem> prevList) {
+ if (prevList == null) {
+ prevList = SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visitor_list_view().getPrevList();
+ }
+ List<SurveillanceQueryItem> newPrevList = new ArrayList();
+ for (SurveillanceQueryItem item : prevList) {
+ 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) {
+ continue;
+ }
+ newPrevList.add(item);
+ }
+ }
+ return newPrevList;
+ }
+
public void addBitmap(final List<SurveillanceQueryItem> bitmapList, byte[] byteArray, int len, String cameraInOrOut) {
if (!BaseApplication.deviceAvailable) {
return;
diff --git a/VisitFace/DemoForBsk/app/src/main/res/drawable/bg_shadow.9.png b/VisitFace/DemoForBsk/app/src/main/res/drawable/bg_shadow.9.png
new file mode 100644
index 0000000..8c07f8d
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/res/drawable/bg_shadow.9.png
Binary files differ
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml
index 7309820..1672d5a 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml
@@ -40,8 +40,8 @@
android:layout_weight="1"
>
<SurfaceView
- android:layout_width="640px"
- android:layout_height="480px"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:id="@+id/fragment_supervisory_enter_camera" />
<RelativeLayout
android:layout_width="match_parent"
--
Gitblit v1.8.0