fix: #397 禁止头脚布局被拖拽移动

liangjingkanji · Oct 29, 2023 · 0c7cf03 · 0c7cf03
1 parent 41d0be9
commit 0c7cf03
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -91,7 +91,7 @@ Module 的 build.gradle 添加依赖框架
 
 ```groovy
 dependencies {
-    implementation 'com.github.liangjingkanji:BRV:1.5.3'
+    implementation 'com.github.liangjingkanji:BRV:1.5.4'
 }
 ```
 

diff --git a/brv/src/main/java/com/drake/brv/listener/DefaultItemTouchCallback.kt b/brv/src/main/java/com/drake/brv/listener/DefaultItemTouchCallback.kt
@@ -141,13 +141,17 @@ open class DefaultItemTouchCallback : ItemTouchHelper.Callback() {
                     onDrag(sourceViewHolder!!, targetViewHolder!!)
                 }
             }
+
             else -> {
                 this.lastActionState = actionState
             }
         }
     }
 
-    /** 拖拽移动超过其他item时, 其返回值表示是否已经拖拽替换(会触发函数onMoved) */
+    /**
+     * 拖拽移动超过其他item时, 其返回值表示是否已经拖拽替换(会触发函数onMoved)
+     * @return 返回false 禁止被拖拽交换移动
+     */
     override fun onMove(
         recyclerView: RecyclerView,
         source: RecyclerView.ViewHolder,
@@ -158,7 +162,7 @@ open class DefaultItemTouchCallback : ItemTouchHelper.Callback() {
         val targetPosition = recyclerView.getChildLayoutPosition(target.itemView)
 
         val models = adapter.models as? MutableList
-        if (models != null && source is BindingViewHolder && target is BindingViewHolder) {
+        if (models != null && source is BindingViewHolder && target is BindingViewHolder && adapter.isModel(targetPosition)) {
             val fromPosition = currentPosition - adapter.headerCount
             val toPosition = targetPosition - adapter.headerCount
             val fromItem = models[fromPosition]

diff --git a/docs/updates.md b/docs/updates.md
@@ -1,3 +1,6 @@
+## 1.5.4
+- fix: #397 禁止头脚布局被拖拽移动
+
 ## 1.5.3
 - fix: 禁止`PageRefreshLayout.setNoMoreData`重复调用