修复批量删除接口

Author: LuckyCodeer

README.md

@@ -5,7 +5,7 @@
 ### 引入依赖
 
 ```kotlin
-implementation 'com.yhw.library:fastadapter:1.0.2'
+implementation 'com.yhw.library:fastadapter:1.0.3'
 ```
 
 ### 使用方法

library/build.gradle

@@ -7,7 +7,7 @@ publish {
     userOrg = 'yanghongwei'
     groupId = 'com.yhw.library'
     artifactId = 'fastadapter'
-    publishVersion = '1.0.2'
+    publishVersion = '1.0.3'
     repoName="FastAdapter"
     desc = 'A fast adapter code library, suitable for RecyclerView、ListView、GridView、ViewPager、ViewPager2、ExpandableListView、Spinner, etc'
     website = 'https://github.com/LuckyCodeer/FastAdapter'

library/src/main/java/com/yhw/library/adapter/BaseListGridAdapter.kt

@@ -62,10 +62,8 @@ abstract class BaseListGridAdapter<T>(private var dataList: MutableList<T>) :
         this.notifyDataSetChanged()
     }
 
-    override fun removeAt(positionList: MutableList<Int>) {
-        for (position in positionList) {
-            this.dataList.removeAt(position)
-        }
+    override fun removeAll(dataList: MutableList<T>) {
+        this.dataList.removeAll(dataList)
         this.notifyDataSetChanged()
     }
 

library/src/main/java/com/yhw/library/adapter/BaseRecyclerAdapter.kt

@@ -122,13 +122,8 @@ abstract class BaseRecyclerAdapter<T>(private var dataList: MutableList<T>) :
         }
     }
 
-    override fun removeAt(positionList: MutableList<Int>) {
-        if (positionList.size >= itemCount) {
-            return
-        }
-        for (i in positionList) {
-            this.dataList.removeAt(i)
-        }
+    override fun removeAll(dataList: MutableList<T>) {
+        this.dataList.removeAll(dataList)
         this.notifyDataSetChanged()
     }
 

library/src/main/java/com/yhw/library/adapter/BaseViewPager2FragmentAdapter.kt

@@ -92,13 +92,8 @@ class BaseViewPager2FragmentAdapter(
         }
     }
 
-    override fun removeAt(positionList: MutableList<Int>) {
-        if (positionList.size >= itemCount) {
-            return
-        }
-        for (i in positionList) {
-            this.fragmentList.removeAt(i)
-        }
+    override fun removeAll(dataList: MutableList<Fragment>) {
+        this.fragmentList.removeAll(dataList)
         this.notifyDataSetChanged()
     }
 

library/src/main/java/com/yhw/library/adapter/BaseViewPagerFragmentAdapter.kt

@@ -69,10 +69,8 @@ class BaseViewPagerFragmentAdapter : FragmentStatePagerAdapter, IAdapter<Fragmen
         this.notifyDataSetChanged()
     }
 
-    override fun removeAt(positionList: MutableList<Int>) {
-        for (position in positionList) {
-            this.fragmentList.removeAt(position)
-        }
+    override fun removeAll(dataList: MutableList<Fragment>) {
+        this.fragmentList.removeAll(dataList)
         this.notifyDataSetChanged()
     }
 

library/src/main/java/com/yhw/library/adapter/BaseViewPagerViewAdapter.kt

@@ -59,10 +59,8 @@ class BaseViewPagerViewAdapter(private var viewList: MutableList<View>) : PagerA
         this.notifyDataSetChanged()
     }
 
-    override fun removeAt(positionList: MutableList<Int>) {
-        for (position in positionList) {
-            this.viewList.removeAt(position)
-        }
+    override fun removeAll(dataList: MutableList<View>) {
+        this.viewList.removeAll(dataList)
         this.notifyDataSetChanged()
     }
 

library/src/main/java/com/yhw/library/adapter/IAdapter.kt

@@ -35,7 +35,7 @@ interface IAdapter<T> {
     /**
      * 移除多个数据
      */
-    fun removeAt(positionList: MutableList<Int>)
+    fun removeAll(dataList: MutableList<T>)
 
     /**
      * 移除全部数据

sample/src/main/java/com/yhw/demo/RecyclerViewActivity.kt

@@ -2,6 +2,7 @@ package com.yhw.demo
 
 import android.content.DialogInterface
 import android.os.Bundle
+import android.util.Log
 import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
@@ -22,7 +23,7 @@ class RecyclerViewActivity : AppCompatActivity() {
 
         val dataList = mutableListOf<String>()
         for (i in 0..100) {
-            dataList.add("this is item")
+            dataList.add("this is item $i")
         }
 
         val deleteBtn = findViewById<AppCompatButton>(R.id.btn_delete)
@@ -31,14 +32,18 @@ class RecyclerViewActivity : AppCompatActivity() {
         val adapter = MyRecyclerAdapter(dataList)
         recyclerView.adapter = adapter
         //单击
-        adapter.onItemClickListener =object: BaseRecyclerAdapter.OnItemClickListener {
+/*        adapter.onItemClickListener = object : BaseRecyclerAdapter.OnItemClickListener {
             override fun onItemClick(position: Int, view: View) {
-                if(!adapter.isShowCheckBox){
-                    Toast.makeText(this@RecyclerViewActivity, "item => $position", Toast.LENGTH_SHORT)
+                if (!adapter.isShowCheckBox) {
+                    Toast.makeText(
+                        this@RecyclerViewActivity,
+                        "item => $position",
+                        Toast.LENGTH_SHORT
+                    )
                         .show()
                 }
             }
-        }
+        }*/
         //长按
         adapter.onItemLongClickListener = object : BaseRecyclerAdapter.OnItemLongClickListener {
             override fun onItemLongClick(position: Int, view: View) {
@@ -125,7 +130,8 @@ class RecyclerViewActivity : AppCompatActivity() {
                 return@setOnClickListener
             }
             adapter.isShowCheckBox = false
-            adapter.removeAt(adapter.checkedList)
+            Log.i("TAG", "checked list ${adapter.checkedList.size}")
+            adapter.removeAll(adapter.checkedList)
             adapter.checkedList.clear()
             deleteBtn.visibility = View.GONE
         }
@@ -135,11 +141,11 @@ class RecyclerViewActivity : AppCompatActivity() {
     /**
      * 直接继承 BaseRecyclerAdapter
      */
-    inner class MyRecyclerAdapter(dataList: MutableList<String>) : BaseRecyclerAdapter<String>(
+    inner class MyRecyclerAdapter(var dataList: MutableList<String>) : BaseRecyclerAdapter<String>(
         dataList
     ) {
         var isShowCheckBox = false
-        var checkedList = mutableListOf<Int>()
+        var checkedList = mutableListOf<String>()
 
         override fun getItemLayoutId(viewType: Int): Int {
             return R.layout.sample_item_layout
@@ -148,20 +154,28 @@ class RecyclerViewActivity : AppCompatActivity() {
         override fun onBindViewItem(holder: RecyclerViewHolder, position: Int, data: String) {
             //使用 holder.getView(R.id.tv_text) 或者 setText()
 //            val textView = holder.getView<TextView>(R.id.tv_text)
-            holder.setText(R.id.tv_text, "$data  $position")
+            holder.setText(R.id.tv_text, data)
             holder.setImageResource(R.id.iv_image, R.mipmap.ic_launcher)
             val checkBox = holder.getView<AppCompatCheckBox>(R.id.checkbox)
             checkBox.visibility = if (isShowCheckBox) View.VISIBLE else View.GONE
 
             holder.itemView.setOnClickListener {
                 if (isShowCheckBox) {
                     checkBox.isChecked = !checkBox.isChecked
+                    val s = dataList[position]
                     if (checkBox.isChecked) {
-                        checkedList.add(position)
+                        checkedList.add(s)
                     } else {
-                        checkedList.remove(position)
+                        checkedList.remove(s)
                     }
                     return@setOnClickListener
+                } else {
+                    Toast.makeText(
+                        this@RecyclerViewActivity,
+                        "item => $position",
+                        Toast.LENGTH_SHORT
+                    )
+                        .show()
                 }
             }
         }