v2.0.5

saiwu-bigkoo · saiwu-bigkoo · commit ba855ffebf81 · 2015-12-21T13:57:49.000+08:00
修复底部越界
diff --git a/app/build.gradle b/app/build.gradle
@@ -22,6 +22,6 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':pickerview')
-    //    compile 'com.bigkoo:pickerview:2.0.4'
+    //    compile 'com.bigkoo:pickerview:2.0.5'
     compile 'com.android.support:appcompat-v7:23.1.0'
 }
diff --git a/pickerview/build.gradle b/pickerview/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
-version = "2.0.4"
+version = "2.0.5"
 
 android {
     compileSdkVersion 21
diff --git a/pickerview/src/main/java/com/bigkoo/pickerview/lib/InertiaTimerTask.java b/pickerview/src/main/java/com/bigkoo/pickerview/lib/InertiaTimerTask.java
@@ -42,6 +42,10 @@ public final void run() {
             if(loopView.totalScrollY - itemHeight*0.3 < top){
                 top = loopView.totalScrollY + i;
             }
+            else if(loopView.totalScrollY + itemHeight*0.3 > bottom){
+                bottom = loopView.totalScrollY + i;
+            }
+
             if (loopView.totalScrollY <= top){
                 a = 40F;
                 loopView.totalScrollY = (int)top;
diff --git a/pickerview/src/main/java/com/bigkoo/pickerview/lib/WheelView.java b/pickerview/src/main/java/com/bigkoo/pickerview/lib/WheelView.java
@@ -504,13 +504,13 @@ public boolean onTouchEvent(MotionEvent event) {
                 // 边界处理。
                 if (!isLoop) {
                     float top = -initPosition * itemHeight;
-
+                    float bottom = (adapter.getItemsCount() - 1 - initPosition) * itemHeight;
                     if(totalScrollY - itemHeight*0.3 < top){
                         top = totalScrollY - dy;
                     }
-
-
-                    float bottom = (adapter.getItemsCount() - 1 - initPosition) * itemHeight;
+                    else if(totalScrollY + itemHeight*0.3 > bottom){
+                        bottom = totalScrollY - dy;
+                    }
 
                     if (totalScrollY < top) {
                         totalScrollY = (int) top;

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@ android {`
`22`	`22`	`dependencies {`
`23`	`23`	`compile fileTree(dir: 'libs', include: ['*.jar'])`
`24`	`24`	`compile project(':pickerview')`
`25`		`- // compile 'com.bigkoo:pickerview:2.0.4'`
	`25`	`+ // compile 'com.bigkoo:pickerview:2.0.5'`
`26`	`26`	`compile 'com.android.support:appcompat-v7:23.1.0'`
`27`	`27`	`}`