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 | 27 +++++----------------------
1 files changed, 5 insertions(+), 22 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 2eef314..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,44 +1,27 @@
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.com.bsk.zhangbo.demoforbsk.service.DictionaryService;
+import com.bsk.zhangbo.demoforbsk.service.DictionaryMng;
import com.bsk.zhangbo.demoforbsk.listeners.OkButtonClickedListener;
-import com.bsk.zhangbo.demoforbsk.util.AppApi;
import com.bsk.zhangbo.demoforbsk.util.CountryPresenter;
import com.wx.wheelview.widget.WheelView;
-import net.sourceforge.pinyin4j.PinyinHelper;
-
-import org.xutils.http.RequestParams;
-import org.xutils.x;
-
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
-
-import cn.com.basic.face.discern.common.BaseCommonCallBack;
-import cn.com.basic.face.discern.common.CommonVariables;
-import cn.com.basic.face.discern.entity.Dictionary;
/**
* Created by Sinoe on 2017/2/28.
@@ -54,7 +37,7 @@
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);
@@ -68,9 +51,9 @@
mTvCancel.setOnClickListener(this);
mTvConfirm.setOnClickListener(this);
- String[] countryWordData = DictionaryService.countryWordData;
- countryWordList = DictionaryService.countryWordList;
- countryData = DictionaryService.countryData;
+ //String[] countryWordData = DictionaryMng.countryWordData;
+ this.countryWordList = countryWordList;//DictionaryMng.countryWordList;
+ this.countryData = countryData;//DictionaryMng.countryData;
countryList = countryData.get(countryWordList.get(mWheelViewTitle.getSelection()));
--
Gitblit v1.8.0