Selaa lähdekoodia

| 无网络提示

drake 5 vuotta sitten
vanhempi
commit
119be7e924

+ 1 - 1
README.md

@@ -79,7 +79,7 @@ implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0'
 // 支持自动下拉刷新和缺省页的, 可选
 implementation 'com.github.liangjingkanji:BRV:1.2.1'
 
-implementation 'com.github.liangjingkanji:Net:2.0.5'
+implementation 'com.github.liangjingkanji:Net:2.0.6'
 ```
 
 

+ 6 - 3
net/src/main/java/com/drake/net/NetConfig.kt

@@ -18,6 +18,7 @@ import com.drake.net.scope.DialogCoroutineScope
 import com.drake.tooltip.toast
 import com.yanzhenjie.kalle.Kalle
 import com.yanzhenjie.kalle.KalleConfig
+import com.yanzhenjie.kalle.connect.BroadcastNetwork
 import com.yanzhenjie.kalle.exception.*
 import com.yanzhenjie.kalle.simple.cache.DiskCacheStore
 import java.util.concurrent.ExecutionException
@@ -49,7 +50,6 @@ object NetConfig {
             is NullPointerException -> app.getString(R.string.net_null_error)
             is ResponseException -> msg
             else -> app.getString(R.string.net_other_error)
-
         }
 
         printStackTrace()
@@ -99,8 +99,11 @@ fun Application.initNet(host: String, config: KalleConfig.Builder.() -> Unit = {
     NetConfig.host = host
     NetConfig.app = this
     val builder = KalleConfig.newBuilder()
-    builder.connectFactory(OkHttpConnectFactory.newBuilder().build())
-    builder.config()
+    builder.apply {
+        connectFactory(OkHttpConnectFactory.newBuilder().build())
+        network(BroadcastNetwork(this@initNet))
+        config()
+    }
     Kalle.setConfig(builder.build())
 }
 

+ 1 - 1
net/src/main/res/values/strings.xml

@@ -5,7 +5,7 @@
     <!--网络请求异常-->
     <string name="net_network_error">当前网络不可用</string>
     <string name="net_url_error">请求资源地址错误</string>
-    <string name="net_host_error">网络连接不可用</string>
+    <string name="net_host_error">无法找到指定服务器主机</string>
     <string name="net_connect_timeout_error">连接服务器超时,请重试</string>
     <string name="net_connect_exception">请检查网络连接</string>
     <string name="net_read_exception">读取数据错误</string>

+ 0 - 8
sample/src/main/java/com/drake/net/sample/App.kt

@@ -1,7 +1,6 @@
 package com.drake.net.sample
 
 import android.app.Application
-import android.util.Log
 import com.drake.net.cacheEnabled
 import com.drake.net.initNet
 import com.drake.statelayout.StateConfig
@@ -31,13 +30,6 @@ class App : Application() {
                         })*/
 
             cacheEnabled()
-
-            addInterceptor { chain ->
-
-                val request = chain.request()
-                Log.d("日志", "(App.kt:37)    url = ${request.url()}")
-                chain.proceed(request)
-            }
         }
 
         SmartRefreshLayout.setDefaultRefreshHeaderCreator { context, layout ->

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

@@ -23,14 +23,14 @@ class MainActivity : AppCompatActivity() {
                 Log.d("日志", "(MainActivity.kt:50)    网络")
 
                 val data = get<String>(
-                    "https://raw.githubusercontent.com/liangjingkanji/BRV/master/README.md/",
+                    "https://raw.githubusercontent.com/liangjingkanji/BRV/master/README.md",
                     CacheMode.NETWORK_YES_THEN_WRITE_CACHE,
                     true
                 )
 
                 textView.text = data.await()
 
-            }.cache(false) {
+            }.cache(true) {
 
                 Log.d("日志", "(MainActivity.kt:57)    缓存")