同步主分支的一些修改。

donkingliang · Nov 9, 2020 · 6e5cd9a · 6e5cd9a
1 parent d8d070d
commit 6e5cd9a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/...croller/src/main/java/com/donkingliang/consecutivescroller/ConsecutiveScrollerLayout.java b/...croller/src/main/java/com/donkingliang/consecutivescroller/ConsecutiveScrollerLayout.java
@@ -44,7 +44,7 @@ public class ConsecutiveScrollerLayout extends ViewGroup implements ScrollingVie
     /**
      * 联动容器可滚动的范围
      */
-    private int mScrollRange;
+    int mScrollRange;
 
     /**
      * 联动容器滚动定位子view
@@ -1272,7 +1272,7 @@ private void checkTargetsScroll(boolean isLayoutChange, boolean isForce) {
      *
      * @param target
      */
-    private void scrollChildContentToTop(View target) {
+    void scrollChildContentToTop(View target) {
         int scrollY = 0;
         do {
             scrollY = 0;
@@ -1290,7 +1290,7 @@ private void scrollChildContentToTop(View target) {
      *
      * @param target
      */
-    private void scrollChildContentToBottom(View target) {
+    void scrollChildContentToBottom(View target) {
         int scrollY = 0;
         do {
             scrollY = 0;
@@ -1375,7 +1375,7 @@ private void recycleAdjustVelocityTracker() {
     /**
      * 停止滑动
      */
-    private void stopScroll() {
+    public void stopScroll() {
         mScroller.abortAnimation();
         stopNestedScroll(ViewCompat.TYPE_NON_TOUCH);
         if (mScrollToIndex == -1) {

diff --git a/...tivescroller/src/main/java/com/donkingliang/consecutivescroller/ConsecutiveViewPager.java b/...tivescroller/src/main/java/com/donkingliang/consecutivescroller/ConsecutiveViewPager.java
@@ -32,7 +32,7 @@ public ConsecutiveViewPager(@NonNull Context context, @Nullable AttributeSet att
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        if (isConsecutiveParent() && mAdjustHeight > 0) {
+        if (isConsecutiveParentAndBottom() && mAdjustHeight > 0) {
             int height = getDefaultSize(0, heightMeasureSpec) - mAdjustHeight;
             super.onMeasure(widthMeasureSpec,
                     View.MeasureSpec.makeMeasureSpec(height, View.MeasureSpec.getMode(heightMeasureSpec)));
@@ -68,7 +68,12 @@ private void disableChildScroll(View child) {
         ViewCompat.setNestedScrollingEnabled(child, false);
     }
 
-    private boolean isConsecutiveParent() {
+    /**
+     * 是否在ConsecutiveScrollerLayout的底部
+     *
+     * @return
+     */
+    private boolean isConsecutiveParentAndBottom() {
         ViewParent parent = getParent();
         if (parent instanceof ConsecutiveScrollerLayout) {
             ConsecutiveScrollerLayout layout = (ConsecutiveScrollerLayout) parent;