bugfix: scroll

cgspine · cgspine · commit 627d7dfb7401 · 2020-01-05T16:24:24.000+08:00
diff --git a/qmui/src/main/java/com/qmuiteam/qmui/nestedScroll/QMUIContinuousNestedScrollLayout.java b/qmui/src/main/java/com/qmuiteam/qmui/nestedScroll/QMUIContinuousNestedScrollLayout.java
@@ -350,7 +350,7 @@ private void dispatchScroll(int topCurrent, int topRange,
 
         }
         for (OnScrollListener onScrollListener : mOnScrollListeners) {
-            onScrollListener.onScroll(topCurrent, topRange, offsetCurrent, offsetRange,
+            onScrollListener.onScroll(this, topCurrent, topRange, offsetCurrent, offsetRange,
                     bottomCurrent, bottomRange);
         }
     }
@@ -366,13 +366,13 @@ public void onNestedScroll(View target, int dxConsumed, int dyConsumed, int dxUn
 
     private void dispatchScrollStateChange(int newScrollState, boolean fromTopBehavior) {
         for (OnScrollListener onScrollListener : mOnScrollListeners) {
-            onScrollListener.onScrollStateChange(newScrollState, fromTopBehavior);
+            onScrollListener.onScrollStateChange(this, newScrollState, fromTopBehavior);
         }
         mCurrentScrollState = newScrollState;
     }
 
     public void scrollBy(int dy) {
-        if (dy > 0 && mTopAreaBehavior != null) {
+        if ((dy > 0 || mBottomView == null) && mTopAreaBehavior != null) {
             mTopAreaBehavior.scroll(this, ((View) mTopView), dy);
         } else if (dy != 0 && mBottomView != null) {
             mBottomView.consumeScroll(dy);
@@ -383,7 +383,7 @@ public void smoothScrollBy(int dy, int duration) {
         if (dy == 0) {
             return;
         }
-        if (dy > 0 && mTopAreaBehavior != null) {
+        if ((dy > 0 || mBottomView == null) && mTopAreaBehavior != null) {
             mTopAreaBehavior.smoothScrollBy(this, ((View) mTopView), dy, duration);
         } else if (mBottomView != null) {
             mBottomView.smoothScrollYBy(dy, duration);
@@ -553,10 +553,10 @@ public void restoreScrollInfo(@Nullable Bundle bundle) {
 
     public interface OnScrollListener {
 
-        void onScroll(int topCurrent, int topRange,
+        void onScroll(QMUIContinuousNestedScrollLayout scrollLayout, int topCurrent, int topRange,
                       int offsetCurrent, int offsetRange,
                       int bottomCurrent, int bottomRange);
 
-        void onScrollStateChange(int newScrollState, boolean fromTopBehavior);
+        void onScrollStateChange(QMUIContinuousNestedScrollLayout scrollLayout, int newScrollState, boolean fromTopBehavior);
     }
 }
diff --git a/qmuidemo/src/main/java/com/qmuiteam/qmuidemo/fragment/lab/QDContinuousNestedScroll2Fragment.java b/qmuidemo/src/main/java/com/qmuiteam/qmuidemo/fragment/lab/QDContinuousNestedScroll2Fragment.java
@@ -56,7 +56,7 @@ protected void initCoordinatorLayout() {
         mCoordinatorLayout.addOnScrollListener(new QMUIContinuousNestedScrollLayout.OnScrollListener() {
 
             @Override
-            public void onScroll(int topCurrent, int topRange, int offsetCurrent,
+            public void onScroll(QMUIContinuousNestedScrollLayout scrollLayout, int topCurrent, int topRange, int offsetCurrent,
                                  int offsetRange, int bottomCurrent, int bottomRange) {
                 Log.i(TAG, String.format("topCurrent = %d; topRange = %d; " +
                                 "offsetCurrent = %d; offsetRange = %d; " +
@@ -65,7 +65,7 @@ public void onScroll(int topCurrent, int topRange, int offsetCurrent,
             }
 
             @Override
-            public void onScrollStateChange(int newScrollState, boolean fromTopBehavior) {
+            public void onScrollStateChange(QMUIContinuousNestedScrollLayout scrollLayout, int newScrollState, boolean fromTopBehavior) {
 
             }
         });
diff --git a/qmuidemo/src/main/java/com/qmuiteam/qmuidemo/fragment/lab/QDContinuousNestedScroll7Fragment.java b/qmuidemo/src/main/java/com/qmuiteam/qmuidemo/fragment/lab/QDContinuousNestedScroll7Fragment.java
@@ -95,7 +95,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 
         mCoordinatorLayout.addOnScrollListener(new QMUIContinuousNestedScrollLayout.OnScrollListener() {
             @Override
-            public void onScroll(int topCurrent, int topRange, int offsetCurrent,
+            public void onScroll(QMUIContinuousNestedScrollLayout scrollLayout, int topCurrent, int topRange, int offsetCurrent,
                                  int offsetRange, int bottomCurrent, int bottomRange) {
                 Log.i(TAG, String.format("topCurrent = %d; topRange = %d; " +
                                 "offsetCurrent = %d; offsetRange = %d; " +
@@ -104,7 +104,7 @@ public void onScroll(int topCurrent, int topRange, int offsetCurrent,
             }
 
             @Override
-            public void onScrollStateChange(int newScrollState, boolean fromTopBehavior) {
+            public void onScrollStateChange(QMUIContinuousNestedScrollLayout scrollLayout, int newScrollState, boolean fromTopBehavior) {
                 Log.i(TAG, String.format("newScrollState = %d; fromTopBehavior = %b",
                         newScrollState, fromTopBehavior));
             }
diff --git a/qmuidemo/src/main/java/com/qmuiteam/qmuidemo/fragment/lab/QDContinuousNestedScroll8Fragment.java b/qmuidemo/src/main/java/com/qmuiteam/qmuidemo/fragment/lab/QDContinuousNestedScroll8Fragment.java
@@ -113,7 +113,7 @@ public RecyclerView.LayoutParams generateDefaultLayoutParams() {
 
         mCoordinatorLayout.addOnScrollListener(new QMUIContinuousNestedScrollLayout.OnScrollListener() {
             @Override
-            public void onScroll(int topCurrent, int topRange, int offsetCurrent,
+            public void onScroll(QMUIContinuousNestedScrollLayout scrollLayout, int topCurrent, int topRange, int offsetCurrent,
                                  int offsetRange, int bottomCurrent, int bottomRange) {
                 Log.i(TAG, String.format("topCurrent = %d; topRange = %d; " +
                                 "offsetCurrent = %d; offsetRange = %d; " +
@@ -122,7 +122,7 @@ public void onScroll(int topCurrent, int topRange, int offsetCurrent,
             }
 
             @Override
-            public void onScrollStateChange(int newScrollState, boolean fromTopBehavior) {
+            public void onScrollStateChange(QMUIContinuousNestedScrollLayout scrollLayout, int newScrollState, boolean fromTopBehavior) {
 
             }
         });

Original file line number	Diff line number	Diff line change
`@@ -350,7 +350,7 @@ private void dispatchScroll(int topCurrent, int topRange,`
`350`	`350`
`351`	`351`	`}`
`352`	`352`	`for (OnScrollListener onScrollListener : mOnScrollListeners) {`
`353`		`- onScrollListener.onScroll(topCurrent, topRange, offsetCurrent, offsetRange,`
	`353`	`+ onScrollListener.onScroll(this, topCurrent, topRange, offsetCurrent, offsetRange,`
`354`	`354`	`bottomCurrent, bottomRange);`
`355`	`355`	`}`
`356`	`356`	`}`
`@@ -366,13 +366,13 @@ public void onNestedScroll(View target, int dxConsumed, int dyConsumed, int dxUn`
`366`	`366`
`367`	`367`	`private void dispatchScrollStateChange(int newScrollState, boolean fromTopBehavior) {`
`368`	`368`	`for (OnScrollListener onScrollListener : mOnScrollListeners) {`
`369`		`- onScrollListener.onScrollStateChange(newScrollState, fromTopBehavior);`
	`369`	`+ onScrollListener.onScrollStateChange(this, newScrollState, fromTopBehavior);`
`370`	`370`	`}`
`371`	`371`	`mCurrentScrollState = newScrollState;`
`372`	`372`	`}`
`373`	`373`
`374`	`374`	`public void scrollBy(int dy) {`
`375`		`- if (dy > 0 && mTopAreaBehavior != null) {`
	`375`	`+ if ((dy > 0 \|\| mBottomView == null) && mTopAreaBehavior != null) {`
`376`	`376`	`mTopAreaBehavior.scroll(this, ((View) mTopView), dy);`
`377`	`377`	`} else if (dy != 0 && mBottomView != null) {`
`378`	`378`	`mBottomView.consumeScroll(dy);`
`@@ -383,7 +383,7 @@ public void smoothScrollBy(int dy, int duration) {`
`383`	`383`	`if (dy == 0) {`
`384`	`384`	`return;`
`385`	`385`	`}`
`386`		`- if (dy > 0 && mTopAreaBehavior != null) {`
	`386`	`+ if ((dy > 0 \|\| mBottomView == null) && mTopAreaBehavior != null) {`
`387`	`387`	`mTopAreaBehavior.smoothScrollBy(this, ((View) mTopView), dy, duration);`
`388`	`388`	`} else if (mBottomView != null) {`
`389`	`389`	`mBottomView.smoothScrollYBy(dy, duration);`
`@@ -553,10 +553,10 @@ public void restoreScrollInfo(@Nullable Bundle bundle) {`
`553`	`553`
`554`	`554`	`public interface OnScrollListener {`
`555`	`555`
`556`		`- void onScroll(int topCurrent, int topRange,`
	`556`	`+ void onScroll(QMUIContinuousNestedScrollLayout scrollLayout, int topCurrent, int topRange,`
`557`	`557`	`int offsetCurrent, int offsetRange,`
`558`	`558`	`int bottomCurrent, int bottomRange);`
`559`	`559`
`560`		`- void onScrollStateChange(int newScrollState, boolean fromTopBehavior);`
	`560`	`+ void onScrollStateChange(QMUIContinuousNestedScrollLayout scrollLayout, int newScrollState, boolean fromTopBehavior);`
`561`	`561`	`}`
`562`	`562`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ protected void initCoordinatorLayout() {`
`56`	`56`	`mCoordinatorLayout.addOnScrollListener(new QMUIContinuousNestedScrollLayout.OnScrollListener() {`
`57`	`57`
`58`	`58`	`@Override`
`59`		`- public void onScroll(int topCurrent, int topRange, int offsetCurrent,`
	`59`	`+ public void onScroll(QMUIContinuousNestedScrollLayout scrollLayout, int topCurrent, int topRange, int offsetCurrent,`
`60`	`60`	`int offsetRange, int bottomCurrent, int bottomRange) {`
`61`	`61`	`Log.i(TAG, String.format("topCurrent = %d; topRange = %d; " +`
`62`	`62`	`"offsetCurrent = %d; offsetRange = %d; " +`
`@@ -65,7 +65,7 @@ public void onScroll(int topCurrent, int topRange, int offsetCurrent,`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`@Override`
`68`		`- public void onScrollStateChange(int newScrollState, boolean fromTopBehavior) {`
	`68`	`+ public void onScrollStateChange(QMUIContinuousNestedScrollLayout scrollLayout, int newScrollState, boolean fromTopBehavior) {`
`69`	`69`
`70`	`70`	`}`
`71`	`71`	`});`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public RecyclerView.LayoutParams generateDefaultLayoutParams() {`
`113`	`113`
`114`	`114`	`mCoordinatorLayout.addOnScrollListener(new QMUIContinuousNestedScrollLayout.OnScrollListener() {`
`115`	`115`	`@Override`
`116`		`- public void onScroll(int topCurrent, int topRange, int offsetCurrent,`
	`116`	`+ public void onScroll(QMUIContinuousNestedScrollLayout scrollLayout, int topCurrent, int topRange, int offsetCurrent,`
`117`	`117`	`int offsetRange, int bottomCurrent, int bottomRange) {`
`118`	`118`	`Log.i(TAG, String.format("topCurrent = %d; topRange = %d; " +`
`119`	`119`	`"offsetCurrent = %d; offsetRange = %d; " +`
`@@ -122,7 +122,7 @@ public void onScroll(int topCurrent, int topRange, int offsetCurrent,`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`@Override`
`125`		`- public void onScrollStateChange(int newScrollState, boolean fromTopBehavior) {`
	`125`	`+ public void onScrollStateChange(QMUIContinuousNestedScrollLayout scrollLayout, int newScrollState, boolean fromTopBehavior) {`
`126`	`126`
`127`	`127`	`}`
`128`	`128`	`});`