方法参数顺序调整

liujingxing · Dec 20, 2020 · a486433 · a486433
1 parent 1014c0a
commit a486433
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/app/build/generated/source/kapt/debug/rxhttp/wrapper/param/RxHttpBodyParam.java b/app/build/generated/source/kapt/debug/rxhttp/wrapper/param/RxHttpBodyParam.java
@@ -57,13 +57,13 @@ public RxHttpBodyParam setBody(File file, @Nullable MediaType mediaType) {
         return this;
     }
 
-    public RxHttpBodyParam setBody(Context context, Uri uri) {
-        param.setBody(context, uri);
+    public RxHttpBodyParam setBody(Uri uri, Context context) {
+        param.setBody(uri, context);
         return this;
     }
 
-    public RxHttpBodyParam setBody(Context context, Uri uri, @Nullable MediaType contentType) {
-        param.setBody(context, uri, contentType);
+    public RxHttpBodyParam setBody(Uri uri, Context context, @Nullable MediaType contentType) {
+        param.setBody(uri, context, contentType);
         return this;
     }
 

diff --git a/rxhttp-compiler/src/main/java/com/rxhttp/compiler/ClassHelper.kt b/rxhttp-compiler/src/main/java/com/rxhttp/compiler/ClassHelper.kt
@@ -1113,13 +1113,13 @@ object ClassHelper {
                     return this;
                 }
                 
-                public RxHttpBodyParam setBody(Context context, Uri uri) {
-                    param.setBody(context, uri);
+                public RxHttpBodyParam setBody(Uri uri, Context context) {
+                    param.setBody(uri, context);
                     return this;
                 }
                 
-                public RxHttpBodyParam setBody(Context context, Uri uri, @Nullable MediaType contentType) {
-                    param.setBody(context, uri, contentType);
+                public RxHttpBodyParam setBody(Uri uri, Context context, @Nullable MediaType contentType) {
+                    param.setBody(uri, context, contentType);
                     return this;
                 }
                 

diff --git a/rxhttp/src/main/java/rxhttp/wrapper/param/BodyParam.kt b/rxhttp/src/main/java/rxhttp/wrapper/param/BodyParam.kt
@@ -5,8 +5,8 @@ import android.net.Uri
 import okhttp3.MediaType
 import okhttp3.RequestBody
 import okio.ByteString
-import rxhttp.wrapper.entity.UriRequestBody
 import rxhttp.wrapper.utils.BuildUtil
+import rxhttp.wrapper.utils.asRequestBody
 import java.io.File
 
 /**
@@ -63,11 +63,11 @@ class BodyParam(
 
     @JvmOverloads
     fun setBody(
-        context: Context,
         uri: Uri,
+        context: Context,
         contentType: MediaType? = null,
     ): BodyParam {
-        requestBody = UriRequestBody(context, uri, contentType)
+        requestBody = uri.asRequestBody(context, contentType)
         return this
     }