From 1fe0c079105d74f70455bbe925be2376e61de27f Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期二, 18 七月 2017 12:01:59 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SurveillancePhotoDialog.java | 32 +++++--------------------------- 1 files changed, 5 insertions(+), 27 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 f3a92ae..7849684 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 @@ -2,13 +2,11 @@ import android.content.Context; import android.graphics.Color; -import android.graphics.drawable.ColorDrawable; import android.view.Gravity; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; -import android.widget.EditText; import android.widget.PopupWindow; import android.widget.RelativeLayout; import android.widget.TextView; @@ -25,10 +23,6 @@ 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.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.util.SurveillanceQueryItemUtil; @@ -40,32 +34,16 @@ @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().getAllUnregisterTwoRowsForSelect(selectedId)); - + 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)); + } setTitleAndList(type); WheelView.WheelViewStyle style = new WheelView.WheelViewStyle(); style.selectedTextColor = Color.parseColor("#11c3e3"); -- Gitblit v1.8.0