Browse Source

升级依赖
支持协程1.6.0

drake 2 years ago
parent
commit
e6fe080d00

+ 3 - 3
build.gradle

@@ -19,11 +19,11 @@
 buildscript {
     ext {
         kotlin_version = '1.5.21'
-        brv_version = '1.3.62'
-        coroutine_version = '1.5.1'
+        brv_version = '1.3.71'
+        coroutine_version = '1.6.0'
         glide_version = '4.11.0'
         room_version = "2.3.0"
-        okhttp_version = "4.9.1"
+        okhttp_version = "4.9.3"
     }
 
     repositories {

+ 2 - 3
net/src/main/java/com/drake/net/utils/FlowUtils.kt

@@ -84,7 +84,7 @@ inline fun <T> Flow<T>.launchIn(
  * @param timeoutMillis 节流阀超时时间/单位毫秒, 默认值为800
  */
 @OptIn(ExperimentalCoroutinesApi::class, FlowPreview::class)
-fun EditText.debounce(timeoutMillis: Long = 800) = callbackFlow<String> {
+fun EditText.debounce(timeoutMillis: Long = 800) = callbackFlow {
 
     val textWatcher = object : TextWatcher {
 
@@ -106,10 +106,9 @@ fun EditText.debounce(timeoutMillis: Long = 800) = callbackFlow<String> {
         }
 
         override fun afterTextChanged(s: Editable) {
-            offer(s.toString())
+            trySend(s.toString())
         }
     }
-
     addTextChangedListener(textWatcher)
     awaitClose { this@debounce.removeTextChangedListener(textWatcher) }
 }.debounce(timeoutMillis)

+ 2 - 2
sample/build.gradle

@@ -103,8 +103,8 @@ dependencies {
     implementation "com.github.bumptech.glide:glide:$glide_version" // 图片加载库
     implementation 'com.github.liangjingkanji:StatusBar:2.0.2' // 透明状态栏
     implementation 'com.github.liangjingkanji:debugkit:1.2.11' // 开发调试窗口工具
-    implementation "com.github.liangjingkanji:Tooltip:1.1.7" // 吐司工具
-    implementation 'com.github.liangjingkanji:Engine:0.0.60'
+    implementation "com.github.liangjingkanji:Tooltip:1.2.1" // 吐司工具
+    implementation 'com.github.liangjingkanji:Engine:0.0.62'
 
     // ------------------------------Google数据库-------------------------------------
     implementation "androidx.room:room-runtime:$room_version"

+ 2 - 2
sample/src/main/java/com/drake/net/sample/base/App.kt

@@ -19,7 +19,7 @@ package com.drake.net.sample.base
 import android.app.Application
 import com.chuckerteam.chucker.api.ChuckerCollector
 import com.chuckerteam.chucker.api.ChuckerInterceptor
-import com.drake.brv.BindingAdapter
+import com.drake.brv.utils.BRV
 import com.drake.net.NetConfig
 import com.drake.net.cookie.PersistentCookieJar
 import com.drake.net.interceptor.LogRecordInterceptor
@@ -111,7 +111,7 @@ class App : Application() {
             ClassicsFooter(context)
         }
 
-        BindingAdapter.modelId = BR.m
+        BRV.modelId = BR.m
     }
 }