Skip to content

Commit

Permalink
修复滑动监听回调的scrollY不准确的问题
Browse files Browse the repository at this point in the history
  • Loading branch information
teach committed Oct 20, 2020
1 parent d0405b6 commit 3aa625d
Showing 1 changed file with 30 additions and 26 deletions.
56 changes: 30 additions & 26 deletions ...croller/src/main/java/com/donkingliang/consecutivescroller/ConsecutiveScrollerLayout.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ public class ConsecutiveScrollerLayout extends ViewGroup implements ScrollingVie

/**
* 记录布局垂直的偏移量，它是包括了自己的偏移量(mScrollY)和所有子View的偏移量的总和，
* 取代View原有的mScrollY作为对外提供的偏移量值
* 这个值不是真实的布局滑动偏移量，只是用于在滑动是记录和计算每次的滑动距离。
*/
private int mOwnScrollY;
private int mSecondScrollY;

/**
* 联动容器可滚动的范围
Expand Down Expand Up @@ -671,7 +671,7 @@ public boolean onTouchEvent(MotionEvent ev) {
}

mTouchY = y - mScrollOffset[1];
int oldScrollY = mOwnScrollY;
int oldScrollY = mSecondScrollY;

if (mScrollState != SCROLL_STATE_DRAGGING) {
boolean startScroll = false;
Expand All @@ -687,7 +687,7 @@ public boolean onTouchEvent(MotionEvent ev) {
dispatchScroll(deltaY);
}

final int scrolledDeltaY = mOwnScrollY - oldScrollY;
final int scrolledDeltaY = mSecondScrollY - oldScrollY;
deltaY = deltaY - scrolledDeltaY;
if (dispatchNestedScroll(0, scrolledDeltaY, 0, deltaY, mScrollOffset,
ViewCompat.TYPE_TOUCH)) {
Expand Down Expand Up @@ -843,13 +843,13 @@ private void fling(int velocityY) {
boolean canScroll = (velocityY < 0 && !isScrollTop()) || (velocityY > 0 && !isScrollBottom());
this.dispatchNestedFling(0, (float) velocityY, canScroll);
// if (canScroll) {
mScroller.fling(0, mOwnScrollY,
mScroller.fling(0, mSecondScrollY,
1, velocityY,
Integer.MIN_VALUE, Integer.MIN_VALUE,
Integer.MIN_VALUE, Integer.MAX_VALUE);
startNestedScroll(ViewCompat.SCROLL_AXIS_VERTICAL, ViewCompat.TYPE_NON_TOUCH);
setScrollState(SCROLL_STATE_SETTLING);
mLastScrollerY = mOwnScrollY;
mLastScrollerY = mSecondScrollY;
invalidate();
// }
}
Expand All @@ -876,11 +876,11 @@ public void computeScroll() {
ViewCompat.TYPE_NON_TOUCH);
unconsumed -= mScrollConsumed[1];

final int oldScrollY = mOwnScrollY;
final int oldScrollY = mSecondScrollY;

dispatchScroll(unconsumed);

final int scrolledByMe = mOwnScrollY - oldScrollY;
final int scrolledByMe = mSecondScrollY - oldScrollY;
unconsumed -= scrolledByMe;

if ((unconsumed < 0 && isScrollTop()) || (unconsumed > 0 && isScrollBottom())) {
Expand Down Expand Up @@ -964,7 +964,7 @@ private void dispatchScroll(int offset) {
private void scrollUp(int offset) {
int scrollOffset = 0;
int remainder = offset;
int oldScrollY = mOwnScrollY;
int oldScrollY = computeVerticalScrollOffset();
do {

int scrollAnchor = 0;
Expand Down Expand Up @@ -1015,22 +1015,23 @@ private void scrollUp(int offset) {
}
scrollSelf(getScrollY() + scrollOffset);
}
mOwnScrollY += scrollOffset;
mSecondScrollY += scrollOffset;
remainder = remainder - scrollOffset;
}
}

} while (scrollOffset > 0 && remainder > 0);

if (oldScrollY != mOwnScrollY) {
scrollChange(mOwnScrollY, oldScrollY);
int newScrollY = computeVerticalScrollOffset();
if (oldScrollY != newScrollY) {
scrollChange(newScrollY, oldScrollY);
}
}

private void scrollDown(int offset) {
int scrollOffset = 0;
int remainder = offset;
int oldScrollY = mOwnScrollY;
int oldScrollY = computeVerticalScrollOffset();
do {
int scrollAnchor = 0;
int viewScrollOffset = 0;
Expand Down Expand Up @@ -1076,27 +1077,28 @@ private void scrollDown(int offset) {
}
scrollSelf(scrollY + scrollOffset);
}
mOwnScrollY += scrollOffset;
mSecondScrollY += scrollOffset;
remainder = remainder - scrollOffset;
}
}

} while (scrollOffset < 0 && remainder < 0);

if (oldScrollY != mOwnScrollY) {
scrollChange(mOwnScrollY, oldScrollY);
int newScrollY = computeVerticalScrollOffset();
if (oldScrollY != newScrollY) {
scrollChange(newScrollY, oldScrollY);
}
}

@Override
public void scrollBy(int x, int y) {
scrollTo(0, mOwnScrollY + y);
scrollTo(0, mSecondScrollY + y);
}

@Override
public void scrollTo(int x, int y) {
//所有的scroll操作都交由dispatchScroll()来分发处理
dispatchScroll(y - mOwnScrollY);
dispatchScroll(y - mSecondScrollY);
}

private void scrollChange(int scrollY, int oldScrollY) {
Expand Down Expand Up @@ -1193,7 +1195,7 @@ private void checkTargetsScroll(boolean isLayoutChange, boolean isForce) {
return;
}

int oldScrollY = mOwnScrollY;
int oldScrollY = computeVerticalScrollOffset();
View target = findFirstVisibleView();
if (target == null) {
return;
Expand Down Expand Up @@ -1250,8 +1252,9 @@ private void checkTargetsScroll(boolean isLayoutChange, boolean isForce) {

computeOwnScrollOffset();
if (isLayoutChange) {
if (oldScrollY != mOwnScrollY) {
scrollChange(mOwnScrollY, oldScrollY);
int newScrollY = computeVerticalScrollOffset();
if (oldScrollY != newScrollY) {
scrollChange(newScrollY, oldScrollY);
}
}

Expand Down Expand Up @@ -1300,7 +1303,7 @@ private void scrollChildContentToBottom(View target) {
* @return
*/
private void computeOwnScrollOffset() {
mOwnScrollY = computeVerticalScrollOffset();
mSecondScrollY = computeVerticalScrollOffset();
}

/**
Expand Down Expand Up @@ -1631,7 +1634,8 @@ void setScrollState(int state) {
return;
}
mScrollState = state;
scrollChange(mOwnScrollY, mOwnScrollY);
int newScrollY = computeVerticalScrollOffset();
scrollChange(newScrollY, newScrollY);
}

/**
Expand All @@ -1640,7 +1644,7 @@ void setScrollState(int state) {
* @return
*/
public int getOwnScrollY() {
return mOwnScrollY;
return computeVerticalScrollOffset();
}

private View findScrollToTopView() {
Expand Down Expand Up @@ -2300,9 +2304,9 @@ public void onNestedScroll(@NonNull View target, int dxConsumed, int dyConsumed,
}

private void onNestedScrollInternal(int dyUnconsumed, int type) {
final int oldScrollY = mOwnScrollY;
final int oldScrollY = mSecondScrollY;
dispatchScroll(dyUnconsumed);
final int myConsumed = mOwnScrollY - oldScrollY;
final int myConsumed = mSecondScrollY - oldScrollY;
final int myUnconsumed = dyUnconsumed - myConsumed;
mChildHelper.dispatchNestedScroll(0, myConsumed, 0, myUnconsumed, null, type);
}
Expand Down

0 comments on commit 3aa625d

Please sign in to comment.