From 109ffe9a777658936a38d0c146579a67c60a0d17 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 11 五月 2017 17:48:48 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SurveillancePhotoDialog.java | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SurveillancePhotoDialog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SurveillancePhotoDialog.java
index aa3eb52..291637d 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SurveillancePhotoDialog.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SurveillancePhotoDialog.java
@@ -28,6 +28,7 @@
import cn.com.basic.face.discern.query.item.SurveillancePhotoQueryItem;
import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
import cn.com.basic.face.fragment.SurveillanceFragment;
+import cn.com.basic.face.service.SurveillanceMng;
import cn.com.basic.face.util.Constant;
import cn.com.basic.face.util.OkClickedListener;
import cn.com.basic.face.widget.surveilance.SurveillancePhotoSelectListView;
@@ -62,21 +63,7 @@
View view = LayoutInflater.from(MainActivity.getInstance()).inflate(R.layout.dialog_surveillance_photo_select,null);
ViewUtils.inject(this, view);
-
- List<SurveillanceQueryItem> prevVisitorList = SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visitor_list_view().getPrevList();
- List<SurveillanceQueryItem> registerList = new ArrayList();
- for (SurveillanceQueryItem surveillanceQueryItem : prevVisitorList) {
- if (surveillanceQueryItem.getRegisterOrCheckIn() == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
- registerList.add(surveillanceQueryItem);
- }
- }
-
- for (int i = 0; i < 2; i++) {
- SurveillanceQueryItem item = new SurveillanceQueryItem();
- registerList.add(item);
- }
- dialog_surveillance_photo_select_list_view.show(registerList);
-
+ dialog_surveillance_photo_select_list_view.show(SurveillanceMng.getInstance().getSurveillancePhotoList());
setTitleAndList(type);
WheelView.WheelViewStyle style = new WheelView.WheelViewStyle();
@@ -114,8 +101,8 @@
this.setHeight(RelativeLayout.LayoutParams.MATCH_PARENT);
this.setWidth(RelativeLayout.LayoutParams.MATCH_PARENT);
this.setFocusable(true);
- this.setBackgroundDrawable(new ColorDrawable(0x7f000000));
- this.setAnimationStyle(R.style.PopupAnimation);
+ //this.setBackgroundDrawable(new ColorDrawable(0x7f000000));
+ this.setAnimationStyle(R.style.PopupSlideAnimation);
okButtonClickedListeners.add(okButtonClickedListener);
this.showAtLocation(parentView, Gravity.BOTTOM,0,330);
}
--
Gitblit v1.8.0