From 04f0f13b23281e38578b92d29809511a04b770ba Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 18 四月 2017 16:47:29 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 31 +++++++++++++++----------------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java | 8 ++++++++
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml | 9 +++++----
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 2 +-
4 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
index 028e838..db23b14 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
@@ -19,6 +19,7 @@
import cn.com.basic.face.discern.query.item.CheckInQueryItem;
import cn.com.basic.face.service.DictionaryMng;
import cn.com.basic.face.service.RegisterMng;
+import cn.com.basic.face.service.SurveillanceMng;
import cn.com.basic.face.util.Constant;
import cn.com.basic.face.util.OkClickedListener;
@@ -38,7 +39,9 @@
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
import cn.com.basic.face.base.MainActivity;
@@ -235,6 +238,11 @@
fragment_register_update_photo_placeholder_image.setVisibility(View.INVISIBLE);
fragment_register_update_photo_placeholder_text_view.setVisibility(View.INVISIBLE);
+ List<Bitmap> bitmapList = new ArrayList<>();
+ bitmapList.add(0, bitmap);
+
+ SurveillanceMng.getInstance().addBitmap(bitmapList, null, 0);
+
} catch (Exception e) {
e.printStackTrace();
}
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 a903abb..b635a36 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
@@ -118,7 +118,7 @@
public void setMenuVisibility(boolean menuVisible) {
super.setMenuVisibility(menuVisible);
if (menuVisible && fragment_supervisory_bottom_visit_list_view != null) {
- reloadBottomList();
+ //reloadBottomList();
}
}
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 96c2fad..841368a 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
@@ -116,30 +116,29 @@
}
}
- List<SurveillanceQueryItem> blenderList = new ArrayList<SurveillanceQueryItem>();
+ int max = registerList.size() > checkInList.size() ? registerList.size() : checkInList.size();
- int i = 0, m = 0, n = 0;
- for (i = 0; i < registerList.size() + checkInList.size(); i++) {
+ int m = 0, n = 0;
+ for (int i = 0; i < max * 2; i++) {
SurveillanceQueryItem item;
- if (i % 2 == 0 && m < registerList.size()) {
- item = registerList.get(m);
+ if (i % 2 == 0) {
+ if (m < registerList.size()) {
+ item = registerList.get(m);
+ } else {
+ item = getBlankItem();
+ }
m++;
} else {
- item = checkInList.get(n);
+ if (m < checkInList.size()) {
+ item = checkInList.get(m);
+ } else {
+ item = getBlankItem();
+ }
n++;
- }
- blenderList.add(item);
- }
-
- for (SurveillanceQueryItem item : blenderList) {
- if (doubleList.size() % 2 == 0 && item.getType() != Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
- doubleList.add(getBlankItem());
- }
- if (doubleList.size() % 2 != 0 && item.getType() != Constant.Surveillance.VISIT_CHECK_IN_ITEM_TYPE) {
- doubleList.add(getBlankItem());
}
doubleList.add(item);
}
+
}
private SurveillanceQueryItem getBlankItem() {
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 fa6a16f..c9f6b7c 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml
@@ -38,8 +38,8 @@
android:layout_weight="1"
>
<SurfaceView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="640px"
+ android:layout_height="480px"
android:id="@+id/fragment_supervisory_enter_camera" />
<RelativeLayout
android:layout_width="match_parent"
@@ -75,8 +75,9 @@
>
<SurfaceView
android:id="@+id/fragment_supervisory_exit_camera"
- android:layout_width="match_parent"
- android:layout_height="match_parent"/>
+ android:layout_width="640px"
+ android:layout_height="480px"
+ />
<RelativeLayout
android:layout_width="match_parent"
--
Gitblit v1.8.0