fix(android): send scroll event when pulling header/footer

Tencent · Mar 16, 2023 · 1c0d713 · 1c0d713
1 parent 628367e
commit 1c0d713
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 17 deletions.
diff --git a/android/sdk/src/main/java/com/tencent/mtt/hippy/views/hippylist/PullFooterRefreshHelper.java b/android/sdk/src/main/java/com/tencent/mtt/hippy/views/hippylist/PullFooterRefreshHelper.java
@@ -98,4 +98,18 @@ protected int getOffsetFromEnd() {
                 - v.computeHorizontalScrollOffset();
     }
 
+    @Override
+    public void enableRefresh() {
+        mRefreshStatus = PullRefreshStatus.PULL_STATUS_REFRESHING;
+        int nodeSize = isVertical() ? mRenderNode.getHeight() : mRenderNode.getWidth();
+        endAnimation();
+        int visibleSize = getVisibleSize();
+        if (visibleSize < nodeSize) {
+            setVisibleSize(nodeSize);
+        }
+        HippyRecyclerListAdapter<?> adapter = mRecyclerView.getAdapter();
+        if (adapter != null) {
+            mRecyclerView.smoothScrollToPosition(adapter.getItemCount());
+        }
+    }
 }
diff --git a/android/sdk/src/main/java/com/tencent/mtt/hippy/views/hippylist/PullHeaderRefreshHelper.java b/android/sdk/src/main/java/com/tencent/mtt/hippy/views/hippylist/PullHeaderRefreshHelper.java
@@ -88,9 +88,17 @@ protected void sendPullingEvent(int offset) {
 
     @Override
     public void enableRefresh() {
-        super.enableRefresh();
-        if (mRefreshStatus == PullRefreshStatus.PULL_STATUS_REFRESHING) {
+        mRefreshStatus = PullRefreshStatus.PULL_STATUS_REFRESHING;
+        int nodeSize = isVertical() ? mRenderNode.getHeight() : mRenderNode.getWidth();
+        if (mRecyclerView.getFirstChildPosition() > 0) {
+            endAnimation();
+            setVisibleSize(nodeSize);
             mRecyclerView.smoothScrollToPosition(0);
+        } else {
+            int visibleSize = getVisibleSize();
+            if (visibleSize < nodeSize) {
+                smoothResizeTo(visibleSize, nodeSize, DURATION);
+            }
         }
     }
 

diff --git a/android/sdk/src/main/java/com/tencent/mtt/hippy/views/hippylist/PullRefreshHelper.java b/android/sdk/src/main/java/com/tencent/mtt/hippy/views/hippylist/PullRefreshHelper.java
@@ -91,6 +91,10 @@ protected int getNodeSize() {
 
     protected abstract void sendPullingEvent(int offset);
 
+    protected void sendCompatScrollEvent() {
+        mRecyclerView.getRecyclerViewEventHelper().checkSendOnScrollEvent();
+    }
+
     public void onDestroy() {
         mItemView = null;
         mContainer.removeAllViews();
@@ -104,21 +108,7 @@ public void onRefreshCompleted() {
         }
     }
 
-    public void enableRefresh() {
-        switch (mRefreshStatus) {
-            case PULL_STATUS_FOLDED:
-                int nodeSize = isVertical() ? mRenderNode.getHeight() : mRenderNode.getWidth();
-                setVisibleSize(nodeSize);
-                mRefreshStatus = PullRefreshStatus.PULL_STATUS_REFRESHING;
-                break;
-            case PULL_STATUS_DRAGGING:
-                mRefreshStatus = PullRefreshStatus.PULL_STATUS_REFRESHING;
-                break;
-            case PULL_STATUS_REFRESHING:
-            default:
-                break;
-        }
-    }
+    public abstract void enableRefresh();
 
     public View getView() {
         return mContainer;
@@ -215,6 +205,7 @@ protected void setVisibleSize(int size) {
         }
         mContainer.setLayoutParams(layoutParams);
         mRecyclerView.dispatchLayout();
+        sendCompatScrollEvent();
     }
 
     protected void smoothResizeTo(int fromValue, int toValue, int duration) {