优化下载代码

Author: catchpig

CHANGE_lOG.md

@@ -1,4 +1,8 @@
 # CHANGE LOG
+### v0.4.3(2022.4.20)
+
++ 优化下载代码
+
 ### v0.4.2(2022.4.19)
 
 + 文件下载增加协程方式

README.md

@@ -558,12 +558,20 @@ class ResponseBodyConverter :
 | interceptors     | Interceptor | 否   | Interceptor          | http拦截器        |
 | debugInterceptors| Interceptor | 否   | Interceptor          | debug模式下的http拦截器,只有NetManager.setDebug(true),才会生效 |
 
-### 8. 文件下载器([DownloadManager](./mvvm/src/main/java/com/catchpig/mvvm/manager/DownloadManager.kt)))
+### 8. 文件下载器([DownloadManager](./mvvm/src/main/java/com/catchpig/mvvm/manager/DownloadManager.kt))-支持协程方式和RxJava两种方式的下载([RxJavaDownloadManager](./mvvm/src/main/java/com/catchpig/mvvm/listener/RxJavaDownloadManager.kt)、[CoroutinesDownloadManager](./mvvm/src/main/java/com/catchpig/mvvm/listener/CoroutinesDownloadManager.kt))
+
++ 设置下载路径
+
+  ```kotlin
+  DownloadManager.setDownloadPath("${ContextManager.context.externalCacheDir!!.absolutePath}/kmvvmDownload")
+  ```
+
+  
 
 + 单文件下载方法download([DownloadCallback](./mvvm/src/main/java/com/catchpig/mvvm/listener/DownloadCallback.kt))
 
 ```kotlin
-DownloadManager.download(downloadUrl, {
+RxJavaDownloadManager.download(downloadUrl, {
         //下载完成回调
     }, { downloadProgress ->
         //下载进度回调

app/src/main/java/com/catchpig/kmvvm/apk/viewmodel/InstallApkViewModel.kt

@@ -5,7 +5,6 @@ import androidx.lifecycle.viewModelScope
 import com.catchpig.mvvm.base.viewmodel.BaseViewModel
 import com.catchpig.mvvm.entity.DownloadProgress
 import com.catchpig.mvvm.network.manager.CoroutinesDownloadManager
-import com.catchpig.mvvm.network.manager.RxJavaDownloadManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
@@ -36,6 +35,7 @@ class InstallApkViewModel : BaseViewModel() {
 //            }, { downloadProgress ->
 //                progressLiveData1.value = downloadProgress
 //            })
+            CoroutinesDownloadManager.clearFiles()
             CoroutinesDownloadManager.download(downloadUrlpng, {
 
             }, { downloadProgress ->

app/src/main/java/com/catchpig/kmvvm/app/KotlinMvpApp.kt

@@ -3,6 +3,8 @@ package com.catchpig.kmvvm.app
 import android.app.Application
 import com.catchpig.kmvvm.BuildConfig
 import com.catchpig.kmvvm.R
+import com.catchpig.mvvm.manager.ContextManager
+import com.catchpig.mvvm.network.manager.DownloadManager
 import com.catchpig.mvvm.network.manager.NetManager
 import com.scwang.smart.refresh.footer.ClassicsFooter
 import com.scwang.smart.refresh.header.MaterialHeader
@@ -29,5 +31,6 @@ class KotlinMvpApp : Application() {
     override fun onCreate() {
         super.onCreate()
         NetManager.setDebug(BuildConfig.DEBUG)
+        DownloadManager.setDownloadPath("${ContextManager.context.externalCacheDir!!.absolutePath}/kmvvmDownload")
     }
 }

mvvm/src/main/java/com/catchpig/mvvm/network/manager/CoroutinesDownloadManager.kt

@@ -21,7 +21,7 @@ import java.net.URL
  * @author catchpig
  * @date 2020/11/20 10:25
  */
-object CoroutinesDownloadManager : BaseDownloadManager() {
+object CoroutinesDownloadManager : DownloadManager() {
     private var downloadServiceMap: MutableMap<String, CoroutinesDownloadService> = ArrayMap()
 
     private fun getDowLoadService(baseUrl: String): CoroutinesDownloadService {

…m/network/manager/BaseDownloadManager.kt …/mvvm/network/manager/DownloadManager.ktmvvm/src/main/java/com/catchpig/mvvm/network/manager/BaseDownloadManager.kt renamed to mvvm/src/main/java/com/catchpig/mvvm/network/manager/DownloadManager.kt mvvm/src/main/java/com/catchpig/mvvm/network/manager/BaseDownloadManager.kt renamed to mvvm/src/main/java/com/catchpig/mvvm/network/manager/DownloadManager.kt

@@ -3,6 +3,7 @@ package com.catchpig.mvvm.network.manager
 import android.os.Environment
 import com.catchpig.mvvm.manager.ContextManager
 import com.catchpig.mvvm.network.interceptor.DownloadInterceptor
+import com.catchpig.utils.ext.deleteAll
 import okhttp3.OkHttpClient
 import okhttp3.ResponseBody
 import okhttp3.logging.HttpLoggingInterceptor
@@ -12,7 +13,7 @@ import java.io.RandomAccessFile
 import java.nio.channels.FileChannel
 import java.util.concurrent.TimeUnit
 
-open class BaseDownloadManager {
+open class DownloadManager {
     companion object {
         /**
          * 连接超时时间(秒)
@@ -23,40 +24,53 @@ open class BaseDownloadManager {
          * 读取数据超时时间(分钟)
          */
         private const val READ_TIMEOUT = 10L
-    }
 
+        /**
+         * 下载路径
+         */
+        private var downloadPath: String? = null
 
-    private val logInterceptor by lazy {
-        val httpLoggingInterceptor = HttpLoggingInterceptor()
-        httpLoggingInterceptor.level = HttpLoggingInterceptor.Level.BODY
-        httpLoggingInterceptor
-    }
+        private val logInterceptor by lazy {
+            val httpLoggingInterceptor = HttpLoggingInterceptor()
+            httpLoggingInterceptor.level = HttpLoggingInterceptor.Level.BODY
+            httpLoggingInterceptor
+        }
 
-    protected val downloadInterceptor by lazy {
-        DownloadInterceptor()
-    }
+        val downloadInterceptor by lazy {
+            DownloadInterceptor()
+        }
+
+        private var okHttpClient: OkHttpClient? = null
 
-    private var okHttpClient: OkHttpClient? = null
+        fun getOkHttpClient(): OkHttpClient {
+            if (okHttpClient == null) {
+                okHttpClient = OkHttpClient
+                    .Builder()
+                    /**
+                     * 连接超时时间5秒
+                     */
+                    .connectTimeout(CONNECT_TIMEOUT, TimeUnit.SECONDS)
+                    /**
+                     * 读取数据超时时间10分钟
+                     */
+                    .readTimeout(READ_TIMEOUT, TimeUnit.MINUTES)
+                    .addInterceptor(logInterceptor)
+                    .addInterceptor(downloadInterceptor)
+                    .build()
+            }
+            return okHttpClient!!
+        }
 
-    protected fun getOkHttpClient(): OkHttpClient {
-        if (okHttpClient == null) {
-            okHttpClient = OkHttpClient
-                .Builder()
-                /**
-                 * 连接超时时间5秒
-                 */
-                .connectTimeout(CONNECT_TIMEOUT, TimeUnit.SECONDS)
-                /**
-                 * 读取数据超时时间10分钟
-                 */
-                .readTimeout(READ_TIMEOUT, TimeUnit.MINUTES)
-                .addInterceptor(logInterceptor)
-                .addInterceptor(downloadInterceptor)
-                .build()
+        /**
+         * 设置下载路径
+         * @param path String
+         */
+        fun setDownloadPath(path: String) {
+            downloadPath = path
         }
-        return okHttpClient!!
     }
 
+
     /**
      * 生成文件的地址
      * @param downloadUrl String
@@ -65,17 +79,25 @@ open class BaseDownloadManager {
     protected fun localFileName(downloadUrl: String): String {
         val fileName = downloadUrl.replace("/", "").replace("\\", "")
         var cashDir = getDownloadFilePath()
-        return "$cashDir/download/$fileName"
+        return "$cashDir/$fileName"
     }
 
     private fun getDownloadFilePath(): String {
-        return if (Environment.MEDIA_MOUNTED == Environment.getExternalStorageState()) {
+        downloadPath?.let {
+            return it
+        }
+        val path = if (Environment.MEDIA_MOUNTED == Environment.getExternalStorageState()) {
             //有SD卡,拿到SD卡的/storage/sdcard0/Android/data/包名/cash目录
             ContextManager.context.externalCacheDir!!.absolutePath
         } else {
             //没有SD卡的,拿到/data/data/包名/cash目录
             ContextManager.context.cacheDir.absolutePath
         }
+        return "$path/download"
+    }
+
+    fun clearFiles() {
+        File(getDownloadFilePath()).deleteAll()
     }
 
     /**

mvvm/src/main/java/com/catchpig/mvvm/network/manager/RxJavaDownloadManager.kt

@@ -9,25 +9,21 @@ import com.catchpig.mvvm.listener.MultiDownloadCallback
 import com.catchpig.mvvm.network.api.RxJavaDownloadService
 import com.catchpig.mvvm.network.download.DownloadSubscriber
 import com.catchpig.mvvm.network.download.MultiDownloadSubscriber
-import com.catchpig.mvvm.network.interceptor.DownloadInterceptor
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.disposables.Disposable
 import io.reactivex.rxjava3.schedulers.Schedulers
-import okhttp3.OkHttpClient
-import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory
 import retrofit2.converter.gson.GsonConverterFactory
 import java.io.File
 import java.net.URL
-import java.util.concurrent.TimeUnit
 
 /**
  * 描述:下载工具类
  * @author catchpig
  * @date 2020/11/20 10:25
  */
-object RxJavaDownloadManager : BaseDownloadManager() {
+object RxJavaDownloadManager : DownloadManager() {
 
     private var downloadServiceMap: MutableMap<String, RxJavaDownloadService> = ArrayMap()
 

utils/src/main/java/com/catchpig/utils/ext/FileExt.kt

@@ -0,0 +1,17 @@
+package com.catchpig.utils.ext
+
+import java.io.File
+
+fun File.deleteAll() {
+    deleteFile(this)
+}
+
+private fun deleteFile(file: File) {
+    if (file.isFile) {
+        file.delete()
+    } else if (file.isDirectory) {
+        file.listFiles().forEach {
+            deleteFile(it)
+        }
+    }
+}

version.gradle

@@ -23,7 +23,7 @@ ext {
     auto_service_version = '1.0.1'
     kotlinpoet_version = '1.11.0'
     rxpermissions_version = "0.12"
-    recycleview_version = "1.3.1"
+    recycleview_version = "1.2.1"
     UIViewPager_version = "0.1.8"
     okhttpprofiler_version = "1.0.8"
     coroutines_version = "1.6.1"