Commit 1a027beb authored by wanglei's avatar wanglei

...

parent 63b2630a
...@@ -3,6 +3,7 @@ package com.base.browserwhite.ui.activity.download ...@@ -3,6 +3,7 @@ package com.base.browserwhite.ui.activity.download
import android.app.AlertDialog import android.app.AlertDialog
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.view.Gravity
import android.view.KeyEvent import android.view.KeyEvent
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
...@@ -134,6 +135,7 @@ object DownloadDialog { ...@@ -134,6 +135,7 @@ object DownloadDialog {
dialog.show() dialog.show()
val params = dialog.window?.attributes val params = dialog.window?.attributes
params?.gravity = Gravity.BOTTOM
params?.width = resources.getDimensionPixelOffset(R.dimen.dp_335) params?.width = resources.getDimensionPixelOffset(R.dimen.dp_335)
dialog.window?.attributes = params dialog.window?.attributes = params
dialog.window?.setBackgroundDrawableResource(android.R.color.transparent) dialog.window?.setBackgroundDrawableResource(android.R.color.transparent)
......
...@@ -25,6 +25,8 @@ import android.webkit.WebViewClient ...@@ -25,6 +25,8 @@ import android.webkit.WebViewClient
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.base.browserwhite.MyApplication import com.base.browserwhite.MyApplication
import com.base.browserwhite.ads.AdmobMaxHelper
import com.base.browserwhite.ads.AdmobMaxHelper.lastShowInter
import com.base.browserwhite.bean.BookmarkBean import com.base.browserwhite.bean.BookmarkBean
import com.base.browserwhite.bean.ConstObject.downloadDisclaimer import com.base.browserwhite.bean.ConstObject.downloadDisclaimer
import com.base.browserwhite.bean.ConstObject.webPrivacy import com.base.browserwhite.bean.ConstObject.webPrivacy
...@@ -145,9 +147,21 @@ class WebViewFragment : BaseFragment<FragmentWebViewBinding>() { ...@@ -145,9 +147,21 @@ class WebViewFragment : BaseFragment<FragmentWebViewBinding>() {
downloadAdapter = DownloadAdapter() downloadAdapter = DownloadAdapter()
} }
downloadAdapter?.downloadAction = { downloadAdapter?.downloadAction = {
downloadDialog?.dismiss() if (System.currentTimeMillis() - lastShowInter > 40 * 1000 * 1000 || lastShowInter == 0L) {
downloadAdapter?.beginProgressAction = { AdmobMaxHelper.admobMaxShowInterstitialAd(requireActivity(), false) {
requireContext().saveDownloadRecordFile(downloadList) if (it) {
lastShowInter = System.currentTimeMillis()
}
downloadDialog?.dismiss()
downloadAdapter?.beginProgressAction = {
requireContext().saveDownloadRecordFile(downloadList)
}
}
} else {
downloadDialog?.dismiss()
downloadAdapter?.beginProgressAction = {
requireContext().saveDownloadRecordFile(downloadList)
}
} }
} }
downloadAdapter?.downloadFinishAction = { id -> downloadAdapter?.downloadFinishAction = { id ->
......
...@@ -4,13 +4,11 @@ import android.annotation.SuppressLint ...@@ -4,13 +4,11 @@ import android.annotation.SuppressLint
import android.app.AlertDialog import android.app.AlertDialog
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Build
import android.view.Gravity import android.view.Gravity
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.widget.FrameLayout import android.widget.FrameLayout
import android.widget.Toast import android.widget.Toast
import androidx.core.content.ContextCompat
import androidx.core.view.isVisible import androidx.core.view.isVisible
import com.base.browserwhite.R import com.base.browserwhite.R
import com.base.browserwhite.bean.ConstObject import com.base.browserwhite.bean.ConstObject
...@@ -36,8 +34,6 @@ import com.base.browserwhite.help.Constants ...@@ -36,8 +34,6 @@ import com.base.browserwhite.help.Constants
import com.base.browserwhite.help.RxBus import com.base.browserwhite.help.RxBus
import com.base.browserwhite.ui.activity.about.AboutActivity import com.base.browserwhite.ui.activity.about.AboutActivity
import com.base.browserwhite.ui.activity.feedback.FeedbackActivity import com.base.browserwhite.ui.activity.feedback.FeedbackActivity
import com.base.browserwhite.ui.views.DialogViews.showAddRootBookmarkDialog
import com.base.browserwhite.ui.views.DialogViews.showDownloadDisclaimer
import com.base.browserwhite.utils.ActivityLauncher import com.base.browserwhite.utils.ActivityLauncher
import com.base.browserwhite.utils.AppPreferences import com.base.browserwhite.utils.AppPreferences
import com.base.browserwhite.utils.RoleManagerUtils.isDefaultBrowser import com.base.browserwhite.utils.RoleManagerUtils.isDefaultBrowser
......
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