增加自动滑动的边界判断

donkingliang · Apr 26, 2020 · c2bc05d · c2bc05d
1 parent d0489be
commit c2bc05d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...croller/src/main/java/com/donkingliang/consecutivescroller/ConsecutiveScrollerLayout.java b/...croller/src/main/java/com/donkingliang/consecutivescroller/ConsecutiveScrollerLayout.java
@@ -618,7 +618,7 @@ private void scrollUp(int offset) {
             // 如果是要滑动到指定的View，判断滑动到目标位置，就停止滑动
             if (mScrollToIndex != -1) {
                 View view = getChildAt(mScrollToIndex);
-                if (getScrollY() + getPaddingTop() >= view.getTop()) {
+                if (getScrollY() + getPaddingTop() >= view.getTop() || isScrollBottom()) {
                     mScrollToIndex = -1;
                     mSmoothScrollOffset = 0;
                     break;
@@ -669,8 +669,8 @@ private void scrollDown(int offset) {
             // 如果是要滑动到指定的View，判断滑动到目标位置，就停止滑动
             if (mScrollToIndex != -1) {
                 View view = getChildAt(mScrollToIndex);
-                if (getScrollY() + getPaddingTop() <= view.getTop()
-                        && ScrollUtils.getScrollTopOffset(view) >= 0) {
+                if ((getScrollY() + getPaddingTop() <= view.getTop()
+                        && ScrollUtils.getScrollTopOffset(view) >= 0) || isScrollTop()) {
                     mScrollToIndex = -1;
                     mSmoothScrollOffset = 0;
                     break;