优化SmoothScroll速度；修复bug。

donkingliang · Jun 30, 2021 · 310a0bd · 310a0bd
1 parent 4ac4671
commit 310a0bd
Showing 1 changed file with 22 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
@@ -450,6 +450,11 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
         sortViews();
     }
 
+    @Override
+    public void requestLayout() {
+        super.requestLayout();
+    }
+
     private void sortViews() {
         List<View> list = new ArrayList<>();
         int count = getChildCount();
@@ -844,7 +849,10 @@ private boolean canScrollVertically() {
     @Override
     protected int getChildDrawingOrder(int childCount, int drawingPosition) {
         if (mViews.size() > drawingPosition) {
-            return indexOfChild(mViews.get(drawingPosition));
+            int index = indexOfChild(mViews.get(drawingPosition));
+            if (index != -1) {
+                return index;
+            }
         }
         return super.getChildDrawingOrder(childCount, drawingPosition);
     }
@@ -942,6 +950,17 @@ private void fling(int velocityY) {
     @Override
     public void computeScroll() {
         if (mScrollToIndex != -1 && mSmoothScrollOffset != 0) {
+
+            if (mSmoothScrollOffset > 0 && mSmoothScrollOffset < 200){
+                // 逐渐加速
+                mSmoothScrollOffset += 5;
+            }
+
+            if (mSmoothScrollOffset < 0 && mSmoothScrollOffset > -200){
+                // 逐渐加速
+                mSmoothScrollOffset -= 5;
+            }
+
             // 正在平滑滑动到某个子view
             dispatchScroll(mSmoothScrollOffset);
             invalidate();
@@ -2171,9 +2190,9 @@ public void smoothScrollToChildWithOffset(View view, int offset) {
                 mScrollToIndexWithOffset = offset;
                 setScrollState(SCROLL_STATE_SETTLING);
                 if (scrollOrientation < 0) {
-                    mSmoothScrollOffset = -200;
+                    mSmoothScrollOffset = -50;
                 } else {
-                    mSmoothScrollOffset = 200;
+                    mSmoothScrollOffset = 50;
                 }
                 invalidate();
             }