From a4864336fe3f3a1e8ac90d96169744521f4b15db Mon Sep 17 00:00:00 2001 From: liujingxing <327744707@qq.com> Date: Sun, 20 Dec 2020 11:41:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=8F=82=E6=95=B0=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kapt/debug/rxhttp/wrapper/param/RxHttpBodyParam.java | 8 ++++---- .../src/main/java/com/rxhttp/compiler/ClassHelper.kt | 8 ++++---- rxhttp/src/main/java/rxhttp/wrapper/param/BodyParam.kt | 6 +++--- 3 files changed, 11 insertions(+), 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 index 271704f6..9a0239d9 100644 --- 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 index fb64a5d5..50486c10 100644 --- 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 index 21629e7c..97ab9699 100644 --- 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 }