From 0abb3d251383bcdf22db67e2b26431b7a7b74148 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 11 八月 2017 14:30:34 +0800
Subject: [PATCH] bug fix
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/CountryDialog.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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 df2091c..b1ada94 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
@@ -18,11 +18,13 @@
import com.lidroid.xutils.ViewUtils;
import com.lidroid.xutils.view.annotation.ViewInject;
import com.lidroid.xutils.view.annotation.event.OnClick;
-import com.wx.wheelview.widget.WheelView;
+import cn.com.basic.face.dialog.wheelview.widget.WheelView;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
public class CountryDialog extends PopupWindow implements WheelView.OnWheelItemSelectedListener {
@@ -45,6 +47,10 @@
countriesGroupByFirstLetter = _countriesGroupByFirstLetter;
}
+ public static boolean hasCountries() {
+ return countriesGroupByFirstLetter.size() > 0 ? true : false;
+ }
+
@OnClick(R.id.dialog_country_ok)
public void dialog_country_ok_click(View view) {
for (OkClickedListener okButtonClickedListener : okButtonClickedListeners) {
@@ -61,9 +67,25 @@
dismiss();
}
- public CountryDialog(View parentView, OkClickedListener okButtonClickedListener) {
+ public CountryDialog(View parentView, OkClickedListener okButtonClickedListener, String defaultValue) {
view = LayoutInflater.from(MainActivity.getInstance()).inflate(R.layout.dialog_country, null);
ViewUtils.inject(this, view);
+
+ if (defaultValue != null && !"".equals(defaultValue)) {
+ for (int i = 0; i < uniqueFirstLetterList.size(); i++) {
+ String firstLetter = uniqueFirstLetterList.get(i);
+ int j = 0;
+ for(String countryName : countriesGroupByFirstLetter.get(firstLetter)) {
+ if (defaultValue.equals(countryName)) {
+ dialog_country_name_first_letter.setSelection(i);
+ dialog_country_name.setSelection(j);
+ break;
+ }
+ j++;
+ }
+ }
+
+ }
this.countriesWithSameFirstLetter = countriesGroupByFirstLetter.get(uniqueFirstLetterList.get(dialog_country_name_first_letter.getSelection()));
@@ -80,6 +102,9 @@
dialog_country_name_first_letter.setBackgroundResource(R.color.colorBackground);
dialog_country_name_first_letter.setStyle(wheelViewStyle);
+
+ //dialog_country_name_first_letter.setSelection(4);
+
dialog_country_name.setWheelAdapter(new SelectDialog.WheelAdapter(MainActivity.getInstance()));
dialog_country_name.setSkin(WheelView.Skin.Holo);
dialog_country_name.setWheelSize(5);
--
Gitblit v1.8.0