From a70e10e49e43eaf82fc467b7a81bac7c3dfd5912 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 28 三月 2017 15:35:58 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/CountrySelectionPopup.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/CountrySelectionPopup.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/CountrySelectionPopup.java
index 03c36ee..2509ded 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/CountrySelectionPopup.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/CountrySelectionPopup.java
@@ -1,31 +1,25 @@
package com.bsk.zhangbo.demoforbsk.widget;
import android.content.Context;
-import android.content.res.AssetManager;
-import android.graphics.Bitmap;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
-import android.os.Handler;
-import android.os.Message;
import android.support.v7.widget.AppCompatTextView;
-import android.util.Log;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.widget.PopupWindow;
import android.widget.RelativeLayout;
import android.widget.TextView;
-import android.widget.Toast;
import com.bsk.zhangbo.demoforbsk.R;
import com.bsk.zhangbo.demoforbsk.adapter.MyWheelAdapter;
+import com.bsk.zhangbo.demoforbsk.service.DictionaryMng;
import com.bsk.zhangbo.demoforbsk.listeners.OkButtonClickedListener;
import com.bsk.zhangbo.demoforbsk.util.CountryPresenter;
import com.wx.wheelview.widget.WheelView;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@@ -43,7 +37,8 @@
private List<String> countryList;
private CountryPresenter countryPresenter;
- public CountrySelectionPopup(Context context) {
+ public CountrySelectionPopup(Context context, String[] countryWordData, List<String> countryWordList, HashMap<String, List<String>> countryData) {
+
this.mContext = context;
countryPresenter = new CountryPresenter(context);
view = LayoutInflater.from(context).inflate(R.layout.pop_country, null);
@@ -56,9 +51,10 @@
mTvCancel.setOnClickListener(this);
mTvConfirm.setOnClickListener(this);
- String[] countryWordData = countryPresenter.getCountryWordData();
- countryWordList = Arrays.asList(countryWordData);
- countryData = countryPresenter.getCountryData();
+ //String[] countryWordData = DictionaryMng.countryWordData;
+ this.countryWordList = countryWordList;//DictionaryMng.countryWordList;
+ this.countryData = countryData;//DictionaryMng.countryData;
+
countryList = countryData.get(countryWordList.get(mWheelViewTitle.getSelection()));
mWheelViewTitle.setWheelAdapter(new MyWheelAdapter(context));
@@ -125,9 +121,14 @@
if (view instanceof AppCompatTextView) {
if (((AppCompatTextView) view).getText().equals("纭")) {
for (OkButtonClickedListener okButtonClickedListener : okButtonClickedListeners) {
- countryList = countryData.get(countryWordList.get(mWheelViewTitle.getCurrentPosition()));
- okButtonClickedListener.onItemSelected(0, null, countryList.get(mWheelViewName.getCurrentPosition()));
+ if (mWheelViewTitle.getCurrentPosition() >= 0) {
+ countryList = countryData.get(countryWordList.get(mWheelViewTitle.getCurrentPosition()));
+ okButtonClickedListener.onItemSelected(0, null, countryList.get(mWheelViewName.getCurrentPosition()));
+ }
}
+ dismiss();
+ }
+ if (((AppCompatTextView) view).getText().equals("鍙栨秷")) {
dismiss();
}
}
@@ -144,7 +145,6 @@
mWheelViewTitle.joinDatas(countryData);
mWheelViewName.setWheelData(countryList);
}
-
private List<OkButtonClickedListener> okButtonClickedListeners = new ArrayList<OkButtonClickedListener>();
--
Gitblit v1.8.0