代码优化

chenxyu · May 15, 2021 · b93e2cb · b93e2cb
1 parent fe42d0a
commit b93e2cb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -5,8 +5,8 @@
 # 依赖版本
 | Dependency | Version |
 |--|--|
-| kotlin | 1.4.21 |
-| kotlinx-coroutines-android | 1.4.2 |
+| kotlin | 1.4.32 |
+| kotlinx-coroutines-android | 1.4.3 |
 | retrofit | 2.9.0 |
 
 # Gradle 依赖
@@ -26,7 +26,7 @@ allprojects {
 
 ```kotlin
 dependencies {
-	implementation 'com.github.chenxyu:retrofit-adapter-flow:1.1.3'
+	implementation 'com.github.chenxyu:retrofit-adapter-flow:1.1.4'
 }
 ```
 

diff --git a/adapter-flow/build.gradle b/adapter-flow/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 10
-        versionName "1.1.3"
+        versionCode 11
+        versionName "1.1.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'

diff --git a/adapter-flow/src/main/java/com/chenxyu/retrofit/adapter/FlowCallAdapter.kt b/adapter-flow/src/main/java/com/chenxyu/retrofit/adapter/FlowCallAdapter.kt
@@ -4,6 +4,7 @@ import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.channels.sendBlocking
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
 import retrofit2.Call
@@ -34,8 +35,12 @@ internal class FlowCallAdapter<R>(private val responseType: Type) :
                             if (body == null || response.code() == 204) {
                                 cancel(CancellationException("HTTP status code: ${response.code()}"))
                             } else {
-                                offer(body)
-                                channel.close()
+                                try {
+                                    sendBlocking(body)
+                                    close()
+                                } catch (e: Exception) {
+                                    cancel(CancellationException(e.localizedMessage, e))
+                                }
                             }
                         } else {
                             cancel(CancellationException(errorMsg(response) ?: "unknown error"))

diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.4.21'
-    ext.kotlinx_coroutines_version = '1.4.2'
+    ext.kotlin_version = '1.4.32'
+    ext.kotlinx_coroutines_version = '1.4.3'
     repositories {
         google()
         jcenter()