Commit 3560a8d1 authored by wanglei's avatar wanglei

...

parent f9a69403
...@@ -10,6 +10,7 @@ import androidx.core.view.ViewCompat ...@@ -10,6 +10,7 @@ import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsCompat
import androidx.core.view.updatePadding import androidx.core.view.updatePadding
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.base.datarecovery.ads.admob.AdmobBannerUtils
import com.base.datarecovery.databinding.ActivityMainBinding import com.base.datarecovery.databinding.ActivityMainBinding
import com.base.datarecovery.help.BaseActivity import com.base.datarecovery.help.BaseActivity
import com.base.datarecovery.help.FileHelp.getDirFiles import com.base.datarecovery.help.FileHelp.getDirFiles
...@@ -31,14 +32,11 @@ class MainActivity : BaseActivity<ActivityMainBinding>() { ...@@ -31,14 +32,11 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
override val binding: ActivityMainBinding by lazy { override val binding: ActivityMainBinding by lazy {
ActivityMainBinding.inflate(layoutInflater) ActivityMainBinding.inflate(layoutInflater)
} }
var permissionDialogShowed: Boolean = false
override fun initView() { override fun initView() {
BarUtils.setStatusBarLightMode(this, true) BarUtils.setStatusBarLightMode(this, true)
BarUtils.setStatusBarColor(this, Color.TRANSPARENT) BarUtils.setStatusBarColor(this, Color.TRANSPARENT)
// binding.root.updatePadding(top = BarUtils.getStatusBarHeight()) // binding.root.updatePadding(top = BarUtils.getStatusBarHeight())
// showRateStarPopDialog()
// showExitFunctionDialog()
} }
override fun initListener() { override fun initListener() {
...@@ -52,10 +50,12 @@ class MainActivity : BaseActivity<ActivityMainBinding>() { ...@@ -52,10 +50,12 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
super.onResume() super.onResume()
if (!checkStorePermission()) { if (!checkStorePermission()) {
if (dialog == null) { if (dialog == null) {
dialog = showPermissionBottomSheet(launcher) dialog = showPermissionBottomSheet(launcher) {
}
} }
} else { } else {
permissionDialogShowed = true AdmobBannerUtils.showCollapsibleBannerAd(this, binding.flAd)
} }
lifecycleScope.launch(Dispatchers.Main) { lifecycleScope.launch(Dispatchers.Main) {
......
...@@ -35,12 +35,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() { ...@@ -35,12 +35,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
override fun setView() { override fun setView() {
animatorSet = createHeartbeatAnimation(binding.flScan) animatorSet = createHeartbeatAnimation(binding.flScan)
val flag = (requireActivity() as MainActivity).permissionDialogShowed
if (flag) {
// AdmobMaxHelper.admobMaxShowNativeAd(requireActivity(), binding.flAd, 0)
// AdmobBannerUtils.showCollapsibleBannerAd(requireContext(), binding.flAd)
}
AdmobBannerUtils.showCollapsibleBannerAd(requireContext(), binding.flAd)
} }
override fun setListener() { override fun setListener() {
...@@ -115,19 +109,11 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() { ...@@ -115,19 +109,11 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
animatorSet.pause() animatorSet.pause()
} }
var resumeTime = 0
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
animatorSet.resume() animatorSet.resume()
if (resumeTime != 0) {
val flag = (requireActivity() as MainActivity).permissionDialogShowed
if (flag) {
// AdmobMaxHelper.admobMaxShowNativeAd(requireActivity(), binding.flAd, 0)
}
}
resumeTime++
(requireActivity() as MainActivity).setScreenSize { (requireActivity() as MainActivity).setScreenSize {
if (it > 0) { if (it > 0) {
binding.tvScreenSize.visibility = View.VISIBLE binding.tvScreenSize.visibility = View.VISIBLE
......
...@@ -12,7 +12,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialog ...@@ -12,7 +12,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
object PermissionDialog { object PermissionDialog {
fun MainActivity.showPermissionBottomSheet(launcher: ActivityLauncher): BottomSheetDialog { fun Context.showPermissionBottomSheet(launcher: ActivityLauncher, dismissAction: () -> Unit): BottomSheetDialog {
val dialog = BottomSheetDialog(this) val dialog = BottomSheetDialog(this)
val binding = DialogPermissionBottomsheetBinding.inflate(LayoutInflater.from(this)) val binding = DialogPermissionBottomsheetBinding.inflate(LayoutInflater.from(this))
dialog.setContentView(binding.root) dialog.setContentView(binding.root)
...@@ -27,7 +27,7 @@ object PermissionDialog { ...@@ -27,7 +27,7 @@ object PermissionDialog {
requestStorePermission(launcher, result = { requestStorePermission(launcher, result = {
if (it) { if (it) {
dialog.dismiss() dialog.dismiss()
this.permissionDialogShowed = true dismissAction.invoke()
} }
}) })
} }
......
...@@ -11,6 +11,14 @@ ...@@ -11,6 +11,14 @@
android:id="@+id/fragment" android:id="@+id/fragment"
android:name="com.base.datarecovery.fragment.HomeFragment" android:name="com.base.datarecovery.fragment.HomeFragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@id/fl_ad"
app:layout_constraintTop_toTopOf="parent" />
<FrameLayout
android:id="@+id/fl_ad"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
...@@ -338,12 +338,6 @@ ...@@ -338,12 +338,6 @@
</LinearLayout> </LinearLayout>
<FrameLayout
android:id="@+id/fl_ad"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp" />
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
......
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