fix: 单独调用 notifyDataSetChanged() 方法对 stateView 生效的 bug #3822

CymChad · Dec 7, 2023 · b3fc442 · b3fc442
1 parent 6e9e661
commit b3fc442
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/library/src/main/java/com/chad/library/adapter4/BaseQuickAdapter.kt b/library/src/main/java/com/chad/library/adapter4/BaseQuickAdapter.kt
@@ -242,6 +242,7 @@ abstract class BaseQuickAdapter<T : Any, VH : RecyclerView.ViewHolder>(
 
     final override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         if (holder is StateLayoutVH) {
+            holder.changeStateView(stateView)
             return
         }
 
@@ -822,7 +823,7 @@ abstract class BaseQuickAdapter<T : Any, VH : RecyclerView.ViewHolder>(
 
 
     companion object {
-        const val EMPTY_VIEW = 0x01000555
+        val EMPTY_VIEW = R.id.BaseQuickAdapter_empty_view
 
         internal const val EMPTY_PAYLOAD = 0
     }

diff --git a/library/src/main/java/com/chad/library/adapter4/viewholder/StateLayoutVH.kt b/library/src/main/java/com/chad/library/adapter4/viewholder/StateLayoutVH.kt
@@ -14,7 +14,7 @@ import com.chad.library.adapter4.fullspan.FullSpanAdapterType
  * @property stateLayout
  * @constructor Create empty Empty layout v h
  */
-internal class StateLayoutVH constructor(
+internal class StateLayoutVH(
     parent: ViewGroup,
     stateView: View?,
     private val stateLayout: FrameLayout = FrameLayout(parent.context).apply {
@@ -37,6 +37,14 @@ internal class StateLayoutVH constructor(
                 return
             }
 
+            if (rootView.childCount == 1) {
+                val old = rootView.getChildAt(0)
+                if (old == stateView) {
+                    // 如果是同一个view，不进行操作
+                    return
+                }
+            }
+
             stateView.parent.run {
                 if (this is ViewGroup) {
                     this.removeView(stateView)

diff --git a/library/src/main/res/values/ids.xml b/library/src/main/res/values/ids.xml
@@ -6,4 +6,6 @@
     <item name="BaseQuickAdapter_databinding_support" type="id"/>
 
     <item name="BaseQuickAdapter_key_multi" type="id"/>
+
+    <item name="BaseQuickAdapter_empty_view" type="id"/>
 </resources>