From 1bc4d8dad7a8df83822a8c0a8ac6aef18b1ecd75 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 08 五月 2017 11:20:55 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 7 ++++---
VisitFace/DemoForBsk/app/src/main/res/layout/dialog_surveillance_photo_select.xml | 4 +++-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillancePhotoSelectListView.java | 1 +
3 files changed, 8 insertions(+), 4 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 5ee8067..6acff39 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
@@ -11,6 +11,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;
@@ -101,9 +102,10 @@
public List getSurveillancePhotoList() {
List<SurveillanceQueryItem> prevVisitorList = SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visitor_list_view().getPrevList();
List<SurveillanceQueryItem> registerList = new ArrayList();
+ int n = 9;
for (SurveillanceQueryItem surveillanceQueryItem : prevVisitorList) {
if (surveillanceQueryItem.getRegisterOrCheckIn() == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
- if (registerList.size() > 16) {
+ if (registerList.size() > n*2) {
break;
}
surveillanceQueryItem.setSurveillancePhotoSelected(false);
@@ -113,8 +115,7 @@
SurveillanceQueryItem item;
List items = new ArrayList();
int m = 0;
- int n = 8;
- for (int i = 0; i < 16; i++) {
+ for (int i = 0; i < n*2; i++) {
if (i % 2 == 0) {
if (m < registerList.size()) {
item = registerList.get(m);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillancePhotoSelectListView.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillancePhotoSelectListView.java
index aaa7ffc..512b991 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillancePhotoSelectListView.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillancePhotoSelectListView.java
@@ -1,6 +1,7 @@
package cn.com.basic.face.widget.surveilance;
import android.content.Context;
+import android.graphics.Color;
import android.graphics.Rect;
import android.os.Parcelable;
import android.support.v7.widget.GridLayoutManager;
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_surveillance_photo_select.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_surveillance_photo_select.xml
index d40052c..3b46816 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_surveillance_photo_select.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_surveillance_photo_select.xml
@@ -36,7 +36,9 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/h300dp"
android:background="@android:color/white"
- android:orientation="vertical"/>
+ android:orientation="vertical"
+ android:layout_marginLeft="@dimen/w10dp"
+ />
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
--
Gitblit v1.8.0