From d5acf96e62637819d1cd55b516dd03e9232e3971 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 28 三月 2017 17:11:20 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/SingleSelectionPopup.java | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 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 552d4a3..8af7c3a 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
@@ -68,23 +68,23 @@
view.setOnTouchListener(new View.OnTouchListener() {
@Override
public boolean onTouch(View view, MotionEvent motionEvent) {
- View popLayout = view.findViewById(R.id.pop_single_ll);
- int top = popLayout.getTop();
- int bottom = popLayout.getBottom();
- int left = popLayout.getLeft();
- int right = popLayout.getRight();
- int y = (int) motionEvent.getY();
- int x = (int) motionEvent.getX();
- if (motionEvent.getAction() == MotionEvent.ACTION_UP){
- if (y<top || y> bottom){
- dismiss();
- }
- if (x < left || x > right){
- dismiss();
- }
-
+ View popLayout = view.findViewById(R.id.pop_single_ll);
+ int top = popLayout.getTop();
+ int bottom = popLayout.getBottom();
+ int left = popLayout.getLeft();
+ int right = popLayout.getRight();
+ int y = (int) motionEvent.getY();
+ int x = (int) motionEvent.getX();
+ if (motionEvent.getAction() == MotionEvent.ACTION_UP){
+ if (y<top || y> bottom){
+ dismiss();
}
- return true;
+ if (x < left || x > right){
+ dismiss();
+ }
+
+ }
+ return true;
}
});
@@ -112,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