浏览代码

修复临时下载文件错误问题

drake 3 年之前
父节点
当前提交
37ffd3818b

+ 4 - 3
net/src/main/java/com/drake/net/response/ResponseExtention.kt

@@ -87,9 +87,8 @@ fun Response.file(): File? {
                         rename(index + 1)
                     } else file
                 }
-                return rename(1)
+                file = rename(1)
             }
-            request.downloadFileNameDecode()
         }
 
         // 临时文件
@@ -103,7 +102,9 @@ fun Response.file(): File? {
         }
         // 下载完毕删除临时文件
         if (request.downloadTempFile()) {
-            file.renameTo(File(downloadDir, fileName))
+            val fileFinal = File(downloadDir, fileName)
+            file.renameTo(fileFinal)
+            return fileFinal
         }
         return file
     } catch (e: SocketException) {

+ 0 - 1
sample/src/main/java/com/drake/net/sample/ui/fragment/DownloadFileFragment.kt

@@ -52,7 +52,6 @@ class DownloadFileFragment : Fragment(R.layout.fragment_download_file) {
                     setDownloadTempFile()
                     addDownloadListener(object : ProgressListener() {
                         override fun onProgress(p: Progress) {
-                            Log.d("日志", "(DownloadFileFragment.kt:52)    p = ${p}")
                             seek?.post {
                                 val progress = p.progress()
                                 seek.progress = progress