From 13837feb8b9fde43ed481200fca0db2a8b8cb698 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期六, 01 四月 2017 10:05:20 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java | 13 ++-----------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java | 3 ++-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/CountrySelectionDialog.java | 17 +++++++++++------
3 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/CountrySelectionDialog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/CountrySelectionDialog.java
index 25835dc..50ce1e8 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/CountrySelectionDialog.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/CountrySelectionDialog.java
@@ -36,9 +36,14 @@
private WheelView dialog_country_name;
private View view;
- private HashMap<String, List<String>> countriesGroupByFirstLetter;
- private List<String> uniqueFirstLetterList;
- private List<String> countriesWithSameFirstLetter;
+ private static HashMap<String, List<String>> countriesGroupByFirstLetter = new HashMap<>();
+ private static List<String> uniqueFirstLetterList = new ArrayList<>();
+ private List<String> countriesWithSameFirstLetter = new ArrayList<>();
+
+ public static void setCountries(List<String> _uniqueFirstLetterList, HashMap<String, List<String>> _countriesGroupByFirstLetter) {
+ uniqueFirstLetterList = _uniqueFirstLetterList;
+ countriesGroupByFirstLetter = _countriesGroupByFirstLetter;
+ }
@OnClick(R.id.dialog_country_ok)
public void dialog_country_ok_click(View view) {
@@ -56,12 +61,10 @@
dismiss();
}
- public CountrySelectionDialog(Context context, List<String> uniqueFirstLetterList, HashMap<String, List<String>> countriesGroupByFirstLetter) {
+ public CountrySelectionDialog(Context context, OkButtonClickedListener okButtonClickedListener) {
view = LayoutInflater.from(context).inflate(R.layout.dialog_country, null);
ViewUtils.inject(this, view);
- this.uniqueFirstLetterList = uniqueFirstLetterList;
- this.countriesGroupByFirstLetter = countriesGroupByFirstLetter;
this.countriesWithSameFirstLetter = countriesGroupByFirstLetter.get(uniqueFirstLetterList.get(dialog_country_name_first_letter.getSelection()));
WheelView.WheelViewStyle wheelViewStyle = new WheelView.WheelViewStyle();
@@ -115,6 +118,8 @@
this.setWidth(RelativeLayout.LayoutParams.MATCH_PARENT);
this.setBackgroundDrawable(new ColorDrawable(0x7f000000));
this.setAnimationStyle(R.style.PopupAnimation);
+
+ okButtonClickedListeners.add(okButtonClickedListener);
}
@Override
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 2734174..dfe962b 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
@@ -76,9 +76,6 @@
private List mCredentialsList;
private LinearLayout mBaseLayout;
- private List<String> uniqueFirstLetterList;
- private HashMap<String, List<String>> countriesGroupByFirstLetter;
-
private static RegisterFragment instance = new RegisterFragment();
public static RegisterFragment getInstance() {
@@ -132,14 +129,13 @@
@OnClick(R.id.register_country)
public void register_country_click(View view) {
- CountrySelectionDialog countrySelectionPopup = new CountrySelectionDialog(getActivity(),uniqueFirstLetterList,countriesGroupByFirstLetter);
- countrySelectionPopup.showAtLocation(mBaseLayout, Gravity.CENTER,0,0);
- countrySelectionPopup.addOkButtonClickedListener(new OkButtonClickedListener() {
+ CountrySelectionDialog countrySelectionPopup = new CountrySelectionDialog(getActivity(), new OkButtonClickedListener() {
@Override
public void onItemSelected(int position, Object o, String item) {
register_country.setValue(item);
}
});
+ countrySelectionPopup.showAtLocation(mBaseLayout, Gravity.CENTER,0,0);
}
@OnClick(R.id.register_birthday)
@@ -214,11 +210,6 @@
public void setCredentialsList(List credentialsList) {
this.mCredentialsList = credentialsList;
- }
-
- public void setCountryData(List<String> uniqueFirstLetterList, HashMap<String, List<String>> countriesGroupByFirstLetter) {
- this.uniqueFirstLetterList = uniqueFirstLetterList;
- this.countriesGroupByFirstLetter = countriesGroupByFirstLetter;
}
@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 1f4c180..28ebab4 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,5 +1,6 @@
package cn.com.basic.face.service;
+import cn.com.basic.face.dialog.CountrySelectionDialog;
import cn.com.basic.face.fragment.RegisterFragment;
import cn.com.basic.face.fragment.CheckInFragment;
import cn.com.basic.face.util.AppApi;
@@ -60,7 +61,7 @@
countryWordData[i] = item.getName();
i++;
}
- RegisterFragment.getInstance().setCountryData(uniqueFirstLetterList, countriesGroupByFirstLetter);
+ CountrySelectionDialog.setCountries(uniqueFirstLetterList, countriesGroupByFirstLetter);
}
});
--
Gitblit v1.8.0