update 图片服务-选择图片最大数量逻辑

CommonLib/Common/src/main/java/com/yidian/common/services/ImageService.kt

@@ -94,7 +94,7 @@ class ImageService : ZapService() {
     val resolveParams = params as JSONObject
     when (action) {
       ACTION_SELECT_PIC -> {
-        selectPic(resolveParams.optInt("maxCount"))
+        selectPic(gson.fromJson(resolveParams.toString(), ActionSelectImageParamsBean::class.java))
       }
       ACTION_TAKE_PIC -> {
         takePic()
@@ -127,13 +127,13 @@ class ImageService : ZapService() {
 
   /**
    * 选择图片
-   * @param maxCount 最多可选择的数量
+   * @param params selectImage操作业务参数
    */
-  private fun selectPic(maxCount: Int) {
+  private fun selectPic(params: ActionSelectImageParamsBean) {
     PictureSelector.create(curTopActivity)
       .openGallery(PictureMimeType.ofImage())
       .imageEngine(GlideEngine.createGlideEngine())
-      .maxSelectNum(maxCount)
+      .maxSelectNum(params.maxCount - params.selectedImages.size)
       .isWeChatStyle(true)
       .isCompress(true)
       .compressQuality(10)
@@ -145,7 +145,7 @@ class ImageService : ZapService() {
             return
           }
           // 回传h5选择的图片的数据
-          val selectedList = ArrayList<SelectedImageBean>(maxCount)
+          val selectedList = ArrayList<SelectedImageBean>(params.maxCount - params.selectedImages.size)
           result.forEach {
             val uuid = UUID.randomUUID().toString()
             val inputStream = FileInputStream(it.compressPath)
@@ -298,4 +298,16 @@ class ImageService : ZapService() {
    * 已上传的图片数据结构 回传H5结果使用
    */
   data class UploadImageBean(val id: String, val image_uploaded_key: String)
+
+  /**
+   * selectImage操作传递的业务参数
+   */
+  data class ActionSelectImageParamsBean(
+    val maxCount: Int,
+    val selectedImages: List<SelectedImage>
+  )
+
+  data class SelectedImage(
+    val id: String
+  )
 }