更新了使用方法

JiangHaiYang01 · Jun 23, 2020 · b9bcd5e · b9bcd5e
1 parent dc17400
commit b9bcd5e
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 54 deletions.
diff --git a/app/src/main/java/com/allens/rxhttp/MainActivity.kt b/app/src/main/java/com/allens/rxhttp/MainActivity.kt
@@ -32,7 +32,10 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
             .connectTimeout(10)
             .addBuilderClientListener(object : OnBuildClientListener {
                 override fun addBuildClient(): MutableSet<Any> {
-                    return mutableSetOf(GsonConverterFactory.create(),RxJava2CallAdapterFactory.create())
+                    return mutableSetOf(
+                        GsonConverterFactory.create(),
+                        RxJava2CallAdapterFactory.create()
+                    )
                 }
             })
             .build(this)
@@ -54,17 +57,20 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
 
     private fun postRequest() {
         launch {
-            val data = rxHttp
+            rxHttp
                 .create()
                 .addParameter("title", "123456")
                 .addParameter("author", "123456")
                 .addParameter("link", "123456")
                 .doPost("lg/collect/add/json", TestBean::class.java)
-            rxHttp.checkResult(data, {
-                log.text = it.toString()
-            }, {
-                log.text = it.toString()
-            })
+                .result(
+                    {
+                        log.text = it.toString()
+                    },
+                    {
+                        log.text = it.message.toString()
+                    }
+                )
         }
     }
 
@@ -76,15 +82,13 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
                 .create()
                 .addParameter("k", "java")
                 .doGet(parameter = "wxarticle/chapters/json", tClass = TestBean::class.java)
-
-            Log.i(TAG, "收到响应 $data thread ${Thread.currentThread().name}")
-            rxHttp.checkResult(data, {
-                Log.i(TAG, "success ${Thread.currentThread().name} info $it ")
-                log.text = it.toString()
-            }, {
-                Log.i(TAG, "error ${Thread.currentThread().name} info ${it.toString()} ")
-                log.text = it.toString()
-            })
+                .result({
+                    Log.i(TAG, "success ${Thread.currentThread().name} info $it ")
+                    log.text = it.toString()
+                }, {
+                    Log.i(TAG, "error ${Thread.currentThread().name} info ${it.toString()} ")
+                    log.text = it.toString()
+                })
         }
     }
 }
diff --git a/lib_http-coroutine/src/main/java/com/allens/lib_http2/RxHttp.kt b/lib_http-coroutine/src/main/java/com/allens/lib_http2/RxHttp.kt
@@ -157,19 +157,6 @@ class RxHttp {
         return RequestBuilder()
     }
 
-
-    inline fun <T : Any> checkResult(
-        result: HttpResult<T>,
-        success: (T) -> Unit,
-        error: (String?) -> Unit
-    ) {
-        if (result is HttpResult.Success) {
-            success(result.data)
-        } else if (result is HttpResult.Error) {
-            error(result.throwable.message)
-        }
-    }
-
     //格式化小数
     fun bytes2kb(bytes: Long): String {
         return FileTool.bytes2kb(bytes)

diff --git a/lib_http-coroutine/src/main/java/com/allens/lib_http2/core/HttpResult.kt b/lib_http-coroutine/src/main/java/com/allens/lib_http2/core/HttpResult.kt
@@ -11,4 +11,18 @@ sealed class HttpResult<out T : Any> {
             is Error -> "Error[throwable=$throwable]"
         }
     }
+
+    inline fun result(
+        success: (T) -> Unit,
+        error: (Throwable) -> Unit
+    ) {
+        when (this) {
+            is Success -> {
+                success(data)
+            }
+            is Error -> {
+                error(throwable)
+            }
+        }
+    }
 }
diff --git a/lib_http-coroutine/src/main/java/com/allens/lib_http2/tools/RequestBuilder.kt b/lib_http-coroutine/src/main/java/com/allens/lib_http2/tools/RequestBuilder.kt
@@ -180,18 +180,19 @@ class RequestBuilder {
                 listener.opUploadPrepare(tag)
             }
             val doUpload = doUpload(url, tClass)
-            checkResult(doUpload, {
-                withContext(Dispatchers.Main) {
-                    listener.onUpLoadSuccess(tag, it)
-                }
-
-                UpLoadPool.remove(tag)
-            }, {
-                withContext(Dispatchers.Main) {
-                    listener.onUpLoadFailed(tag, throwable = it)
-                }
-                UpLoadPool.remove(tag)
-            })
+                .result(
+                    {
+                        withContext(Dispatchers.Main) {
+                            listener.onUpLoadSuccess(tag, it)
+                        }
+
+                        UpLoadPool.remove(tag)
+                    }, {
+                        withContext(Dispatchers.Main) {
+                            listener.onUpLoadFailed(tag, throwable = it)
+                        }
+                        UpLoadPool.remove(tag)
+                    })
         }
     }
 
@@ -200,17 +201,4 @@ class RequestBuilder {
         UpLoadPool.remove(tag)
     }
 
-
-    private inline fun <T : Any> checkResult(
-        result: HttpResult<T>,
-        success: (T) -> Unit,
-        error: (Throwable) -> Unit
-    ) {
-        if (result is HttpResult.Success) {
-            success(result.data)
-        } else if (result is HttpResult.Error) {
-            error(result.throwable)
-        }
-    }
-
 }