+ README

README.md

@@ -18,7 +18,21 @@
 
 
 
-同时具备[Kalle](https://github.com/yanzhenjie/Kalle)的网络缓存/进度监听等特性
+同时完全不影响[Kalle](https://github.com/yanzhenjie/Kalle)的特性
+
+- 九种缓存模式, 缓存加密
+- 上传进度监听
+- 下载进度监听
+- 断点续传
+- 下载文件策略
+- 网络连接判断
+- 自定义数据转换器
+- 网络拦截器
+- 连接重试
+- 自定义请求体
+- 全局配置
+- Cookie
+- SSH证书
 
 
 
@@ -90,6 +104,23 @@ post<Model>(""){
 
 
 
+文件下载
+
+```kotlin
+download("/path", "下载目录"){
+
+  // 进度监听
+  onProgress { progress, byteCount, speed ->
+
+             }
+
+}.dialog(this){
+
+}
+```
+
+
+
 ## 生命周期
 
 将Fragment或者Activity作为参数传递即可在页面关闭时自动取消订阅, 避免操作已销毁视图.
@@ -136,9 +167,25 @@ fun <M> Observable<M>.dialog(
 
 对话框关闭会导致网络请求被取消订阅
 
+## 分页加载
+
+需要引入第三方库: [BRV](https://github.com/liangjingkanji/BRV)
+
+
+
+```kotlin
+post<Model>(""){
+  file("file", File("path"))
+}.page(page) {
+
+}
+```
+
+
+
 ## 缺省页
 
-需要引入第三方库: [StateLayout](https://github.com/liangjingkanji/StateLayout)
+需要引入第三方库: [StateLayout](https://github.com/liangjingkanji/StateLayout) (如果已经引入BRV可以不再引入)
 
 ```
 post<Model>(""){
@@ -161,17 +208,4 @@ post<Model>(""){
 
 会根据参数的不同而给不同的对象添加缺省页状态
 
-## 分页加载
-
-需要引入第三方库: [BRV](https://github.com/liangjingkanji/BRV)
-
-
-
-```kotlin
-post<Model>(""){
-  file("file", File("path"))
-}.page(page) {
-
-}
-```
-
+## 

build.gradle

@@ -8,7 +8,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         // NOTE: Do not place your application dependencies here; they belong

net/src/main/java/com/drake/net/Net.kt

@@ -108,15 +108,16 @@ inline fun <reified M> post(
  */
 fun download(
     path: String,
-    directory: String = NetConfig.App.externalCacheDir!!.absolutePath,
+    directory: String = NetConfig.app.externalCacheDir!!.absolutePath,
     isAbsolutePath: Boolean = false,
     block: (UrlDownload.Api.() -> Unit)? = null
 ): Observable<String> {
 
     return Observable.create<String> {
         try {
-            val download = Kalle.Download.get(if (isAbsolutePath) path else (NetConfig.host + path))
-                .directory(directory)
+            val realPath = if (isAbsolutePath) path else (NetConfig.host + path)
+
+            val download = Kalle.Download.get(realPath).directory(directory)
 
             val filePath = if (block == null) {
                 download.perform()

net/src/main/java/com/drake/net/NetConfig.kt

@@ -18,7 +18,7 @@ import com.yanzhenjie.kalle.KalleConfig
 object NetConfig {
 
     lateinit var host: String
-    lateinit var App: Application
+    lateinit var app: Application
     var listener: NetListener? = null
 
     fun set(block: KalleConfig.Builder.() -> Unit) {
@@ -30,7 +30,7 @@ object NetConfig {
 
 
 fun Application.setDefaultNetConfig(host: String, successCode: Int = 1) {
-    NetConfig.App = this
+    NetConfig.app = this
     NetConfig.host = host
 
     NetConfig.set {

net/src/main/java/com/drake/net/observer/NetObserver.kt

@@ -67,7 +67,7 @@ abstract class NetObserver<M>() : DefaultObserver<M>(), LifecycleObserver {
                     message = "服务器未响应"
                 }
             }
-            Toast.makeText(NetConfig.App, message, Toast.LENGTH_SHORT).show()
+            Toast.makeText(NetConfig.app, message, Toast.LENGTH_SHORT).show()
         }
     }
 }

sample/src/main/java/com/drake/net/sample/MainActivity.kt

@@ -2,7 +2,6 @@ package com.drake.net.sample
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.drake.net.post
 
 class MainActivity : AppCompatActivity() {
 
@@ -10,8 +9,6 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        post<Model>("") {
-            param("key", "value")
-        }
+
     }
 }