fix: #409 修复单一展开模式下删除数据后展开导致崩溃

liangjingkanji · Dec 3, 2023 · edcd124 · edcd124
1 parent ed3bd9e
commit edcd124
Showing 1 changed file with 20 additions and 16 deletions.
diff --git 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 {