From a59effa9598efe6ed091c180dbe325697cd897af Mon Sep 17 00:00:00 2001
From: zixiaoweng <zixiaoweng@tencent.com>
Date: Thu, 7 Sep 2023 14:17:45 +0800
Subject: [PATCH] feat: QMUIStickySectionLayout support different height stick
 view

---
 plugin/src/main/java/com/qmuiteam/plugin/Dep.kt   |  2 +-
 .../section/QMUIStickySectionItemDecoration.java  | 15 ++++++++++++---
 .../widget/section/QMUIStickySectionLayout.java   |  1 +
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/plugin/src/main/java/com/qmuiteam/plugin/Dep.kt b/plugin/src/main/java/com/qmuiteam/plugin/Dep.kt
index 2bfd8f79..cf925928 100644
--- a/plugin/src/main/java/com/qmuiteam/plugin/Dep.kt
+++ b/plugin/src/main/java/com/qmuiteam/plugin/Dep.kt
@@ -13,7 +13,7 @@ object Dep {
 
     object QMUI {
         const val group = "com.qmuiteam"
-        const val qmuiVer = "2.1.0.18"
+        const val qmuiVer = "2.1.0.21"
         const val archVer = "2.1.0.4"
         const val typeVer = "0.1.0.8"
 
diff --git a/qmui/src/main/java/com/qmuiteam/qmui/widget/section/QMUIStickySectionItemDecoration.java b/qmui/src/main/java/com/qmuiteam/qmui/widget/section/QMUIStickySectionItemDecoration.java
index c0ab860e..7372467b 100644
--- a/qmui/src/main/java/com/qmuiteam/qmui/widget/section/QMUIStickySectionItemDecoration.java
+++ b/qmui/src/main/java/com/qmuiteam/qmui/widget/section/QMUIStickySectionItemDecoration.java
@@ -17,6 +17,7 @@
 package com.qmuiteam.qmui.widget.section;
 
 import android.graphics.Canvas;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -163,8 +164,14 @@ public class QMUIStickySectionItemDecoration<VH extends QMUIStickySectionAdapter
 
         setHeaderVisibility(true);
 
-        int contactPoint = sectionContainer.getHeight() - 1;
-        final View childInContact = parent.findChildViewUnder(parent.getWidth() / 2, contactPoint);
+        View secondChild = linearLayoutManager.findViewByPosition(firstVisibleItemPosition + 1);
+        View firstChild = linearLayoutManager.findViewByPosition(firstVisibleItemPosition);
+        View childInContact = null;
+        if (firstChild != null && firstChild.getTop() == 0) {
+            childInContact = firstChild;
+        } else {
+            childInContact = secondChild;
+        }
         if (childInContact == null) {
             mTargetTop = parent.getTop();
             ViewCompat.offsetTopAndBottom(sectionContainer, mTargetTop - sectionContainer.getTop());
@@ -173,7 +180,9 @@ public class QMUIStickySectionItemDecoration<VH extends QMUIStickySectionAdapter
 
         if (mCallback.isHeaderItem(parent.getChildAdapterPosition(childInContact))) {
             mTargetTop = childInContact.getTop() + parent.getTop() - sectionContainer.getHeight();
-            ViewCompat.offsetTopAndBottom(sectionContainer, mTargetTop - sectionContainer.getTop());
+            if (mTargetTop <= 0) {
+                ViewCompat.offsetTopAndBottom(sectionContainer, mTargetTop - sectionContainer.getTop());
+            }
             return;
         }
 
diff --git a/qmui/src/main/java/com/qmuiteam/qmui/widget/section/QMUIStickySectionLayout.java b/qmui/src/main/java/com/qmuiteam/qmui/widget/section/QMUIStickySectionLayout.java
index 5ccc7519..d57ba6e3 100644
--- a/qmui/src/main/java/com/qmuiteam/qmui/widget/section/QMUIStickySectionLayout.java
+++ b/qmui/src/main/java/com/qmuiteam/qmui/widget/section/QMUIStickySectionLayout.java
@@ -25,6 +25,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;