Browse Source

添加MediaConst来描述常用MediaType

drake 3 years ago
parent
commit
69d3981941

+ 6 - 6
net/src/main/java/com/drake/net/request/BodyRequest.kt

@@ -34,7 +34,7 @@ open class BodyRequest : BaseRequest() {
     open var body: RequestBody? = null
     open var partBody: MultipartBody.Builder by lazyField { MultipartBody.Builder() }
     open var formBody: FormBody.Builder by lazyField { FormBody.Builder() }
-    open var mediaType: MediaType = MediaType.FORM
+    open var mediaType: MediaType = MediaConst.FORM
     override var method = Method.POST
 
     //<editor-fold desc="Param">
@@ -90,23 +90,23 @@ open class BodyRequest : BaseRequest() {
 
     //<editor-fold desc="JSON">
     fun json(body: JSONObject?) {
-        this.body = body?.toString()?.toRequestBody(MediaType.JSON)
+        this.body = body?.toString()?.toRequestBody(MediaConst.JSON)
     }
 
     fun json(body: JSONArray?) {
-        this.body = body?.toString()?.toRequestBody(MediaType.JSON)
+        this.body = body?.toString()?.toRequestBody(MediaConst.JSON)
     }
 
     fun json(body: String?) {
-        this.body = body?.toRequestBody(MediaType.JSON)
+        this.body = body?.toRequestBody(MediaConst.JSON)
     }
 
     fun json(body: Map<String, Any?>?) {
-        this.body = JSONObject(body ?: return).toString().toRequestBody(MediaType.JSON)
+        this.body = JSONObject(body ?: return).toString().toRequestBody(MediaConst.JSON)
     }
 
     fun json(vararg body: Pair<String, Any?>) {
-        this.body = JSONObject(body.toMap()).toString().toRequestBody(MediaType.JSON)
+        this.body = JSONObject(body.toMap()).toString().toRequestBody(MediaConst.JSON)
     }
     //</editor-fold>
 

+ 14 - 23
net/src/main/java/com/drake/net/request/MediaType.kt

@@ -16,38 +16,29 @@
 
 package com.drake.net.request
 
-import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaType
 
+object MediaConst {
 
-val MediaType.Companion.IMG: MediaType
-    get() = "image/*".toMediaType()
+    val IMG = "image/*".toMediaType()
 
-val MediaType.Companion.GIF: MediaType
-    get() = "image/gif".toMediaType()
+    val GIF = "image/gif".toMediaType()
 
-val MediaType.Companion.JPEG: MediaType
-    get() = "image/jpeg".toMediaType()
+    val JPEG = "image/jpeg".toMediaType()
 
-val MediaType.Companion.PNG: MediaType
-    get() = "image/png".toMediaType()
+    val PNG = "image/png".toMediaType()
 
-val MediaType.Companion.MP4: MediaType
-    get() = "video/mpeg".toMediaType()
+    val MP4 = "video/mpeg".toMediaType()
 
-val MediaType.Companion.TXT: MediaType
-    get() = "text/plain".toMediaType()
+    val TXT = "text/plain".toMediaType()
 
-val MediaType.Companion.JSON: MediaType
-    get() = "application/json; charset=utf-8".toMediaType()
+    val JSON = "application/json; charset=utf-8".toMediaType()
 
-val MediaType.Companion.XML: MediaType
-    get() = "application/xml".toMediaType()
+    val XML = "application/xml".toMediaType()
 
-val MediaType.Companion.HTML: MediaType
-    get() = "text/html".toMediaType()
+    val HTML = "text/html".toMediaType()
 
-val MediaType.Companion.FORM: MediaType
-    get() = "multipart/form-data".toMediaType()
+    val FORM = "multipart/form-data".toMediaType()
 
-val MediaType.Companion.URLENCODED: MediaType
-    get() = "application/x-www-form-urlencoded".toMediaType()
+    val URLENCODED = "application/x-www-form-urlencoded".toMediaType()
+}