From edcd124d96d7f5810d9cfe2111b7a17389ff1f15 Mon Sep 17 00:00:00 2001
From: drake <liangjinggpx@gmail.com>
Date: Sun, 3 Dec 2023 21:11:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20#409=20=E4=BF=AE=E5=A4=8D=E5=8D=95?=
 =?UTF-8?q?=E4=B8=80=E5=B1=95=E5=BC=80=E6=A8=A1=E5=BC=8F=E4=B8=8B=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=95=B0=E6=8D=AE=E5=90=8E=E5=B1=95=E5=BC=80=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E5=B4=A9=E6=BA=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/drake/brv/BindingAdapter.kt | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/brv/src/main/java/com/drake/brv/BindingAdapter.kt b/brv/src/main/java/com/drake/brv/BindingAdapter.kt
index 09885256..b4e13d97 100755
--- a/brv/src/main/java/com/drake/brv/BindingAdapter.kt
+++ b/brv/src/main/java/com/drake/brv/BindingAdapter.kt
@@ -716,7 +716,7 @@ open class BindingAdapter : RecyclerView.Adapter<BindingAdapter.BindingViewHolde
         return when {
             isHeader(position) -> headers[position] as M
             isFooter(position) -> footers[position - headerCount - modelCount] as M
-            else -> models!!.let { it[position - headerCount] as M }
+            else -> models!![position - headerCount] as M
         }
     }
 
@@ -1014,11 +1014,7 @@ open class BindingAdapter : RecyclerView.Adapter<BindingAdapter.BindingViewHolde
         scrollTop: Boolean = false,
         @IntRange(from = -1) depth: Int = 0,
     ): Int {
-        val holder = rv?.findViewHolderForLayoutPosition(position) as? BindingViewHolder ?: rv?.run {
-            val holder = createViewHolder(this, getItemViewType(position))
-            bindViewHolder(holder, position)
-            holder
-        } ?: return 0
+        val holder = getBindViewHolder(position) ?: return 0
         return holder.expand(scrollTop, depth)
     }
 
@@ -1029,11 +1025,7 @@ open class BindingAdapter : RecyclerView.Adapter<BindingAdapter.BindingViewHolde
      * @return 折叠后消失的条目数量
      */
     fun collapse(@IntRange(from = 0) position: Int, @IntRange(from = -1) depth: Int = 0): Int {
-        val holder = rv?.findViewHolderForLayoutPosition(position) as? BindingViewHolder ?: rv?.run {
-            val holder = createViewHolder(this, getItemViewType(position))
-            bindViewHolder(holder, position)
-            holder
-        } ?: return 0
+        val holder = getBindViewHolder(position) ?: return 0
         return holder.collapse(depth)
     }
 
@@ -1048,14 +1040,26 @@ open class BindingAdapter : RecyclerView.Adapter<BindingAdapter.BindingViewHolde
         scrollTop: Boolean = false,
         @IntRange(from = -1) depth: Int = 0,
     ): Int {
-        val holder = rv?.findViewHolderForLayoutPosition(position) as? BindingViewHolder ?: rv?.run {
-            val holder = createViewHolder(this, getItemViewType(position))
-            bindViewHolder(holder, position)
-            holder
-        } ?: return 0
+        val holder = getBindViewHolder(position) ?: return 0
         return holder.expandOrCollapse(scrollTop, depth)
     }
 
+    /**
+     * 获取ViewHolder, 如果获取不到就创建一个
+     */
+    private fun getBindViewHolder(position: Int): BindingViewHolder? {
+        val rv = rv ?: return null
+        return rv.findViewHolderForLayoutPosition(position) as? BindingViewHolder ?: run {
+            try {
+                val holder = createViewHolder(rv, getItemViewType(position))
+                bindViewHolder(holder, position)
+                holder
+            } catch (e: Exception) {
+                null
+            }
+        }
+    }
+
     //</editor-fold>
 
     inner class BindingViewHolder : RecyclerView.ViewHolder {