From f2434ad3287353fa0a939c25b6b9b495697b2a3e Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期六, 01 四月 2017 11:37:04 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java | 60 +++------- /dev/null | 11 - VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SelectDialog.java | 87 ++++++++++---- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java | 7 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/CountryDialog.java | 13 +- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java | 67 +++++------ VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java | 2 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitReasonDialog.java | 16 +- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java | 11 - VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/OkClickedListener.java | 7 + VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitorTypeMng.java | 41 ------ 11 files changed, 144 insertions(+), 178 deletions(-) diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/CountryDialog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/CountryDialog.java index bc930b7..716f9fc 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/CountryDialog.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/CountryDialog.java @@ -1,6 +1,5 @@ package cn.com.basic.face.dialog; -import android.content.Context; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.view.Gravity; @@ -15,7 +14,7 @@ import cn.com.basic.face.adapter.MyWheelAdapter; import cn.com.basic.face.base.MainActivity; -import cn.com.basic.face.util.OkButtonClickedListener; +import cn.com.basic.face.util.OkClickedListener; import com.lidroid.xutils.ViewUtils; import com.lidroid.xutils.view.annotation.ViewInject; @@ -49,10 +48,10 @@ @OnClick(R.id.dialog_country_ok) public void dialog_country_ok_click(View view) { - for (OkButtonClickedListener okButtonClickedListener : okButtonClickedListeners) { + for (OkClickedListener okButtonClickedListener : okButtonClickedListeners) { if (dialog_country_name_first_letter.getCurrentPosition() >= 0) { countriesWithSameFirstLetter = countriesGroupByFirstLetter.get(uniqueFirstLetterList.get(dialog_country_name_first_letter.getCurrentPosition())); - okButtonClickedListener.onItemSelected(0, null, countriesWithSameFirstLetter.get(dialog_country_name.getCurrentPosition())); + okButtonClickedListener.onSelected(countriesWithSameFirstLetter.get(dialog_country_name.getCurrentPosition())); } } dismiss(); @@ -63,7 +62,7 @@ dismiss(); } - public CountryDialog(View parentView, OkButtonClickedListener okButtonClickedListener) { + public CountryDialog(View parentView, OkClickedListener okButtonClickedListener) { view = LayoutInflater.from(MainActivity.getInstance()).inflate(R.layout.dialog_country, null); ViewUtils.inject(this, view); @@ -137,9 +136,9 @@ dialog_country_name.setWheelData(countriesWithSameFirstLetter); } - private List<OkButtonClickedListener> okButtonClickedListeners = new ArrayList<OkButtonClickedListener>(); + private List<OkClickedListener> okButtonClickedListeners = new ArrayList<OkClickedListener>(); - public void addOkButtonClickedListener(OkButtonClickedListener okButtonClickedListener) { + public void addOkButtonClickedListener(OkClickedListener okButtonClickedListener) { this.okButtonClickedListeners.add(okButtonClickedListener); } 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 0fb07f1..712a315 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 @@ -1,8 +1,8 @@ package cn.com.basic.face.dialog; -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; @@ -12,7 +12,9 @@ import com.bsk.zhangbo.demoforbsk.R; import cn.com.basic.face.adapter.MyWheelAdapter; -import cn.com.basic.face.util.OkButtonClickedListener; +import cn.com.basic.face.base.MainActivity; +import cn.com.basic.face.util.Constant; +import cn.com.basic.face.util.OkClickedListener; import com.lidroid.xutils.ViewUtils; import com.lidroid.xutils.view.annotation.ViewInject; @@ -25,22 +27,33 @@ import cn.com.basic.face.discern.entity.Dictionary; public class SelectDialog extends PopupWindow { - private View view; @ViewInject(R.id.dialog_select_title) private TextView dialog_select_title; - private List mList; @ViewInject(R.id.dialog_select_list_view) private WheelView dialog_select_list_view; - public SelectDialog(Context context, List mList, String mTitle) { - view = LayoutInflater.from(context).inflate(R.layout.dialog_select,null); + + 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 void setVisitorTypeList(List visitorTypeList) { + SelectDialog.visitorTypeList = visitorTypeList; + } + + public static void setGenderList(List genderList) { + SelectDialog.genderList = genderList; + } + + public static void setIdTypeList(List idTypeList) { + SelectDialog.idTypeList = idTypeList; + } + + public SelectDialog(View parentView, int type, OkClickedListener okButtonClickedListener) { + View view = LayoutInflater.from(MainActivity.getInstance()).inflate(R.layout.dialog_select,null); ViewUtils.inject(this, view); - this.mList = mList; - dialog_select_title = (TextView) view.findViewById(R.id.dialog_select_title); - if (mTitle !=null && mTitle.length() > 0){ - dialog_select_title.setText(mTitle); - }else { - dialog_select_title.setText("鏍囬"); - } + setTitleAndList(type); WheelView.WheelViewStyle style = new WheelView.WheelViewStyle(); style.selectedTextColor = Color.parseColor("#11c3e3"); style.textColor = Color.parseColor("#bcc6cf"); @@ -48,10 +61,10 @@ style.textSize = 16; style.holoBorderColor = Color.parseColor("#11c3e3"); - dialog_select_list_view.setWheelAdapter(new MyWheelAdapter(context)); + dialog_select_list_view.setWheelAdapter(new MyWheelAdapter(MainActivity.getInstance())); dialog_select_list_view.setSkin(WheelView.Skin.Holo); - if (mList != null && mList.size() > 0) { - dialog_select_list_view.setWheelData(mList); + if (list != null && list.size() > 0) { + dialog_select_list_view.setWheelData(list); } dialog_select_list_view.setWheelSize(5); dialog_select_list_view.setBackgroundResource(R.color.colorBackground); @@ -81,26 +94,28 @@ }); setOutsideTouchable(true); - this.setContentView(this.view); + this.setContentView(view); 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); + okButtonClickedListeners.add(okButtonClickedListener); + this.showAtLocation(parentView, Gravity.CENTER,0,0); } @OnClick(R.id.dialog_select_ok) public void dialog_select_ok_click(View view) { - for (OkButtonClickedListener okButtonClickedListener : okButtonClickedListeners) { + for (OkClickedListener okButtonClickedListener : okButtonClickedListeners) { if (dialog_select_list_view.getCurrentPosition() >= 0) { - Object o = mList.get(dialog_select_list_view.getCurrentPosition()); - String item = ""; + Object o = list.get(dialog_select_list_view.getCurrentPosition()); + String value = ""; if (o instanceof Dictionary) { - item = ((Dictionary) o).getName(); + value = ((Dictionary) o).getName(); } else { - item = o+""; + value = o+""; } - okButtonClickedListener.onItemSelected(dialog_select_list_view.getCurrentPosition(), o, item); + okButtonClickedListener.onSelected(value); } } dismiss(); @@ -111,10 +126,32 @@ dismiss(); } - private List<OkButtonClickedListener> okButtonClickedListeners = new ArrayList<OkButtonClickedListener>(); + private List<OkClickedListener> okButtonClickedListeners = new ArrayList<OkClickedListener>(); - public void addOkButtonClickedListener(OkButtonClickedListener okButtonClickedListener) { + public void addOkButtonClickedListener(OkClickedListener okButtonClickedListener) { this.okButtonClickedListeners.add(okButtonClickedListener); } + private void setTitleAndList(int type) { + String tile = ""; + switch (type) { + case Constant.DialogSelectType.GENDER: + tile = "鎬у埆"; + list = genderList; + break; + case Constant.DialogSelectType.ID_TYPE: + tile = "璇佷欢绫诲瀷"; + list = idTypeList; + break; + case Constant.DialogSelectType.VISITOR_TYPE: + tile = "璁垮绫诲瀷"; + list = visitorTypeList; + break; + } + dialog_select_title.setText(tile); + } + + public static void setVisitReason(List<String> dictionaryNameList) { + + } } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitReasonDialog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitReasonDialog.java index 68c885c..1f22bf7 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitReasonDialog.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitReasonDialog.java @@ -12,7 +12,7 @@ import com.bsk.zhangbo.demoforbsk.R; import cn.com.basic.face.adapter.MyWheelAdapter; -import cn.com.basic.face.util.OkButtonClickedListener; +import cn.com.basic.face.util.OkClickedListener; import com.wx.wheelview.widget.WheelView; import java.util.ArrayList; @@ -113,16 +113,16 @@ dismiss(); break; case R.id.dialog_select_ok: - for (OkButtonClickedListener okButtonClickedListener : okButtonClickedListeners) { + for (OkClickedListener okButtonClickedListener : okButtonClickedListeners) { if (mWheelView.getCurrentPosition() >= 0) { Object o = mList.get(mWheelView.getCurrentPosition()); - String item = ""; + String value = ""; if (o instanceof Dictionary) { - item = ((Dictionary) o).getName(); + value = ((Dictionary) o).getName(); } else { - item = o+""; + value = o+""; } - okButtonClickedListener.onItemSelected(mWheelView.getCurrentPosition(), o, item); + okButtonClickedListener.onSelected(value); } } dismiss(); @@ -135,9 +135,9 @@ //Toast.makeText(mContext,mList.get(position),Toast.LENGTH_SHORT).show(); } - private List<OkButtonClickedListener> okButtonClickedListeners = new ArrayList<OkButtonClickedListener>(); + private List<OkClickedListener> okButtonClickedListeners = new ArrayList<OkClickedListener>(); - public void addOkButtonClickedListener(OkButtonClickedListener okButtonClickedListener) { + public void addOkButtonClickedListener(OkClickedListener okButtonClickedListener) { this.okButtonClickedListeners.add(okButtonClickedListener); } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java index 4f937ca..ed3600c 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java @@ -40,11 +40,10 @@ } public class DictionaryType { - public static final String SEX = "sex"; - public static final String CREDENTIALS = "credentials"; + public static final String GENDER = "gender"; + public static final String ID_TYPE = "id_type"; public static final String COUNTRY = "country"; - public static final String VISIT_PURPOSE = "visit_purpose"; + public static final String VISIT_REASON = "visit_reason"; } - } 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 b798445..eef8158 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,7 +13,7 @@ import com.bsk.zhangbo.demoforbsk.R; import cn.com.basic.face.base.LeftRightBaseFragment; -import cn.com.basic.face.util.OkButtonClickedListener; +import cn.com.basic.face.util.OkClickedListener; import cn.com.basic.face.service.DictionaryMng; import cn.com.basic.face.service.CheckInMng; import cn.com.basic.face.base.MainActivity; @@ -136,7 +136,7 @@ return; } RequestParams params = new RequestParams(); - params.addBodyParameter(Visit.FieldNames.matterId, DictionaryMng.getInstance().getId(CommonVariables.DictionaryType.VISIT_PURPOSE+ fragment_check_in_right_visitor_reason.getText().toString())); + params.addBodyParameter(Visit.FieldNames.matterId, DictionaryMng.getInstance().getId(CommonVariables.DictionaryType.VISIT_REASON + fragment_check_in_right_visitor_reason.getText().toString())); params.addBodyParameter(Visit.FieldNames.remark, fragment_check_in_right_remark.getText().toString()); params.addBodyParameter(Visit.FieldNames.visitorPersonId, visitor.getId()); params.addBodyParameter(Visit.FieldNames.visiteePersonId, interviewee.getId()); @@ -150,10 +150,9 @@ 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 OkButtonClickedListener() { - @Override - public void onItemSelected(int position, Object o, String item) { - fragment_check_in_right_visitor_reason.setText(item); + visitReasonDialog.addOkButtonClickedListener(new OkClickedListener() { + public void onSelected(String value) { + fragment_check_in_right_visitor_reason.setText(value); } }); } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java index 0c695dd..4f5161c 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java @@ -6,7 +6,6 @@ import android.net.Uri; import android.os.Bundle; import android.provider.MediaStore; -import android.view.Gravity; import android.view.View; import android.widget.DatePicker; import android.widget.ImageView; @@ -18,7 +17,8 @@ import cn.com.basic.face.discern.query.item.CheckInQueryItem; import cn.com.basic.face.service.DictionaryMng; import cn.com.basic.face.service.RegisterMng; -import cn.com.basic.face.util.OkButtonClickedListener; +import cn.com.basic.face.util.Constant; +import cn.com.basic.face.util.OkClickedListener; import cn.com.basic.face.util.AppApi; import cn.com.basic.face.dialog.BirthdayPickerDialog; @@ -70,9 +70,6 @@ private ImageView fragment_register_update__photo; private static final int PICK_IMAGE_REQUEST = 1; - private List mSexList; - private List mVisitorTypeList; - private List mCredentialsList; private LinearLayout fragment_register_linear_layout; private static RegisterFragment instance = new RegisterFragment(); @@ -114,23 +111,20 @@ RegisterMng.getInstance().add(params); } - @OnClick(R.id.register_gender) - public void register_gender_click(View view) { - SelectDialog popup = new SelectDialog(getActivity(),mSexList,"鎬у埆"); - popup.showAtLocation(fragment_register_linear_layout, Gravity.CENTER,0,0); - popup.addOkButtonClickedListener(new OkButtonClickedListener() { - @Override - public void onItemSelected(int position, Object o, String item) { - register_gender.setValue(item); + @OnClick(R.id.register_country) + public void register_country_click(View view) { + new CountryDialog(fragment_register_linear_layout, new OkClickedListener() { + public void onSelected(String value) { + register_country.setValue(value); } }); } - @OnClick(R.id.register_country) - public void register_country_click(View view) { - new CountryDialog(fragment_register_linear_layout, new OkButtonClickedListener() { - public void onItemSelected(int position, Object o, String item) { - register_country.setValue(item); + @OnClick(R.id.register_gender) + public void register_gender_click(View view) { + new SelectDialog(fragment_register_linear_layout, Constant.DialogSelectType.GENDER, new OkClickedListener() { + public void onSelected(String value) { + register_gender.setValue(value); } }); } @@ -152,24 +146,18 @@ @OnClick(R.id.register_visitor_class) public void register_visitor_class_click(View view) { - SelectDialog popup1 = new SelectDialog(getActivity(),mVisitorTypeList,"璁垮绫诲瀷"); - popup1.showAtLocation(fragment_register_linear_layout, Gravity.CENTER,0,0); - popup1.addOkButtonClickedListener(new OkButtonClickedListener() { - @Override - public void onItemSelected(int position, Object o, String item) { - register_visitor_class.setValue(item); + new SelectDialog(fragment_register_linear_layout, Constant.DialogSelectType.VISITOR_TYPE, new OkClickedListener() { + public void onSelected(String value) { + register_visitor_class.setValue(value); } }); } @OnClick(R.id.register_id_class) public void register_id_class_click(View view) { - SelectDialog popup2 = new SelectDialog(getActivity(),mCredentialsList,"璇佷欢绫诲瀷"); - popup2.showAtLocation(fragment_register_linear_layout, Gravity.CENTER,0,0); - popup2.addOkButtonClickedListener(new OkButtonClickedListener() { - @Override - public void onItemSelected(int position, Object o, String item) { - register_id_class.setValue(item); + new SelectDialog(fragment_register_linear_layout, Constant.DialogSelectType.ID_TYPE, new OkClickedListener() { + public void onSelected(String value) { + register_id_class.setValue(value); } }); } @@ -195,18 +183,6 @@ @OnClick(R.id.fragment_register_idcard_photo) public void identityPhoto(View view) { Toast.makeText(getActivity(), "璇佷欢蹇収", Toast.LENGTH_SHORT).show(); - } - - public void setVisitorTypeList(List visitorTypeList) { - this.mVisitorTypeList = visitorTypeList; - } - - public void setSexList(List sexList) { - this.mSexList = sexList; - } - - public void setCredentialsList(List credentialsList) { - this.mCredentialsList = credentialsList; } @Override 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 9b363f1..7b2e127 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 @@ -1,6 +1,7 @@ package cn.com.basic.face.service; import cn.com.basic.face.dialog.CountryDialog; +import cn.com.basic.face.dialog.SelectDialog; import cn.com.basic.face.fragment.RegisterFragment; import cn.com.basic.face.fragment.CheckInFragment; import cn.com.basic.face.util.AppApi; @@ -26,17 +27,17 @@ public static List<String> nationList = new ArrayList<String>(); public static List<String> mCredentialsList = new ArrayList<String>(); - public static List<String> mSexList = new ArrayList<String>(); + public static List<String> genderList = new ArrayList<String>(); public static List<String> uniqueFirstLetterList = new ArrayList<String>(); public static HashMap<String,List<String>> countriesGroupByFirstLetter = new HashMap<String,List<String>>(); public static String[] countryWordData = new String[]{}; - public static List<String> visitPurposeList = new ArrayList<String>(); + public static List<String> visitReasonList = new ArrayList<String>(); public void loadAllDictionaryData() { loadCountries(); - loadCredentialsList(); - loadSexList(); - loadVisitPurposeList(); + loadIdTypeList(); + loadGenderList(); + loadVisitReasonList(); } public void loadCountries() { @@ -67,51 +68,43 @@ } - public void loadCredentialsList() { + public void loadIdTypeList() { RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.DICTIONARY_TYPE_LIST); - params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.CREDENTIALS); + params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.ID_TYPE); x.http().get(params, new BaseCommonCallBack() { public void success() { - List<Dictionary> items = getList(Dictionary.class); - for (Dictionary item : items) { - idMap.put(item.getName(), item.getId()+""); - mCredentialsList.add(item.getName()); - } - RegisterFragment.getInstance().setCredentialsList(mCredentialsList); + SelectDialog.setIdTypeList(getDictionaryNameList(getList(Dictionary.class))); } }); } - private void loadSexList() { + private void loadGenderList() { RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.DICTIONARY_TYPE_LIST); - params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.SEX); + params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.GENDER); x.http().get(params, new BaseCommonCallBack() { public void success() { - List<Dictionary> items = getList(Dictionary.class); - for (Dictionary item : items) { - idMap.put(item.getName(), item.getId()+""); - mSexList.add(item.getName()); - } - RegisterFragment.getInstance().setSexList(mSexList); - } - }); - - } - - private void loadVisitPurposeList() { - RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.DICTIONARY_TYPE_LIST); - params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.VISIT_PURPOSE); - x.http().get(params, new BaseCommonCallBack() { - public void success() { - List<Dictionary> items = getList(Dictionary.class); - for (Dictionary item : items) { - idMap.put(CommonVariables.DictionaryType.VISIT_PURPOSE+item.getName(), item.getId()+""); - visitPurposeList.add(item.getName()); - } - CheckInFragment.getInstance().setVisitPurposeList(visitPurposeList); + SelectDialog.setGenderList(getDictionaryNameList(getList(Dictionary.class))); } }); } + private void loadVisitReasonList() { + RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.DICTIONARY_TYPE_LIST); + params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.VISIT_REASON); + x.http().get(params, new BaseCommonCallBack() { + public void success() { + SelectDialog.setVisitReason(getDictionaryNameList(getList(Dictionary.class))); + } + }); + } + + public List<String> getDictionaryNameList(List<Dictionary> dictionaryList) { + List nameList = new ArrayList(); + for (Dictionary dictionary : dictionaryList) { + idMap.put(dictionary.getName(), dictionary.getId()+""); + nameList.add(dictionary.getName()); + } + return nameList; + } } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitorTypeMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitorTypeMng.java index 937e837..f65f3f8 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitorTypeMng.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitorTypeMng.java @@ -1,5 +1,6 @@ package cn.com.basic.face.service; +import cn.com.basic.face.dialog.SelectDialog; import cn.com.basic.face.fragment.RegisterFragment; import cn.com.basic.face.util.AppApi; import cn.com.basic.face.util.MultipartUtility; @@ -26,8 +27,6 @@ return instance; } - public static List<String> mVisitorTypeList = new ArrayList<String>(); - public void loadAll() { loadVisitorTypeList(); } @@ -36,46 +35,14 @@ RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.VISITOR_TYPE_LIST); x.http().get(params, new BaseCommonCallBack() { public void success() { - List<VistorTypeQueryItem> items = getList(VistorTypeQueryItem.class); - mVisitorTypeList = new ArrayList<String>(); - for (VistorTypeQueryItem item : items) { + List<String> mVisitorTypeList = new ArrayList<String>(); + for (VistorTypeQueryItem item : getList(VistorTypeQueryItem.class)) { mVisitorTypeList.add(item.getLabel()); idMap.put(item.getLabel(), item.getId()+""); } - RegisterFragment.getInstance().setVisitorTypeList(mVisitorTypeList); + SelectDialog.setVisitorTypeList(mVisitorTypeList); } - }); } - private void uploadMedia() { - try { - - String charset = "UTF-8"; - File uploadFile1 = new File("/sdcard/myvideo.mp4"); - String requestURL = AppApi.BASEURL+AppApi.REGISTER_ADD; - - MultipartUtility multipart = new MultipartUtility(requestURL, charset); - -// multipart.addHeaderField("User-Agent", "CodeJava"); -// multipart.addHeaderField("Test-Header", "Header-Value"); - - multipart.addFormField("friend_id", "Cool Pictures"); - multipart.addFormField("userid", "Java,upload,Spring"); - - multipart.addFilePart("uploadedfile", uploadFile1); - - List<String> response = multipart.finish(); - - //Log.v("rht", "SERVER REPLIED:"); - - for (String line : response) { - //Log.v("rht", "Line : "+line); - - } - } catch (Exception e) { - e.printStackTrace(); - } - - } } 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 8c6ec4c..62f8315 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 @@ -26,7 +26,7 @@ public static class DialogSelectType { public static final int GENDER = 1; public static final int ID_TYPE = 2; - public static final int VISITOR_TYPE = 2; + public static final int VISITOR_TYPE = 3; } } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/OkButtonClickedListener.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/OkButtonClickedListener.java deleted file mode 100644 index 5aadb74..0000000 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/OkButtonClickedListener.java +++ /dev/null @@ -1,11 +0,0 @@ -package cn.com.basic.face.util; - -/** - * Created by xiuxi on 2017/3/20. -*/ - -public interface OkButtonClickedListener { - - public void onItemSelected(int position, Object o, String item); - -} diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/OkClickedListener.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/OkClickedListener.java new file mode 100644 index 0000000..7565b6e --- /dev/null +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/OkClickedListener.java @@ -0,0 +1,7 @@ +package cn.com.basic.face.util; + +public interface OkClickedListener { + + public void onSelected(String value); + +} -- Gitblit v1.8.0