From 6fc8cfbd4b92b66df7bde1966b5ab3d3b56705b2 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 27 三月 2017 12:58:00 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/SingleSelectionPopup.java |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/SingleSelectionPopup.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/SingleSelectionPopup.java
index 4832db7..13eb0ff 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/SingleSelectionPopup.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/SingleSelectionPopup.java
@@ -49,7 +49,9 @@
         mTvConfirm.setOnClickListener(this);
         mWheelView.setWheelAdapter(new MyWheelAdapter(context));
         mWheelView.setSkin(WheelView.Skin.Holo);
-        mWheelView.setWheelData(mList);
+        if (mList != null && mList.size() > 0) {
+            mWheelView.setWheelData(mList);
+        }
         mWheelView.setWheelSize(5);
         mWheelView.setBackgroundResource(R.color.colorBackground);
         WheelView.WheelViewStyle style = new WheelView.WheelViewStyle();
@@ -110,14 +112,16 @@
                 break;
             case R.id.pop_single_confirm:
                 for (OkButtonClickedListener okButtonClickedListener : okButtonClickedListeners) {
-                    Object o = mList.get(mWheelView.getCurrentPosition());
-                    String item = "";
-                    if (o instanceof Dictionary) {
-                        item = ((Dictionary) o).getName();
-                    } else {
-                        item = o+"";
+                    if (mWheelView.getCurrentPosition() >= 0) {
+                        Object o = mList.get(mWheelView.getCurrentPosition());
+                        String item = "";
+                        if (o instanceof Dictionary) {
+                            item = ((Dictionary) o).getName();
+                        } else {
+                            item = o+"";
+                        }
+                        okButtonClickedListener.onItemSelected(mWheelView.getCurrentPosition(), o, item);
                     }
-                    okButtonClickedListener.onItemSelected(mWheelView.getCurrentPosition(), o, item);
                 }
                 dismiss();
                 break;

--
Gitblit v1.8.0