From 252c803d51fa07a55adc46efa9467741801e66c4 Mon Sep 17 00:00:00 2001
From: chenke <chenke@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 04 八月 2017 15:16:55 +0800
Subject: [PATCH] bug fix
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SurveillancePhotoDialog.java | 37 ++++++++++++++++---------------------
1 files changed, 16 insertions(+), 21 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 57fc305..90ad6ea 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
@@ -19,12 +19,15 @@
import java.util.ArrayList;
import java.util.List;
+import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.dialog.wheelview.adapter.BaseWheelAdapter;
import cn.com.basic.face.dialog.wheelview.widget.WheelView;
+import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.util.Constant;
import cn.com.basic.face.util.OkClickedListener;
import cn.com.basic.face.util.SurveillanceQueryItemUtil;
+import cn.com.basic.face.util.UnknownSurveillanceQueryItemUtil;
import cn.com.basic.face.widget.surveilance.SurveillancePhotoSelectListView;
public class SurveillancePhotoDialog extends PopupWindow {
@@ -33,32 +36,24 @@
@ViewInject(R.id.dialog_surveillance_photo_select_list_view)
private SurveillancePhotoSelectListView dialog_surveillance_photo_select_list_view;
- private List list = new ArrayList();
-
- public static List visitorTypeList = new ArrayList();
- public static List genderList = new ArrayList();
- public static List idTypeList = new ArrayList();
- public static List visitReasonList = new ArrayList();
-
- public static void setVisitorTypeList(List visitorTypeList) {
- AddDialog.visitorTypeList = visitorTypeList;
- }
-
- public static void setGenderList(List genderList) {
- AddDialog.genderList = genderList;
- }
-
- public static void setIdTypeList(List idTypeList) {
- AddDialog.idTypeList = idTypeList;
- }
-
public SurveillancePhotoDialog(View parentView, int type, OkClickedListener okButtonClickedListener, long selectedId) {
this.parentView = parentView;
View view = LayoutInflater.from(MainActivity.getInstance()).inflate(R.layout.dialog_surveillance_photo_select,null);
ViewUtils.inject(this, view);
- dialog_surveillance_photo_select_list_view.show(SurveillanceQueryItemUtil.getInstance().getAllUnregisterVisitorTwoRowsForSelect(selectedId));
-
+ if (BaseApplication.getInstance().networkAvailable()) {
+ if (CommonVariables.Register.VISITOR_REGISTER_SELECTED) {
+ dialog_surveillance_photo_select_list_view.show(SurveillanceQueryItemUtil.getInstance().getAllUnregisterVisitorTwoRowsForSelect(selectedId));
+ } else {
+ dialog_surveillance_photo_select_list_view.show(SurveillanceQueryItemUtil.getInstance().getAllUnregisterAttenderTwoRowsForSelect(selectedId));
+ }
+ } else {
+ if (CommonVariables.Register.VISITOR_REGISTER_SELECTED) {
+ dialog_surveillance_photo_select_list_view.show(UnknownSurveillanceQueryItemUtil.getInstance().getAllUnregisterVisitorTwoRowsForSelect(selectedId));
+ } else {
+ dialog_surveillance_photo_select_list_view.show(UnknownSurveillanceQueryItemUtil.getInstance().getAllUnregisterAttenderTwoRowsForSelect(selectedId));
+ }
+ }
setTitleAndList(type);
WheelView.WheelViewStyle style = new WheelView.WheelViewStyle();
style.selectedTextColor = Color.parseColor("#11c3e3");
--
Gitblit v1.8.0