PickControl add PickCallback

fengpeng · fengpeng · commit b7ee6359f10c · 2021-06-01T23:49:38.000+08:00
diff --git a/app/src/main/java/pizzk/media/picker/demo/MainActivity.kt b/app/src/main/java/pizzk/media/picker/demo/MainActivity.kt
@@ -6,6 +6,7 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import android.widget.ImageView
 import android.widget.TextView
+import android.widget.Toast
 import pizzk.media.picker.arch.CropParams
 import pizzk.media.picker.arch.MimeType
 import pizzk.media.picker.arch.PickControl
@@ -23,18 +24,33 @@ class MainActivity : AppCompatActivity() {
         val photoGroup: PhotoGroupView = findViewById(R.id.photoGroup)
         val size: Int = resources.getDimensionPixelSize(R.dimen.x110)
         val tvHint: TextView = findViewById(R.id.tvHint)
-        val special: PhotoGroupView.Special = PhotoGroupView.Special(this@MainActivity, limit = 20, column = 4)
-        photoGroup.setup(special, emptyList(), readOnly = false, appendText = "添加文件") { adapter, _ ->
+        val special: PhotoGroupView.Special =
+            PhotoGroupView.Special(this@MainActivity, limit = 20, column = 4)
+        photoGroup.setup(
+            special,
+            emptyList(),
+            readOnly = false,
+            appendText = "添加文件"
+        ) { adapter, _ ->
             tvHint.text = "(${adapter.selectCount()}/${special.limit})"
         }
         //单张选择示例
         val ivSingle: ImageView = findViewById(R.id.ivSingle)
         val crop = CropParams(aspectX = 1, aspectY = 1)
         ivSingle.setOnClickListener {
-            PickPhotoHelper.show(this@MainActivity, 1, crop, callback = { _, uris ->
-                val uri: Uri = uris[0]
-                PickControl.imageLoad().load(ivSingle, uri, MimeType.JPEG.mime)
-            })
+            val callback: PickControl.PickCallback = object : PickControl.PickCallback() {
+                override fun onSuccess(action: Int, uris: List<Uri>) {
+                    val uri: Uri = uris[0]
+                    PickControl.imageLoad().load(ivSingle, uri, MimeType.JPEG.mime)
+                }
+
+                override fun onFailure(cancel: Boolean, msg: String) {
+                    if (cancel) {
+                        Toast.makeText(baseContext, "用户取消", Toast.LENGTH_SHORT).show()
+                    }
+                }
+            }
+            PickPhotoHelper.show(this@MainActivity, 1, crop, callback = callback)
         }
     }
 }
diff --git a/picker/src/main/java/pizzk/media/picker/arch/PickControl.kt b/picker/src/main/java/pizzk/media/picker/arch/PickControl.kt
@@ -29,7 +29,7 @@ class PickControl private constructor() {
 
         //默认函数块
         private val dFilter: (Uri?, String) -> Boolean = { _, _ -> true }
-        private val dCallback: (action: Int, List<Uri>) -> Unit = { _, _ -> Unit }
+        private val dCallback: PickCallback = PickCallback()
 
         private val picker: PickControl = PickControl()
 
@@ -47,7 +47,7 @@ class PickControl private constructor() {
     private var action: Int = ACTION_NONE
     private var filter: (Uri?, String) -> Boolean = dFilter
     private var limit: Int = 1
-    private var callback: (action: Int, List<Uri>) -> Unit = dCallback
+    private var callback: PickCallback = dCallback
 
     //裁剪
     private var crop: CropParams? = null
@@ -76,6 +76,12 @@ class PickControl private constructor() {
         return this
     }
 
+    open class PickCallback {
+        open fun onSuccess(action: Int, uris: List<Uri>) = Unit
+
+        open fun onFailure(cancel: Boolean, msg: String) = Unit
+    }
+
     /**
      * 设置操作意图码
      */
@@ -127,8 +133,8 @@ class PickControl private constructor() {
     /**
      * 设置拾取回调
      */
-    fun callback(block: (action: Int, uris: List<Uri>) -> Unit): PickControl {
-        this.callback = block
+    fun callback(callback: PickCallback): PickControl {
+        this.callback = callback
         return this
     }
 
@@ -161,7 +167,7 @@ class PickControl private constructor() {
     /**
      * 获取回调函数
      */
-    internal fun callbacks(): (action: Int, uris: List<Uri>) -> Unit = callback
+    internal fun callback(): PickCallback = callback
 
     /**
      * 获预选择图片路径
diff --git a/picker/src/main/java/pizzk/media/picker/utils/PickPhotoHelper.kt b/picker/src/main/java/pizzk/media/picker/utils/PickPhotoHelper.kt
@@ -13,7 +13,7 @@ import pizzk.media.picker.view.PickChoseActivity
 object PickPhotoHelper {
 
     fun show(activity: Activity, limit: Int = 1, cropParams: CropParams? = null,
-             callback: (action: Int, uris: List<Uri>) -> Unit) {
+             callback: PickControl.PickCallback) {
         val choiceList: List<String> = listOf(
                 activity.getString(R.string.pick_chose_camera),
                 activity.getString(R.string.pick_chose_album)
diff --git a/picker/src/main/java/pizzk/media/picker/view/PickActivity.kt b/picker/src/main/java/pizzk/media/picker/view/PickActivity.kt
@@ -40,7 +40,11 @@ class PickActivity : AppCompatActivity() {
         }
     }
 
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+    override fun onRequestPermissionsResult(
+        requestCode: Int,
+        permissions: Array<out String>,
+        grantResults: IntArray
+    ) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         if (!PickUtils.onRequestPermissionResult(this@PickActivity, permissions, grantResults)) {
             finish()
@@ -61,16 +65,18 @@ class PickActivity : AppCompatActivity() {
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
+        val picker: PickControl = PickControl.obtain(false)
         if (Activity.RESULT_CANCELED == resultCode) {
             Log.d(TAG, getString(R.string.pick_media_user_cancel))
+            picker.callback().onFailure(true, "")
             finish()
             return
         }
         if (Activity.RESULT_OK != resultCode) {
+            picker.callback().onFailure(false, "result is not ok")
             finish()
             return
         }
-        val picker: PickControl = PickControl.obtain(false)
         when (requestCode) {
             PickUtils.REQUEST_CODE_CAMERA -> {
                 val file: File? = PickControl.obtain(false).cameraFile()
@@ -81,7 +87,7 @@ class PickActivity : AppCompatActivity() {
                         PickUtils.launchCrop(this@PickActivity)
                         return
                     } else {
-                        picker.callbacks().invoke(picker.action(), listOf(uri))
+                        picker.callback().onSuccess(picker.action(), listOf(uri))
                     }
                 }
                 finish()
@@ -93,18 +99,21 @@ class PickActivity : AppCompatActivity() {
                     PickUtils.launchCrop(this@PickActivity)
                     return
                 } else {
-                    picker.callbacks().invoke(picker.action(), uris)
+                    picker.callback().onSuccess(picker.action(), uris)
                 }
                 finish()
             }
             PickUtils.REQUEST_CODE_PREVIEW -> {
+                picker.callback().onSuccess(picker.action(), emptyList())
                 finish()
             }
             PickUtils.REQUEST_CODE_CROP -> {
                 val file: File? = PickControl.obtain(false).cropFile()
                 if (null != file) {
                     val uri: Uri = PickUtils.saveToAlbum(baseContext, file)
-                    PickControl.obtain(false).callbacks().invoke(picker.action(), listOf(uri))
+                    PickControl.obtain(false).callback().onSuccess(picker.action(), listOf(uri))
+                } else {
+                    picker.callback().onFailure(false, "request crop failed.")
                 }
                 finish()
             }
diff --git a/picker/src/main/java/pizzk/media/picker/widget/PhotoGroupView.kt b/picker/src/main/java/pizzk/media/picker/widget/PhotoGroupView.kt
@@ -27,10 +27,18 @@ class PhotoGroupView : RecyclerView {
     private var spacing: Int = 0
 
     constructor(context: Context) : this(context, null)
-    constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, androidx.recyclerview.R.attr.recyclerViewStyle)
+    constructor(context: Context, attrs: AttributeSet?) : this(
+        context,
+        attrs,
+        androidx.recyclerview.R.attr.recyclerViewStyle
+    )
 
     @SuppressLint("Recycle")
-    constructor(context: Context, attrs: AttributeSet?, defStyle: Int) : super(context, attrs, defStyle) {
+    constructor(context: Context, attrs: AttributeSet?, defStyle: Int) : super(
+        context,
+        attrs,
+        defStyle
+    ) {
         isVerticalScrollBarEnabled = false
         isHorizontalScrollBarEnabled = false
         overScrollMode = OVER_SCROLL_NEVER
@@ -41,19 +49,22 @@ class PhotoGroupView : RecyclerView {
     }
 
     private val choiceList: List<String> = listOf(
-            context.getString(R.string.pick_chose_camera),
-            context.getString(R.string.pick_chose_album)
+        context.getString(R.string.pick_chose_camera),
+        context.getString(R.string.pick_chose_album)
     )
 
-    fun setup(special: Special,
-              exists: List<String>? = null,
-              readOnly: Boolean,
-              appendText: String = "",
-              changed: (PhotoGroupAdapter, Int) -> Unit = { _, _ -> }) {
+    fun setup(
+        special: Special,
+        exists: List<String>? = null,
+        readOnly: Boolean,
+        appendText: String = "",
+        changed: (PhotoGroupAdapter, Int) -> Unit = { _, _ -> }
+    ) {
         post {
             val vWidth = measuredWidth - paddingStart - paddingEnd
             val minWidth = context.resources.getDimensionPixelOffset(R.dimen.pick_photo_min_size)
-            val lp: ViewGroup.LayoutParams = ViewGroup.LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT)
+            val lp: ViewGroup.LayoutParams =
+                ViewGroup.LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT)
             do {
                 lp.width = (vWidth - (special.column - 1) * spacing) / special.column
                 if (lp.width >= minWidth || special.column <= 1) break
@@ -78,13 +89,23 @@ class PhotoGroupView : RecyclerView {
                 if (el.path.isEmpty()) {
                     if (pAdapter.isReadOnly()) return@setTapBlock
                     //选择图片
-                    val selects: List<String> = if (pAdapter.isAppend) pAdapter.selectPaths() 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, special.crop)
+                        showPickPhoto(
+                            special.activity,
+                            key,
+                            selects,
+                            special.limit,
+                            pAdapter,
+                            index,
+                            special.crop
+                        )
                     }
                 } else {
                     //预览
-                    val selects: List<String> = if (pAdapter.isAppend) pAdapter.selectPaths() 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)
                 }
             }
@@ -99,20 +120,22 @@ class PhotoGroupView : RecyclerView {
     //跳转至预览
     private fun showPreview(activity: Activity, selects: List<String>, index: Int) {
         PickControl.obtain(true)
-                .action(PickControl.ACTION_PREVIEW)
-                .selects(selects)
-                .index(index)
-                .done(activity)
+            .action(PickControl.ACTION_PREVIEW)
+            .selects(selects)
+            .index(index)
+            .done(activity)
     }
 
     //跳转至选择图片
-    private fun showPickPhoto(activity: Activity,
-                              key: String,
-                              selects: List<String>,
-                              limit: Int,
-                              adapter: PhotoGroupAdapter,
-                              index: Int,
-                              crop: CropParams?) {
+    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] -> {
                 PickControl.ACTION_CAMERA
@@ -123,46 +146,50 @@ 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)
+        val block: PickControl.PickCallback = object : PickControl.PickCallback() {
+            override fun onSuccess(action: Int, uris: List<Uri>) {
+                if (action == PickControl.ACTION_CAMERA) {
+                    if (adapter.isAppend) {
+                        val allOf: MutableList<String> = ArrayList(adapter.selectCount() + 1)
+                        allOf.addAll(adapter.selectPaths())
+                        allOf.addAll(uris.map(Uri::toString))
+                        adapter.update(allOf, limit, index)
+                    } else {
+                        adapter.update(uris.map(Uri::toString), limit, index)
+                    }
                 } else {
-                    adapter.update(list.map(Uri::toString), limit, index)
+                    if (adapter.isAppend) {
+                        val remotes: List<String> =
+                            selects.filter { null == PickUtils.path2Uri(it) }
+                        val allOf: MutableList<String> = ArrayList(limit)
+                        allOf.addAll(remotes)
+                        allOf.addAll(uris.map(Uri::toString))
+                        adapter.update(allOf, limit, index)
+                    } else {
+                        adapter.update(uris.map(Uri::toString), limit, index)
+                    }
                 }
             }
         }
         PickControl.obtain(clean = true).action(action)
-                .selects(selects)
-                .limit(limit)
-                .crop(crop)
-                .callback(block)
-                .done(activity)
+            .selects(selects)
+            .limit(limit)
+            .crop(crop)
+            .callback(block)
+            .done(activity)
     }
 
     //指定参数
     class Special(
-            var activity: Activity,
-            var limit: Int = 1,
-            var column: Int = 4,
-            var fixed: MutableList<PhotoItem>? = null,
-            var crop: CropParams? = null
+        var activity: Activity,
+        var limit: Int = 1,
+        var column: Int = 4,
+        var fixed: MutableList<PhotoItem>? = null,
+        var crop: CropParams? = null
     )
 
-    internal class GridSpacingItemDecoration(private val spanCount: Int, private val spacing: Int) : ItemDecoration() {
+    internal class GridSpacingItemDecoration(private val spanCount: Int, private val spacing: Int) :
+        ItemDecoration() {
 
         override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: State) {
             val position = parent.getChildAdapterPosition(view)
