Commit ac75cd3a authored by wanglei's avatar wanglei

...

parent 9a56b66c
...@@ -72,7 +72,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() { ...@@ -72,7 +72,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
}) })
if (isFirstMainShow) { if (isFirstMainShow) {
showDefaultBrowserDialog() showDefaultBrowserDialog(launcher)
} }
mainShowCount++ mainShowCount++
......
...@@ -136,12 +136,15 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() { ...@@ -136,12 +136,15 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
if (System.currentTimeMillis() - lastShowInter > 10 * 1000 * 1000 || lastShowInter == 0L) { if (System.currentTimeMillis() - lastShowInter > 10 * 1000 * 1000 || lastShowInter == 0L) {
AdmobMaxHelper.admobMaxShowInterstitialAd(this@WebBrowserActivity, false) { AdmobMaxHelper.admobMaxShowInterstitialAd(this@WebBrowserActivity, false) {
lastShowInter = System.currentTimeMillis() if (it) {
lastShowInter = System.currentTimeMillis()
}
finishToMain() finishToMain()
} }
} else {
finishToMain()
} }
} }
else -> finishToMain() else -> finishToMain()
......
...@@ -69,9 +69,13 @@ class WebStoreActivity : BaseActivity<ActivityWebStoreBinding>() { ...@@ -69,9 +69,13 @@ class WebStoreActivity : BaseActivity<ActivityWebStoreBinding>() {
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
if (System.currentTimeMillis() - lastShowInter > 10 * 1000 * 1000 || lastShowInter == 0L) { if (System.currentTimeMillis() - lastShowInter > 10 * 1000 * 1000 || lastShowInter == 0L) {
AdmobMaxHelper.admobMaxShowInterstitialAd(this@WebStoreActivity, false) { AdmobMaxHelper.admobMaxShowInterstitialAd(this@WebStoreActivity, false) {
lastShowInter = System.currentTimeMillis() if (it) {
lastShowInter = System.currentTimeMillis()
}
finishToMain() finishToMain()
} }
}else{
finishToMain()
} }
} }
binding.ivGuanbi.setOnClickListener { binding.ivGuanbi.setOnClickListener {
......
...@@ -3,10 +3,12 @@ package com.base.browserwhite.ui.views ...@@ -3,10 +3,12 @@ package com.base.browserwhite.ui.views
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.app.AlertDialog import android.app.AlertDialog
import android.app.Dialog import android.app.Dialog
import android.app.role.RoleManager
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.graphics.Color import android.graphics.Color
import android.graphics.drawable.ColorDrawable import android.graphics.drawable.ColorDrawable
import android.os.Build
import android.provider.Settings import android.provider.Settings
import android.view.Gravity import android.view.Gravity
import android.view.LayoutInflater import android.view.LayoutInflater
...@@ -26,7 +28,7 @@ import com.base.browserwhite.databinding.DialogMediaMoreBinding ...@@ -26,7 +28,7 @@ import com.base.browserwhite.databinding.DialogMediaMoreBinding
import com.base.browserwhite.databinding.DialogMyAccountBinding import com.base.browserwhite.databinding.DialogMyAccountBinding
import com.base.browserwhite.databinding.DialogPermissonOpenBinding import com.base.browserwhite.databinding.DialogPermissonOpenBinding
import com.base.browserwhite.databinding.DialogSearchEngineBinding import com.base.browserwhite.databinding.DialogSearchEngineBinding
import com.base.browserwhite.ui.views.DialogViews.showMyAccountDialog import com.base.browserwhite.utils.ActivityLauncher
import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialog
...@@ -223,7 +225,7 @@ object DialogViews { ...@@ -223,7 +225,7 @@ object DialogViews {
} }
fun Context.showDefaultBrowserDialog() { fun Context.showDefaultBrowserDialog(launcher: ActivityLauncher) {
val dialog = BottomSheetDialog(this) val dialog = BottomSheetDialog(this)
val binding = DialogDefaultBrowserBinding.inflate(LayoutInflater.from(this)) val binding = DialogDefaultBrowserBinding.inflate(LayoutInflater.from(this))
dialog.setContentView(binding.root) dialog.setContentView(binding.root)
...@@ -245,8 +247,24 @@ object DialogViews { ...@@ -245,8 +247,24 @@ object DialogViews {
binding.tvBtn.setOnClickListener { binding.tvBtn.setOnClickListener {
dialog.dismiss() dialog.dismiss()
val intent = Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
startActivity(intent) val roleManager = getSystemService(RoleManager::class.java) as RoleManager
if (!roleManager.isRoleAvailable("android.app.role.BROWSER")) {
val intent = Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS)
launcher.launch(intent)
} else if (roleManager.isRoleHeld("android.app.role.BROWSER")) {
val intent = Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS)
startActivity(intent)
} else {
val intent = roleManager.createRequestRoleIntent("android.app.role.BROWSER")
launcher.launch(intent)
}
} else {
val intent = Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS)
startActivity(intent)
}
} }
} }
......
...@@ -58,7 +58,6 @@ ...@@ -58,7 +58,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="19sp" android:textSize="19sp"
android:textStyle="bold"
tools:text="Snoop Dogg Loved Watching AHorse Dance To 'Gin And Juice" /> tools:text="Snoop Dogg Loved Watching AHorse Dance To 'Gin And Juice" />
<LinearLayout <LinearLayout
......
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