Commit 1ee434c1 authored by wanglei's avatar wanglei

...

parent d23b0d27
...@@ -38,7 +38,10 @@ class NewsDetailActivity : BaseActivity<ActivityNewsDetailBinding>() { ...@@ -38,7 +38,10 @@ class NewsDetailActivity : BaseActivity<ActivityNewsDetailBinding>() {
} }
private fun addNewWebSite(uri: String) { private fun addNewWebSite(uri: String) {
val myFragment = WebViewFragment().apply { url = uri } val myFragment = WebViewFragment().apply {
from = "news"
url = uri
}
myFragment.onPageFinished = { myFragment.onPageFinished = {
AdmobMaxHelper.admobMaxShowInterstitialAd(this, false) { AdmobMaxHelper.admobMaxShowInterstitialAd(this, false) {
......
...@@ -36,9 +36,11 @@ import com.base.browserwhite.databinding.FragmentWebViewBinding ...@@ -36,9 +36,11 @@ 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.activity.download.DownloadDialog.showDownloadFinishDialog import com.base.browserwhite.ui.activity.download.DownloadDialog.showDownloadFinishDialog
import com.base.browserwhite.ui.activity.download.DownloadDialog.showDownloadVideoDialog import com.base.browserwhite.ui.activity.download.DownloadDialog.showDownloadVideoDialog
import com.base.browserwhite.ui.activity.news.NewsActivity
import com.base.browserwhite.ui.fragment.BaseFragment import com.base.browserwhite.ui.fragment.BaseFragment
import com.base.browserwhite.ui.views.DialogViews.showDownloadDisclaimer import com.base.browserwhite.ui.views.DialogViews.showDownloadDisclaimer
import com.base.browserwhite.ui.views.PermissionDialog.showPermissionBottomSheet import com.base.browserwhite.ui.views.PermissionDialog.showPermissionBottomSheet
import com.base.browserwhite.utils.ActivityLauncher
import com.base.browserwhite.utils.ColorUtils import com.base.browserwhite.utils.ColorUtils
import com.base.browserwhite.utils.DownloadUtils import com.base.browserwhite.utils.DownloadUtils
import com.base.browserwhite.utils.DownloadUtils.getDownloadJson import com.base.browserwhite.utils.DownloadUtils.getDownloadJson
...@@ -65,10 +67,11 @@ import java.util.regex.Pattern ...@@ -65,10 +67,11 @@ import java.util.regex.Pattern
import kotlin.random.Random import kotlin.random.Random
class WebViewFragment : BaseFragment<FragmentWebViewBinding>() { class WebViewFragment() : BaseFragment<FragmentWebViewBinding>() {
private val TAG = "WebViewFragment" private val TAG = "WebViewFragment"
var url: String = "" var url: String = ""
var from: String = ""
var bookmarkBean: BookmarkBean = BookmarkBean() var bookmarkBean: BookmarkBean = BookmarkBean()
...@@ -124,7 +127,12 @@ class WebViewFragment : BaseFragment<FragmentWebViewBinding>() { ...@@ -124,7 +127,12 @@ class WebViewFragment : BaseFragment<FragmentWebViewBinding>() {
} }
if (!requireContext().checkStorePermission()) { if (!requireContext().checkStorePermission()) {
val launcher = (requireActivity() as WebBrowserActivity).launcher val launcher: ActivityLauncher = if (from == "news") {
(requireActivity() as NewsActivity).launcher
} else {
(requireActivity() as WebBrowserActivity).launcher
}
requireContext().showPermissionBottomSheet(launcher) {} requireContext().showPermissionBottomSheet(launcher) {}
return return
} }
......
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