BaseRetrofitClient 优化

shenbengit · Aug 7, 2023 · ff1b310 · ff1b310
1 parent 84fd3c8
commit ff1b310
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -85,7 +85,7 @@ afterEvaluate {
                 // You can then customize attributes of the publication as shown below.
                 groupId = 'com.shencoder'
                 artifactId = 'mvvmkit'
-                version = '1.1.3'
+                version = '1.1.4'
             }
         }
     }

diff --git a/lib/src/main/java/com/shencoder/mvvmkit/http/BaseRetrofitClient.kt b/lib/src/main/java/com/shencoder/mvvmkit/http/BaseRetrofitClient.kt
@@ -17,20 +17,28 @@ abstract class BaseRetrofitClient {
 
     abstract fun generateOkHttpBuilder(builder: OkHttpClient.Builder): OkHttpClient.Builder
 
-    open fun generateRetrofitBuilder(builder: Retrofit.Builder): Retrofit.Builder{
+    open fun generateRetrofitBuilder(builder: Retrofit.Builder): Retrofit.Builder {
         return builder
     }
 
-    fun <T> getApiService(service: Class<T>, baseUrl: String): T {
-        //默认添加对Moshi的支持
-        val moshi = Moshi.Builder()
-            .addLast(KotlinJsonAdapterFactory())
-            .build()
-
+    @JvmOverloads
+    fun <T> getApiService(
+        service: Class<T>,
+        baseUrl: String,
+        useDefaultMoshiConverterFactory: Boolean = true
+    ): T {
         val retrofitBuilder = Retrofit.Builder()
             .baseUrl(baseUrl)
             .client(generateOkHttpBuilder(OkHttpClient.Builder()).build())
-            .addConverterFactory(MoshiConverterFactory.create(moshi))
+            .also {
+                if (useDefaultMoshiConverterFactory) {
+                    //默认添加对Moshi的支持
+                    val moshi = Moshi.Builder()
+                        .addLast(KotlinJsonAdapterFactory())
+                        .build()
+                    it.addConverterFactory(MoshiConverterFactory.create(moshi))
+                }
+            }
 
         return generateRetrofitBuilder(retrofitBuilder)
             .build().create(service)