Commit 1dece1ec authored by wanglei's avatar wanglei

..

parent 88379b4e
...@@ -25,6 +25,7 @@ import com.base.scanqrclear.ui.main.MainActivity ...@@ -25,6 +25,7 @@ import com.base.scanqrclear.ui.main.MainActivity
import com.base.scanqrclear.utils.ActivityLauncher import com.base.scanqrclear.utils.ActivityLauncher
import com.base.scanqrclear.utils.ExitType import com.base.scanqrclear.utils.ExitType
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import kotlin.random.Random import kotlin.random.Random
...@@ -84,7 +85,7 @@ open class BaseActivity2 : AppCompatActivity() { ...@@ -84,7 +85,7 @@ open class BaseActivity2 : AppCompatActivity() {
) { ) {
this.lottieType = lottieType this.lottieType = lottieType
this.complete = complete this.complete = complete
showAdInterstitial(AdmobHelps.isShowAdInter()) { showAdInterstitial(AdConfigBean.adsConfigBean.functionInShowAd) {
val animationView = findViewById<ConstraintLayout>(R.id.animation) val animationView = findViewById<ConstraintLayout>(R.id.animation)
animationView.setOnClickListener { } animationView.setOnClickListener { }
if (isShowAnimation) { if (isShowAnimation) {
...@@ -101,23 +102,47 @@ open class BaseActivity2 : AppCompatActivity() { ...@@ -101,23 +102,47 @@ open class BaseActivity2 : AppCompatActivity() {
if (this.isFinishing || this.isDestroyed || isShowAdInterstitial) return if (this.isFinishing || this.isDestroyed || isShowAdInterstitial) return
isShowAdInterstitial = true isShowAdInterstitial = true
if (isShow) { if (isShow) {
AdmobHelps.showInterstitialAd( // AdmobHelps.showInterstitialAd(
this, // this,
dismissed = { // dismissed = {
// clearLoading()
// immersive()
// complete?.invoke()
// },
// completed = {
// StatusBarHelps.immersive(this, getColor(R.color.black))
// loadingDialog?.dismiss()
// },
// failed = {
// clearLoading()
// immersive()
// complete?.invoke()
// }
// )
AdsMgr.showInsert(this, false, object : AdsShowCallBack() {
override fun show() {
StatusBarHelps.immersive(this@BaseActivity2, getColor(R.color.black))
loadingDialog?.dismiss()
}
override fun close(where: Int) {
clearLoading() clearLoading()
immersive() immersive()
complete?.invoke() complete?.invoke()
}, }
completed = {
StatusBarHelps.immersive(this, getColor(R.color.black)) override fun failed(where: Int) {
loadingDialog?.dismiss() clearLoading()
}, immersive()
failed = { complete?.invoke()
}
override fun googleFailed(where: Int) {
clearLoading() clearLoading()
immersive() immersive()
complete?.invoke() complete?.invoke()
} }
) })
} else { } else {
isShowAdInterstitial = false isShowAdInterstitial = false
complete?.invoke() complete?.invoke()
......
...@@ -11,6 +11,7 @@ import androidx.lifecycle.lifecycleScope ...@@ -11,6 +11,7 @@ import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import com.base.scanqrclear.R import com.base.scanqrclear.R
import com.base.scanqrclear.bean.FileBean import com.base.scanqrclear.bean.FileBean
import com.base.scanqrclear.bean.config.AdConfigBean
import com.base.scanqrclear.databinding.ActivityCleanJunkBinding import com.base.scanqrclear.databinding.ActivityCleanJunkBinding
import com.base.scanqrclear.luma.AdmobHelps.KEY_CLEANUP_SIZE import com.base.scanqrclear.luma.AdmobHelps.KEY_CLEANUP_SIZE
import com.base.scanqrclear.luma.AdmobHelps.KEY_CLEAN_LAST_TIME import com.base.scanqrclear.luma.AdmobHelps.KEY_CLEAN_LAST_TIME
...@@ -47,7 +48,7 @@ class CleanJunkActivity : BaseActivity2() { ...@@ -47,7 +48,7 @@ class CleanJunkActivity : BaseActivity2() {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(binding.root) setContentView(binding.root)
initView() initView()
showAdInterstitial(AdmobHelps.isShowAdInter()) { initData() } showAdInterstitial(AdConfigBean.adsConfigBean.functionInShowAd) { initData() }
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
handleBackPressed(this@CleanJunkActivity) handleBackPressed(this@CleanJunkActivity)
} }
......
...@@ -40,8 +40,9 @@ class SimilarPhotosActivity : BaseActivity2() { ...@@ -40,8 +40,9 @@ class SimilarPhotosActivity : BaseActivity2() {
initView() initView()
initData() initData()
showAnimationAd(LottieType.SIMILAR_PHOTOS) { showAnimationAd(LottieType.SIMILAR_PHOTOS) {
if (isScanning) if (isScanning) {
loadingDialog = DialogHelps.showLoadingDialog(this) // loadingDialog = DialogHelps.showLoadingDialog(this)
}
} }
AdmobHelps.showNativeAd(this, completed = { AdmobHelps.showNativeAd(this, completed = {
binding.adNative.setNativeAd(it) binding.adNative.setNativeAd(it)
......
...@@ -3,6 +3,7 @@ package com.base.scanqrclear.ui.main ...@@ -3,6 +3,7 @@ package com.base.scanqrclear.ui.main
import android.content.Intent import android.content.Intent
import android.graphics.Color import android.graphics.Color
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View
import android.widget.TextView import android.widget.TextView
import androidx.activity.addCallback import androidx.activity.addCallback
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
...@@ -170,6 +171,11 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl ...@@ -170,6 +171,11 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
// tabBinding.tvTab.setTextColor(ContextCompat.getColor(this, R.color.color_tab_home)) // tabBinding.tvTab.setTextColor(ContextCompat.getColor(this, R.color.color_tab_home))
tab.customView = tabBinding.root tab.customView = tabBinding.root
tab.id = index tab.id = index
if (index == 1) {
tabBinding.vDian.visibility = View.VISIBLE
} else {
tabBinding.vDian.visibility = View.GONE
}
binding.tabLayout.addTab(tab) binding.tabLayout.addTab(tab)
} }
binding.tabLayout.addOnTabSelectedListener(object : OnTabSelectedListener { binding.tabLayout.addOnTabSelectedListener(object : OnTabSelectedListener {
......
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="#FB1F1F" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
tools:ignore="UseCompoundDrawables"> tools:ignore="UseCompoundDrawables">
<ImageView <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/iv_icon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="12dp" android:layout_marginTop="12dp">
tools:ignore="ContentDescription"
tools:src="@mipmap/ic_launcher" /> <ImageView
android:id="@+id/iv_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/vDian"
android:layout_margin="2dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription"
tools:src="@mipmap/ic_launcher" />
<View
android:id="@+id/vDian"
android:layout_width="6dp"
android:layout_height="6dp"
android:layout_gravity="end|top"
android:background="@drawable/bg_fb1f1f"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView <TextView
android:id="@+id/tv_tab" android:id="@+id/tv_tab"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="5dp" android:layout_marginTop="3dp"
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
android:gravity="center" android:gravity="center"
android:textColor="#838383" android:textColor="#838383"
......
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