From 82d4647279193ef184a2a3d6b97b89555d82bb64 Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期六, 01 四月 2017 15:10:09 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/res/layout/dialog_select.xml | 17 +++++++++++++++++ VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SelectDialog.java | 25 +++++++++++++++++++++++-- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java | 2 +- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java | 1 + VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java | 13 ++++++++++--- 5 files changed, 52 insertions(+), 6 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 712a315..c459fa4 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 @@ -9,6 +9,7 @@ import android.widget.PopupWindow; import android.widget.RelativeLayout; import android.widget.TextView; +import android.widget.Toast; import com.bsk.zhangbo.demoforbsk.R; import cn.com.basic.face.adapter.MyWheelAdapter; @@ -31,12 +32,17 @@ private TextView dialog_select_title; @ViewInject(R.id.dialog_select_list_view) private WheelView dialog_select_list_view; + @ViewInject(R.id.dialog_select_add_separator) + private View dialog_select_add_separator; + @ViewInject(R.id.dialog_select_add) + private TextView dialog_select_add; 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) { SelectDialog.visitorTypeList = visitorTypeList; @@ -60,6 +66,11 @@ style.selectedTextSize = 22; style.textSize = 16; style.holoBorderColor = Color.parseColor("#11c3e3"); + + if(type == Constant.DialogSelectType.VISIT_REASON) { + dialog_select_add_separator.setVisibility(View.VISIBLE); + dialog_select_add.setVisibility(View.VISIBLE); + } dialog_select_list_view.setWheelAdapter(new MyWheelAdapter(MainActivity.getInstance())); dialog_select_list_view.setSkin(WheelView.Skin.Holo); @@ -147,11 +158,21 @@ tile = "璁垮绫诲瀷"; list = visitorTypeList; break; + case Constant.DialogSelectType.VISIT_REASON: + tile = "璇烽�夋嫨璁块棶浜嬬敱"; + list = visitReasonList; + break; } dialog_select_title.setText(tile); } - public static void setVisitReason(List<String> dictionaryNameList) { - + @OnClick(R.id.dialog_select_add) + public void dialog_select_add_click(View view) { + Toast.makeText(MainActivity.getInstance(), "娣诲姞", Toast.LENGTH_SHORT); } + + public static void setVisitReasonList(List visitReasonList) { + SelectDialog.visitReasonList = visitReasonList; + } + } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java index eef8158..5a6101f 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java @@ -13,6 +13,8 @@ import com.bsk.zhangbo.demoforbsk.R; import cn.com.basic.face.base.LeftRightBaseFragment; +import cn.com.basic.face.dialog.SelectDialog; +import cn.com.basic.face.util.Constant; import cn.com.basic.face.util.OkClickedListener; import cn.com.basic.face.service.DictionaryMng; import cn.com.basic.face.service.CheckInMng; @@ -148,13 +150,18 @@ @OnClick(R.id.fragment_check_in_right_visitor_reason) public void fragment_check_in_right_visitor_reason_click(View view) { - VisitReasonDialog visitReasonDialog = new VisitReasonDialog(getActivity(),visitPurposeList,"璇烽�夋嫨鎷滆浜嬬敱"); - visitReasonDialog.showAtLocation(getView(), Gravity.CENTER,0,0); - visitReasonDialog.addOkButtonClickedListener(new OkClickedListener() { + new SelectDialog(getView(), Constant.DialogSelectType.VISIT_REASON, new OkClickedListener() { public void onSelected(String value) { fragment_check_in_right_visitor_reason.setText(value); } }); +// VisitReasonDialog visitReasonDialog = new VisitReasonDialog(getActivity(),visitPurposeList,"璇烽�夋嫨鎷滆浜嬬敱"); +// visitReasonDialog.showAtLocation(getView(), Gravity.CENTER,0,0); +// visitReasonDialog.addOkButtonClickedListener(new OkClickedListener() { +// public void onSelected(String value) { +// fragment_check_in_right_visitor_reason.setText(value); +// } +// }); } public void checkInFromHomePage(CheckInQueryItem item) { diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java index 7b2e127..dd6b4bc 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java @@ -93,7 +93,7 @@ params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.VISIT_REASON); x.http().get(params, new BaseCommonCallBack() { public void success() { - SelectDialog.setVisitReason(getDictionaryNameList(getList(Dictionary.class))); + SelectDialog.setVisitReasonList(getDictionaryNameList(getList(Dictionary.class))); } }); } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java index 62f8315..edc0a76 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java @@ -27,6 +27,7 @@ public static final int GENDER = 1; public static final int ID_TYPE = 2; public static final int VISITOR_TYPE = 3; + public static final int VISIT_REASON = 4; } } diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_select.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_select.xml index 16de9a1..42a1838 100644 --- a/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_select.xml +++ b/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_select.xml @@ -41,6 +41,23 @@ android:text="@string/confirm" android:textSize="@dimen/text_size_big"/> <View + android:id="@+id/dialog_select_add_separator" + android:layout_width="0.5dp" + android:layout_height="match_parent" + android:background="@color/colorText_5" + android:visibility="gone" + /> + <TextView + android:id="@+id/dialog_select_add" + android:layout_weight="1" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center" + android:text="@string/add" + android:textSize="@dimen/text_size_big" + android:visibility="gone" + /> + <View android:layout_width="0.5dp" android:layout_height="match_parent" android:background="@color/colorText_5"/> -- Gitblit v1.8.0