drake před 3 roky
rodič
revize
7087e837c9

+ 1 - 1
docs/config.md

@@ -46,7 +46,7 @@
 | setConverter | [转换器](converter.md), 将网络返回的数据转换成你想要的数据结构 |
 | setConverter | [转换器](converter.md), 将网络返回的数据转换成你想要的数据结构 |
 | setRequestInterceptor | [请求拦截器](interceptor.md), 用于添加全局请求头/参数 |
 | setRequestInterceptor | [请求拦截器](interceptor.md), 用于添加全局请求头/参数 |
 | setErrorHandler | [全局错误处理](error-handle.md) |
 | setErrorHandler | [全局错误处理](error-handle.md) |
-| dialogFactory | [全局对话框](auto-dialog.md) |
+| setDialogFactory | [全局对话框](auto-dialog.md) |
 
 
 ## 动态配置
 ## 动态配置
 
 

+ 6 - 6
docs/converter.md

@@ -101,7 +101,7 @@ scopeNetLife {
 
 
         override fun <R> onConvert(succeed: Type, response: Response): R? {
         override fun <R> onConvert(succeed: Type, response: Response): R? {
             try {
             try {
-                return NetConverter.DEFAULT.onConvert<R>(succeed, response)
+                return NetConverter.onConvert<R>(succeed, response)
             } catch (e: ConvertException) {
             } catch (e: ConvertException) {
                 val code = response.code
                 val code = response.code
                 when {
                 when {
@@ -122,8 +122,8 @@ scopeNetLife {
                             bodyString.parseBody<R>(succeed)
                             bodyString.parseBody<R>(succeed)
                         }
                         }
                     }
                     }
-                    code in 400..499 -> throw RequestParamsException(response) // 请求参数错误
-                    code >= 500 -> throw ServerResponseException(response) // 服务器异常错误
+                    code in 400..499 -> throw RequestParamsException(response, code.toString()) // 请求参数错误
+                    code >= 500 -> throw ServerResponseException(response, code.toString()) // 服务器异常错误
                     else -> throw ConvertException(response)
                     else -> throw ConvertException(response)
                 }
                 }
             }
             }
@@ -174,7 +174,7 @@ JSONConvert的核心逻辑
 
 
         override fun <R> onConvert(succeed: Type, response: Response): R? {
         override fun <R> onConvert(succeed: Type, response: Response): R? {
             try {
             try {
-                return NetConverter.DEFAULT.onConvert<R>(succeed, response)
+                return NetConverter.onConvert<R>(succeed, response)
             } catch (e: ConvertException) {
             } catch (e: ConvertException) {
                 val code = response.code
                 val code = response.code
                 when {
                 when {
@@ -196,8 +196,8 @@ JSONConvert的核心逻辑
                             bodyString.parseBody<R>(kType)
                             bodyString.parseBody<R>(kType)
                         }
                         }
                     }
                     }
-                    code in 400..499 -> throw RequestParamsException(response) // 请求参数错误
-                    code >= 500 -> throw ServerResponseException(response) // 服务器异常错误
+                    code in 400..499 -> throw RequestParamsException(response, code.toString()) // 请求参数错误
+                    code >= 500 -> throw ServerResponseException(response, code.toString()) // 服务器异常错误
                     else -> throw ConvertException(response)
                     else -> throw ConvertException(response)
                 }
                 }
             }
             }

+ 2 - 2
docs/request.md

@@ -20,11 +20,11 @@ POST, DELETE, PUT, PATCH // Body request
 scopeNetLife {
 scopeNetLife {
     Get<String>("api") {
     Get<String>("api") {
         // this 即为 UrlRequest
         // this 即为 UrlRequest
-    }.await
+    }.await()
 
 
     Post<String>("api") {
     Post<String>("api") {
         // this 即为 BodyRequest
         // this 即为 BodyRequest
-    }.await
+    }.await()
 }
 }
 ```
 ```
 
 

+ 1 - 1
docs/updates.md

@@ -19,7 +19,7 @@ NetException子类不会被ConvertException包裹, 所以要捕获转换器中
 1. 修复临时下载文件错误问题
 1. 修复临时下载文件错误问题
 2. 修复ViewModel作用域复用问题
 2. 修复ViewModel作用域复用问题
 
 
-## 3.0.9
+## 3.0.10
 升级Tooltip依赖, 解决使用Tooltip_V1.1.1依赖时Net存在崩溃问题
 升级Tooltip依赖, 解决使用Tooltip_V1.1.1依赖时Net存在崩溃问题
 
 
 ## 3.0.9
 ## 3.0.9

+ 1 - 1
net/src/main/java/com/drake/net/convert/JSONConvert.kt

@@ -44,7 +44,7 @@ abstract class JSONConvert(
 
 
     override fun <R> onConvert(succeed: Type, response: Response): R? {
     override fun <R> onConvert(succeed: Type, response: Response): R? {
         try {
         try {
-            return NetConverter.DEFAULT.onConvert<R>(succeed, response)
+            return NetConverter.onConvert<R>(succeed, response)
         } catch (e: ConvertException) {
         } catch (e: ConvertException) {
             val code = response.code
             val code = response.code
             when {
             when {

+ 1 - 1
sample/src/main/java/com/drake/net/sample/converter/SerializationConverter.kt

@@ -30,7 +30,7 @@ class SerializationConverter(
 
 
     override fun <R> onConvert(succeed: Type, response: Response): R? {
     override fun <R> onConvert(succeed: Type, response: Response): R? {
         try {
         try {
-            return NetConverter.DEFAULT.onConvert<R>(succeed, response)
+            return NetConverter.onConvert<R>(succeed, response)
         } catch (e: ConvertException) {
         } catch (e: ConvertException) {
             val code = response.code
             val code = response.code
             when {
             when {