| 发起请求函数命名变动

build.gradle

@@ -1,11 +1,9 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.61'
-
     ext {
-        kotlin_version = '1.3.61'
-        brv_version = '1.2.12'
+        kotlin_version = '1.3.72'
+        brv_version = '1.3.1'
         coroutine_version = '1.3.0'
         glide_version = '4.9.0'
         room_version = "2.2.5"
@@ -17,7 +15,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Apr 16 16:41:43 CST 2020
+#Mon Jun 22 01:18:38 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

sample/build.gradle

@@ -31,7 +31,7 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "androidx.appcompat:appcompat:1.1.0"
-    implementation "androidx.core:core-ktx:1.2.0"
+    implementation "androidx.core:core-ktx:1.3.0"
     implementation "androidx.constraintlayout:constraintlayout:1.1.3"
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     testImplementation "junit:junit:4.13"

sample/src/main/java/com/drake/net/sample/ui/fragment/Demo.java

@@ -1,14 +0,0 @@
-/*
- * Copyright (C) 2018, Umbrella CompanyLimited All rights reserved.
- * Project：Net
- * Author：Drake
- * Date：4/24/20 12:07 AM
- */
-
-package com.drake.net.sample.ui.fragment;
-
-public class Demo {
-    public static void main(String[] args) {
-
-    }
-}

sample/src/main/java/com/drake/net/sample/ui/fragment/ExceptionTraceFragment.kt

@@ -34,7 +34,6 @@ class ExceptionTraceFragment : Fragment() {
         scopeNetLife {
             // 这是一个错误的地址, 请查看LogCat的错误信息, 在[Convert]中你也可以进行自定义错误信息打印
             tv_fragment.text = Get<String>("").await()
-
         }
     }
 

sample/src/main/java/com/drake/net/sample/ui/fragment/PushRefreshFragment.kt

@@ -27,7 +27,6 @@ class PushRefreshFragment : Fragment() {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-
     }
 
 }

sample/src/main/java/com/drake/net/sample/ui/fragment/UploadFileFragment.kt

@@ -12,7 +12,11 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import com.drake.net.Post
 import com.drake.net.sample.R
+import com.drake.net.utils.scopeNetLife
+import com.yanzhenjie.kalle.FormBody
+import kotlinx.android.synthetic.main.fragment_upload_file.*
 
 
 class UploadFileFragment : Fragment() {
@@ -28,24 +32,26 @@ class UploadFileFragment : Fragment() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        /*   scopeNetLife {
-               val fileDir = requireContext().cacheDir.path
+        scopeNetLife {
+            val fileDir = requireContext().cacheDir.path
 
-               Post<String>("download/img", fileDir) {
 
-                   // 下载进度回调 (普通接口或者上传进度也可以监听)
-                   onProgress { progress, byteCount, speed ->
+            Post<String>("download/img", fileDir) {
 
-                       seek.progress = progress // 进度条
-                       // 格式化显示单位
-                       val downloadSize = Formatter.formatFileSize(requireContext(), byteCount)
-                       val downloadSpeed = Formatter.formatFileSize(requireContext(), speed)
+                val form = FormBody.newBuilder().build().onProgress { origin, progress ->
+                    seek.progress = progress // 进度条
+                    // 格式化显示单位
+                    val downloadSize =
+                        android.text.format.Formatter.formatFileSize(requireContext(), 23)
+                    val downloadSpeed =
+                        android.text.format.Formatter.formatFileSize(requireContext(), 23)
 
-                       // 显示下载信息
-                       tv_progress.text = "上传进度: $progress% 已下载: $downloadSize 下载速度: $downloadSpeed"
-                   }
-               }.await()
-           }*/
+                    // 显示下载信息
+                    tv_progress.text = "上传进度: $progress% 已下载: $downloadSize 下载速度: $downloadSpeed"
+                }
+
+            }.await()
+        }
 
     }
 

sample/src/main/res/navigation/nav_main.xml

@@ -9,7 +9,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main"
-    app:startDestination="@id/request_method">
+    app:startDestination="@id/download_file">
 
     <fragment
         android:id="@+id/async_task"