修改retrofit版本号补提

tencentyun · Oct 16, 2024 · 34e52f2 · 34e52f2
1 parent 926b915
commit 34e52f2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/app/src/main/java/com/tencent/iot/explorer/link/retrofit/StringRequest.kt b/app/src/main/java/com/tencent/iot/explorer/link/retrofit/StringRequest.kt
@@ -92,7 +92,7 @@ class StringRequest private constructor() {
                     callback.success(response.body(), reqCode)
                 } else {
                     L.d(TAG, "请求成功：${response.errorBody()}")
-                    callback.success(response.errorBody().string(), reqCode)
+                    callback.success(response.errorBody()?.string(), reqCode)
                 }
             }
         })
@@ -123,7 +123,7 @@ class StringRequest private constructor() {
                         callback.success(response.body(), reqCode)
                     } else {
                         L.d(TAG, "请求成功：${response.errorBody()}")
-                        callback.success(response.errorBody().string(), reqCode)
+                        callback.success(response.errorBody()?.string(), reqCode)
                     }
                 }
 
@@ -155,7 +155,7 @@ class StringRequest private constructor() {
                         callback.success(response.body(), reqCode)
                     } else {
                         L.d(TAG, "请求成功：${response.errorBody()}")
-                        callback.success(response.errorBody().string(), reqCode)
+                        callback.success(response.errorBody()?.string(), reqCode)
                     }
                 }
 
@@ -187,7 +187,7 @@ class StringRequest private constructor() {
                         callback.success(response.body(), reqCode)
                     } else {
                         L.d(TAG, "请求成功：${response.errorBody()}")
-                        callback.success(response.errorBody().string(), reqCode)
+                        callback.success(response.errorBody()?.string(), reqCode)
                     }
                 }
 
@@ -235,7 +235,7 @@ class StringRequest private constructor() {
                         callback.success(response.body(), reqCode)
                     } else {
                         L.d(TAG, "请求成功：${response.errorBody()}")
-                        callback.success(response.errorBody().string(), reqCode)
+                        callback.success(response.errorBody()?.string(), reqCode)
                     }
                 }
 
@@ -276,7 +276,7 @@ class StringRequest private constructor() {
                         callback.success(response.body(), reqCode)
                     } else {
                         L.d(TAG, "请求成功：${response.errorBody()}")
-                        callback.success(response.errorBody().string(), reqCode)
+                        callback.success(response.errorBody()?.string(), reqCode)
                     }
                 }
 

diff --git a/app/src/main/java/com/tencent/iot/explorer/link/retrofit/adapter/StringCallAdapterFactory.kt b/app/src/main/java/com/tencent/iot/explorer/link/retrofit/adapter/StringCallAdapterFactory.kt
@@ -12,25 +12,26 @@ class StringCallAdapterFactory private constructor() : CallAdapter.Factory() {
         type: Type?,
         array: Array<out Annotation>?,
         retrofit: Retrofit?
-    ): CallAdapter<*>? {
+    ): CallAdapter<Any, String>? {
         if (type == String::class.java)
             return StringCallAdapter()
         return null
     }
 
-    inner class StringCallAdapter : CallAdapter<String> {
-        override fun <R : Any?> adapt(call: Call<R>?): String {
+    inner class StringCallAdapter : CallAdapter<Any, String> {
+        override fun responseType(): Type {
+            return String::class.java
+        }
+
+        override fun adapt(call: Call<Any>): String {
             try {
-                return call?.execute()?.body().toString()
+                return call.execute().body().toString()
             } catch (e: Exception) {
                 e.printStackTrace()
             }
             return ""
         }
 
-        override fun responseType(): Type {
-            return String::class.java
-        }
     }
 
     companion object {