add addParts(Map<Part>)、addParts(List<Part>) method

liujingxing · Apr 13, 2024 · 7f631d4 · 7f631d4
1 parent 93f0695
commit 7f631d4
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 5 deletions.
diff --git a/app/build/generated/ksp/debug/kotlin/rxhttp/wrapper/param/RxHttpFormParam.kt b/app/build/generated/ksp/debug/kotlin/rxhttp/wrapper/param/RxHttpFormParam.kt
@@ -139,7 +139,15 @@ open class RxHttpFormParam(param: FormParam) : RxHttpAbstractBodyParam<FormParam
         requestBody: RequestBody
     ) = addPart(OkHttpCompat.part(key, fileName, requestBody))
 
+    fun addPart(key: String, requestBody: RequestBody) = addFormDataPart(key, null, requestBody)
+
+    fun addParts(partMap: Map<String, RequestBody>) = apply { 
+        partMap.forEach { (key, value) -> addPart(key, value) } 
+    }
+
     fun addPart(part: MultipartBody.Part) = apply { param.addPart(part) }
+
+    fun addParts(parts: List<MultipartBody.Part>) = apply { parts.forEach { addPart(it) } }
 
     //Set content-type to multipart/form-data
     fun setMultiForm() = setMultiType(MultipartBody.FORM)

diff --git a/rxhttp-compiler/src/main/java/com/rxhttp/compiler/kapt/ClassHelper.kt b/rxhttp-compiler/src/main/java/com/rxhttp/compiler/kapt/ClassHelper.kt
@@ -388,11 +388,6 @@ class ClassHelper(private val isAndroidPlatform: Boolean) {
                     return this;
                 }
                 """)}
-                public RxHttpFormParam addPart(MultipartBody.Part part) {
-                    param.addPart(part);
-                    return this;
-                }
-
                 public RxHttpFormParam addPart(RequestBody requestBody) {
                     return addPart(OkHttpCompat.part(requestBody));
                 }
@@ -404,6 +399,29 @@ class ClassHelper(private val isAndroidPlatform: Boolean) {
                 public RxHttpFormParam addFormDataPart(String key, @Nullable String fileName, RequestBody requestBody) {
                     return addPart(OkHttpCompat.part(key, fileName, requestBody));
                 }
+                
+                public RxHttpFormParam addPart(String key, RequestBody requestBody) {
+                    return addFormDataPart(key, null, requestBody);
+                }
+                
+                public RxHttpFormParam addParts(Map<String, RequestBody> partMap) {
+                    for (Entry<String, RequestBody> entry : partMap.entrySet()) {
+                        addPart(entry.getKey(), entry.getValue());
+                    }
+                    return this;
+                }
+                
+                public RxHttpFormParam addPart(MultipartBody.Part part) {
+                    param.addPart(part);
+                    return this;
+                }
+                
+                public RxHttpFormParam addParts(List<MultipartBody.Part> parts) {
+                    for (MultipartBody.Part part: parts) {
+                        addPart(part);
+                    }
+                    return this;
+                }
 
                 //Set content-type to multipart/form-data
                 public RxHttpFormParam setMultiForm() {

diff --git a/rxhttp-compiler/src/main/java/com/rxhttp/compiler/ksp/KClassHelper.kt b/rxhttp-compiler/src/main/java/com/rxhttp/compiler/ksp/KClassHelper.kt
@@ -289,7 +289,15 @@ class KClassHelper(
                     requestBody: RequestBody
                 ) = addPart(OkHttpCompat.part(key, fileName, requestBody))
 
+                fun addPart(key: String, requestBody: RequestBody) = addFormDataPart(key, null, requestBody)
+                
+                fun addParts(partMap: Map<String, RequestBody>) = apply { 
+                    partMap.forEach { (key, value) -> addPart(key, value) } 
+                }
+
                 fun addPart(part: MultipartBody.Part) = apply { param.addPart(part) }
+                
+                fun addParts(parts: List<MultipartBody.Part>) = apply { parts.forEach { addPart(it) } }
 
                 //Set content-type to multipart/form-data
                 fun setMultiForm() = setMultiType(MultipartBody.FORM)