Commit 50ec98e3 authored by wanglei's avatar wanglei

...

parent 4c2c2a65
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
android:fullBackupContent="@xml/backup_rules" android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/logo" android:icon="@mipmap/logo"
android:label="@string/app_name" android:label="@string/app_name"
android:requestLegacyExternalStorage="true"
android:roundIcon="@mipmap/logo" android:roundIcon="@mipmap/logo"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Theme.BrowserWhite" android:theme="@style/Theme.BrowserWhite"
......
...@@ -11,7 +11,7 @@ import com.base.browserwhite.bean.DownloadBean ...@@ -11,7 +11,7 @@ import com.base.browserwhite.bean.DownloadBean
import com.base.browserwhite.databinding.ItemDownloadBinding import com.base.browserwhite.databinding.ItemDownloadBinding
import com.base.browserwhite.databinding.ItemDownloadCardBinding import com.base.browserwhite.databinding.ItemDownloadCardBinding
import com.base.browserwhite.databinding.ItemDownloadTimeBinding import com.base.browserwhite.databinding.ItemDownloadTimeBinding
import com.base.browserwhite.ui.views.DownloadDialog.showDownloadConfirmDialog import com.base.browserwhite.ui.activity.download.DownloadDialog.showDownloadConfirmDialog
import com.base.browserwhite.utils.DownloadHelper.getDownloadPath import com.base.browserwhite.utils.DownloadHelper.getDownloadPath
import com.base.browserwhite.utils.KotlinExt.toFormatSize import com.base.browserwhite.utils.KotlinExt.toFormatSize
import com.base.browserwhite.utils.KotlinExt.toFormatTime import com.base.browserwhite.utils.KotlinExt.toFormatTime
...@@ -23,7 +23,6 @@ import com.liulishuo.filedownloader.BaseDownloadTask ...@@ -23,7 +23,6 @@ import com.liulishuo.filedownloader.BaseDownloadTask
import com.liulishuo.filedownloader.FileDownloadListener import com.liulishuo.filedownloader.FileDownloadListener
import com.liulishuo.filedownloader.FileDownloader import com.liulishuo.filedownloader.FileDownloader
import com.liulishuo.filedownloader.model.FileDownloadStatus import com.liulishuo.filedownloader.model.FileDownloadStatus
import java.io.File
import kotlin.math.abs import kotlin.math.abs
...@@ -268,6 +267,7 @@ class DownloadAdapter : BaseQuickAdapter<DownloadBean, DownloadAdapter.DownloadV ...@@ -268,6 +267,7 @@ class DownloadAdapter : BaseQuickAdapter<DownloadBean, DownloadAdapter.DownloadV
fun downloadItem(context: Context, item: DownloadBean, position: Int) { fun downloadItem(context: Context, item: DownloadBean, position: Int) {
item.path = context.getDownloadPath(item) item.path = context.getDownloadPath(item)
LogEx.logDebug(TAG, "downloadItem ${item.path}")
item.fileDownloadListener = createNewLister(item, "downloadItem", position) item.fileDownloadListener = createNewLister(item, "downloadItem", position)
......
package com.base.browserwhite.ui.views package com.base.browserwhite.ui.activity.download
import android.app.AlertDialog import android.app.AlertDialog
import android.content.Context import android.content.Context
...@@ -16,8 +16,6 @@ import com.base.browserwhite.bean.DownloadBean ...@@ -16,8 +16,6 @@ import com.base.browserwhite.bean.DownloadBean
import com.base.browserwhite.databinding.DialogDownloadConfirmBinding import com.base.browserwhite.databinding.DialogDownloadConfirmBinding
import com.base.browserwhite.databinding.DialogDownloadFinishBinding import com.base.browserwhite.databinding.DialogDownloadFinishBinding
import com.base.browserwhite.databinding.DialogDownloadVideoBinding import com.base.browserwhite.databinding.DialogDownloadVideoBinding
import com.base.browserwhite.ui.activity.download.WebDownloadManagerActivity
import com.base.browserwhite.ui.activity.download.DownloadAdapter
import com.base.browserwhite.utils.KotlinExt.toFormatSize import com.base.browserwhite.utils.KotlinExt.toFormatSize
import com.base.browserwhite.utils.LogEx import com.base.browserwhite.utils.LogEx
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
......
...@@ -20,7 +20,7 @@ import com.base.browserwhite.bean.DownloadBean ...@@ -20,7 +20,7 @@ import com.base.browserwhite.bean.DownloadBean
import com.base.browserwhite.databinding.FragmentWebViewBinding import com.base.browserwhite.databinding.FragmentWebViewBinding
import com.base.browserwhite.ui.activity.download.DownloadAdapter import com.base.browserwhite.ui.activity.download.DownloadAdapter
import com.base.browserwhite.ui.fragment.BaseFragment import com.base.browserwhite.ui.fragment.BaseFragment
import com.base.browserwhite.ui.views.DownloadDialog.showDownloadVideoDialog import com.base.browserwhite.ui.activity.download.DownloadDialog.showDownloadVideoDialog
import com.base.browserwhite.utils.DownloadHelper.getDownloadJson import com.base.browserwhite.utils.DownloadHelper.getDownloadJson
import com.base.browserwhite.utils.DownloadHelper.getDownloadJsonBean import com.base.browserwhite.utils.DownloadHelper.getDownloadJsonBean
import com.base.browserwhite.utils.DownloadHelper.saveDownloadRecordFile import com.base.browserwhite.utils.DownloadHelper.saveDownloadRecordFile
......
...@@ -43,6 +43,10 @@ object DownloadHelper { ...@@ -43,6 +43,10 @@ object DownloadHelper {
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), resources.getString(R.string.app_name) Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), resources.getString(R.string.app_name)
).absolutePath ).absolutePath
val dirFile = File(dirPath)
if (!dirFile.exists()){
dirFile.mkdirs()
}
if (item.status == FileDownloadStatus.paused) { if (item.status == FileDownloadStatus.paused) {
return "$dirPath/${item.name}" return "$dirPath/${item.name}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment