添加照片选择元素获取

Author: fengpeng

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

@@ -85,19 +85,21 @@ class PhotoGroupAdapter(context: Context, fixedList: List<PhotoItem>?, lp: ViewG
         return true
     }
 
-    fun selects(): List<String> {
+    fun selectItems(): List<PhotoItem> {
         val size: Int = selectCount()
-        val list: MutableList<String> = ArrayList(size)
+        val list: MutableList<PhotoItem> = ArrayList(size)
         for (i: Int in 0 until getList().size) {
-            val el: String = getList()[i].path
-            if (!isAppend || !TextUtils.isEmpty(el)) {
-                list.add(el)
+            val path: String = getList()[i].path
+            if (!isAppend || !TextUtils.isEmpty(path)) {
+                list.add(getList()[i])
             }
         }
         return list
     }
 
-    fun selectCount() = getList().count { !TextUtils.isEmpty(it.path) }
+    fun selectPaths(): List<String> = selectItems().map { it.path }
+
+    fun selectCount() = if (isAppend) getList().count { !TextUtils.isEmpty(it.path) } else getList().size
 
     override fun getLayoutId(viewType: Int): Int = R.layout.pick_photo_list_item
 

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

@@ -55,13 +55,13 @@ class PhotoGroupView : RecyclerView {
             if (el.path.isEmpty()) {
                 if (pAdapter.isReadOnly()) return@setTapBlock
                 //选择图片
-                val selects: List<String> = if (pAdapter.isAppend) pAdapter.selects() else emptyList()
+                val selects: List<String> = if (pAdapter.isAppend) pAdapter.selectPaths() else emptyList()
                 PickChoseActivity.show(special.activity, choiceList) { key ->
                     showPickPhoto(special.activity, key, selects, special.limit, pAdapter, index)
                 }
             } else {
                 //预览
-                val selects: List<String> = if (pAdapter.isAppend) pAdapter.selects() else arrayListOf(el.path)
+                val selects: List<String> = if (pAdapter.isAppend) pAdapter.selectPaths() else arrayListOf(el.path)
                 showPreview(special.activity, selects, if (pAdapter.isAppend) index else 0)
             }
         }
@@ -101,7 +101,7 @@ class PhotoGroupView : RecyclerView {
                 .callback { code, list ->
                     if (code == PickControl.ACTION_CAMERA) {
                         val allOf: MutableList<String> = ArrayList(adapter.selectCount() + 1)
-                        allOf.addAll(adapter.selects())
+                        allOf.addAll(adapter.selectPaths())
                         allOf.addAll(list.map(Uri::toString))
                         adapter.update(allOf, limit, index)
                     } else {