选择图片监听事件添加index起始参数

Author: fengpeng

picker/src/main/java/pizzk/media/picker/adapter/PhotoGroupAdapter.kt

@@ -17,7 +17,7 @@ class PhotoGroupAdapter(context: Context, fixedList: List<PhotoItem>?, lp: ViewG
     val isAppend: Boolean
     private var appendText: String = ""
     private val lp: ViewGroup.LayoutParams
-    private var changeBlock: (PhotoGroupAdapter) -> Unit = { _ -> }
+    private var changeBlock: (PhotoGroupAdapter, Int) -> Unit = { _, _ -> }
 
     init {
         if (null == fixedList || fixedList.isEmpty()) {
@@ -42,7 +42,7 @@ class PhotoGroupAdapter(context: Context, fixedList: List<PhotoItem>?, lp: ViewG
         appendText = text
     }
 
-    fun setChangeBlock(block: (PhotoGroupAdapter) -> Unit) {
+    fun setChangeBlock(block: (PhotoGroupAdapter, Int) -> Unit) {
         this.changeBlock = block
     }
 
@@ -53,15 +53,15 @@ class PhotoGroupAdapter(context: Context, fixedList: List<PhotoItem>?, lp: ViewG
         if (!isAppend || 1 == getList().size) {
             el.path = ""
             notifyItemChanged(index)
-            changeBlock(this)
+            changeBlock(this, index)
             return
         }
         remove(index)
         if (!TextUtils.isEmpty(getList()[getList().size - 1].path)) {
             getList().add(PhotoItem())
         }
         notifyDataSetChanged()
-        changeBlock(this)
+        changeBlock(this, index)
     }
 
     //更新图片
@@ -86,7 +86,7 @@ class PhotoGroupAdapter(context: Context, fixedList: List<PhotoItem>?, lp: ViewG
                 return false
             }
         }
-        changeBlock(this)
+        changeBlock(this, index)
         return true
     }
 

picker/src/main/java/pizzk/media/picker/widget/PhotoGroupView.kt

@@ -40,7 +40,7 @@ class PhotoGroupView : RecyclerView {
               exists: List<String>? = null,
               readOnly: Boolean,
               appendText: String = "",
-              changed: (PhotoGroupAdapter) -> Unit = {}) {
+              changed: (PhotoGroupAdapter, Int) -> Unit = { _, _ -> }) {
         val manager = object : GridLayoutManager(context, special.column) {
             override fun isAutoMeasureEnabled(): Boolean = true
         }
@@ -49,8 +49,8 @@ class PhotoGroupView : RecyclerView {
         pAdapter.setReadOnly(readOnly)
         pAdapter.setChangeBlock(changed)
         pAdapter.setAppendText(appendText)
-        if (!pAdapter.update(exists, special.limit)) {
-            changed(pAdapter)
+        if (!pAdapter.update(exists, special.limit, index = -1)) {
+            changed(pAdapter, -1)
         }
         this.adapter = pAdapter
         //配置Adapter
@@ -86,9 +86,12 @@ class PhotoGroupView : RecyclerView {
     }
 
     //跳转至选择图片
-    private fun showPickPhoto(activity: Activity, key: String,
-                              selects: List<String>, limit: Int,
-                              adapter: PhotoGroupAdapter, index: Int,
+    private fun showPickPhoto(activity: Activity,
+                              key: String,
+                              selects: List<String>,
+                              limit: Int,
+                              adapter: PhotoGroupAdapter,
+                              index: Int,
                               crop: CropParams?) {
         val action: Int = when (key) {
             choiceList[0] -> {
@@ -100,32 +103,34 @@ class PhotoGroupView : RecyclerView {
             else -> -1
         }
         if (action < 0) return
+        val block: (Int, List<Uri>) -> Unit = { code, list ->
+            if (code == PickControl.ACTION_CAMERA) {
+                if (adapter.isAppend) {
+                    val allOf: MutableList<String> = ArrayList(adapter.selectCount() + 1)
+                    allOf.addAll(adapter.selectPaths())
+                    allOf.addAll(list.map(Uri::toString))
+                    adapter.update(allOf, limit, index)
+                } else {
+                    adapter.update(list.map(Uri::toString), limit, index)
+                }
+            } else {
+                if (adapter.isAppend) {
+                    val remotes: List<String> = selects.filter { null == PickUtils.path2Uri(it) }
+                    val allOf: MutableList<String> = ArrayList(limit)
+                    allOf.addAll(remotes)
+                    allOf.addAll(list.map(Uri::toString))
+                    adapter.update(allOf, limit, index)
+                } else {
+                    adapter.update(list.map(Uri::toString), limit, index)
+                }
+            }
+        }
         PickControl.obtain(clean = true).action(action)
                 .selects(selects)
                 .limit(limit)
                 .crop(crop)
-                .callback { code, list ->
-                    if (code == PickControl.ACTION_CAMERA) {
-                        if (adapter.isAppend) {
-                            val allOf: MutableList<String> = ArrayList(adapter.selectCount() + 1)
-                            allOf.addAll(adapter.selectPaths())
-                            allOf.addAll(list.map(Uri::toString))
-                            adapter.update(allOf, limit, index)
-                        } else {
-                            adapter.update(list.map(Uri::toString), limit, index)
-                        }
-                    } else {
-                        if (adapter.isAppend) {
-                            val remotes: List<String> = selects.filter { null == PickUtils.path2Uri(it) }
-                            val allOf: MutableList<String> = ArrayList(limit)
-                            allOf.addAll(remotes)
-                            allOf.addAll(list.map(Uri::toString))
-                            adapter.update(allOf, limit, index)
-                        } else {
-                            adapter.update(list.map(Uri::toString), limit, index)
-                        }
-                    }
-                }.done(activity)
+                .callback(block)
+                .done(activity)
     }
 
     //指定参数