From 21e08324c323d0c5d1e7cedc36323c554857a239 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 01 八月 2017 17:55:09 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SelectDialog.java | 62 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 3 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SelectDialog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SelectDialog.java
index a472ff4..ab753dc 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SelectDialog.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SelectDialog.java
@@ -15,7 +15,9 @@
import com.bsk.zhangbo.demoforbsk.R;
import cn.com.basic.face.base.MainActivity;
+import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.fragment.CheckInFragment;
+import cn.com.basic.face.service.DictionaryMng;
import cn.com.basic.face.util.Constant;
import cn.com.basic.face.util.OkClickedListener;
@@ -44,15 +46,23 @@
private List list = new ArrayList();
public static List visitorTypeList = new ArrayList();
+ public static List attenderTypeList = new ArrayList();
public static List genderList = new ArrayList();
public static List idTypeList = new ArrayList();
public static List visitReasonList = new ArrayList();
private static List<String> resolutionList = new ArrayList();
private static List<String> protocolList = new ArrayList();
private static List<String> cameraBrandList = new ArrayList();
+ private static List<String> departmentDictionaryList = new ArrayList();
+ private static List<String> postDictionaryList = new ArrayList();
+ private int type;
public static void setVisitorTypeList(List visitorTypeList) {
SelectDialog.visitorTypeList = visitorTypeList;
+ }
+
+ public static void setAttenderTypeList(List attenderTypeList) {
+ SelectDialog.attenderTypeList = attenderTypeList;
}
public static void setGenderList(List genderList) {
@@ -63,7 +73,8 @@
SelectDialog.idTypeList = idTypeList;
}
- public SelectDialog(View parentView, int type, OkClickedListener okButtonClickedListener) {
+ public SelectDialog(View parentView, int type, OkClickedListener okButtonClickedListener, String defaultValue) {
+ this.type = type;
this.parentView = parentView;
View view = LayoutInflater.from(MainActivity.getInstance()).inflate(R.layout.dialog_select,null);
ViewUtils.inject(this, view);
@@ -75,7 +86,11 @@
style.textSize = 16;
style.holoBorderColor = Color.parseColor("#11c3e3");
- if(type == Constant.DialogSelectType.VISIT_REASON) {
+ if(type == Constant.DialogSelectType.VISIT_REASON
+ || type == Constant.DialogSelectType.PROTOCOL
+ || type == Constant.DialogSelectType.RESOLUTION
+ || type == Constant.DialogSelectType.CAMERA_BRAND
+ ) {
dialog_select_add_separator.setVisibility(View.VISIBLE);
dialog_select_add.setVisibility(View.VISIBLE);
}
@@ -84,6 +99,17 @@
dialog_select_list_view.setSkin(WheelView.Skin.Holo);
if (list != null && list.size() > 0) {
dialog_select_list_view.setWheelData(list);
+ Object itemObj = list.get(0);
+ if (itemObj instanceof String && defaultValue != null && !"".equals(defaultValue)) {
+ int selected = 0;
+ for (int i = 0; i < list.size(); i++) {
+ if (defaultValue.equals(list.get(i))) {
+ selected = i;
+ break;
+ }
+ }
+ dialog_select_list_view.setSelection(selected);
+ }
}
dialog_select_list_view.setWheelSize(5);
dialog_select_list_view.setBackgroundResource(R.color.colorBackground);
@@ -182,6 +208,14 @@
tile = "璇烽�夋嫨鎽勫儚鏈哄搧鐗�";
list = cameraBrandList;
break;
+ case Constant.DialogSelectType.DEPARTMENT:
+ tile = "璇烽�夋嫨閮ㄩ棬/鐝骇";
+ list = departmentDictionaryList;
+ break;
+ case Constant.DialogSelectType.POST:
+ tile = "璇烽�夋嫨鑱屽姟";
+ list = postDictionaryList;
+ break;
}
dialog_select_title.setText(tile);
}
@@ -190,9 +224,23 @@
public void dialog_select_add_click(View view) {
dismiss();
Toast.makeText(MainActivity.getInstance(), "娣诲姞", Toast.LENGTH_SHORT);
- new AddDialog(parentView, Constant.DialogSelectType.VISIT_REASON_ADD, new OkClickedListener() {
+ new AddDialog(parentView, type, new OkClickedListener() {
public void onSelected(String value) {
CheckInFragment.getInstance().setVisitReasonText(value);
+ switch (type) {
+ case Constant.DialogSelectType.VISIT_REASON:
+ CheckInFragment.getInstance().setVisitReasonText(value);
+ break;
+ case Constant.DialogSelectType.RESOLUTION:
+ DictionaryMng.getInstance().addDictionary(Constant.DialogSelectType.RESOLUTION, CommonVariables.DictionaryType.RESOLUTION, value);
+ break;
+ case Constant.DialogSelectType.PROTOCOL:
+ DictionaryMng.getInstance().addDictionary(Constant.DialogSelectType.PROTOCOL, CommonVariables.DictionaryType.PROTOCOL, value);
+ break;
+ case Constant.DialogSelectType.CAMERA_BRAND:
+ DictionaryMng.getInstance().addDictionary(Constant.DialogSelectType.CAMERA_BRAND, CommonVariables.DictionaryType.CAMERA_BRAND, value);
+ break;
+ }
}
});
}
@@ -213,6 +261,14 @@
SelectDialog.cameraBrandList = cameraBrandList;
}
+ public static void setDepartmentDictionaryList(List<String> departmentDictionaryList) {
+ SelectDialog.departmentDictionaryList = departmentDictionaryList;
+ }
+
+ public static void setPostDictionaryList(List<String> postDictionaryList) {
+ SelectDialog.postDictionaryList = postDictionaryList;
+ }
+
public static class WheelAdapter extends BaseWheelAdapter<String> {
private Context mContext;
--
Gitblit v1.8.0