Commit bc773534 authored by wanglei's avatar wanglei

...

parent 8bdef84d
...@@ -100,8 +100,4 @@ dependencies { ...@@ -100,8 +100,4 @@ dependencies {
implementation platform('com.google.firebase:firebase-bom:32.3.1') implementation platform('com.google.firebase:firebase-bom:32.3.1')
implementation 'com.google.firebase:firebase-analytics:21.6.2' implementation 'com.google.firebase:firebase-analytics:21.6.2'
implementation("com.google.firebase:firebase-messaging") implementation("com.google.firebase:firebase-messaging")
//max adjust 归因
implementation 'com.adjust.sdk:adjust-android:4.28.7'
} }
\ No newline at end of file
...@@ -6,6 +6,7 @@ import android.content.Intent ...@@ -6,6 +6,7 @@ import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.text.TextUtils import android.text.TextUtils
import com.base.datarecovery.activity.SplashActivity import com.base.datarecovery.activity.SplashActivity
import com.base.datarecovery.ads.AdmobMaxHelper
import com.base.datarecovery.ads.admob.AdmobOpenUtils import com.base.datarecovery.ads.admob.AdmobOpenUtils
import com.base.datarecovery.ads.max.AdMaxInit.initAdMax import com.base.datarecovery.ads.max.AdMaxInit.initAdMax
import com.base.datarecovery.bean.ConstObject.ifAgreePrivacy import com.base.datarecovery.bean.ConstObject.ifAgreePrivacy
...@@ -20,11 +21,6 @@ import com.base.datarecovery.utils.InstallHelps ...@@ -20,11 +21,6 @@ import com.base.datarecovery.utils.InstallHelps
import com.base.datarecovery.utils.LogEx import com.base.datarecovery.utils.LogEx
import com.base.datarecovery.utils.NewComUtils import com.base.datarecovery.utils.NewComUtils
import com.google.android.gms.ads.MobileAds import com.google.android.gms.ads.MobileAds
import com.google.android.gms.ads.identifier.AdvertisingIdClient
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.MainScope
import kotlinx.coroutines.async
import kotlinx.coroutines.launch
import java.util.UUID import java.util.UUID
class MyApplication : BaseApplication() { class MyApplication : BaseApplication() {
...@@ -121,7 +117,7 @@ class MyApplication : BaseApplication() { ...@@ -121,7 +117,7 @@ class MyApplication : BaseApplication() {
if (flag) { if (flag) {
if (AdmobOpenUtils.isOpenAdLoaded()) { if (AdmobOpenUtils.isOpenAdLoaded()) {
LogEx.logDebug(TAG, "show ad") LogEx.logDebug(TAG, "show ad")
AdmobOpenUtils.showAppOpenAd(activity) AdmobMaxHelper.admobMaxShowOpenAd(activity)
} else { } else {
LogEx.logDebug(TAG, "jump splash") LogEx.logDebug(TAG, "jump splash")
topActivity?.startActivity( topActivity?.startActivity(
......
...@@ -16,6 +16,7 @@ import com.base.datarecovery.activity.privacyspace.PrivacySpaceActivity ...@@ -16,6 +16,7 @@ import com.base.datarecovery.activity.privacyspace.PrivacySpaceActivity
import com.base.datarecovery.activity.recovery.FileScanResultActivity import com.base.datarecovery.activity.recovery.FileScanResultActivity
import com.base.datarecovery.activity.repeat.RepeatActivity import com.base.datarecovery.activity.repeat.RepeatActivity
import com.base.datarecovery.activity.screenshot.ScreenShotActivity import com.base.datarecovery.activity.screenshot.ScreenShotActivity
import com.base.datarecovery.ads.AdmobMaxHelper
import com.base.datarecovery.ads.admob.AdmobInterstitialUtils import com.base.datarecovery.ads.admob.AdmobInterstitialUtils
import com.base.datarecovery.ads.admob.AdmobNativeUtils import com.base.datarecovery.ads.admob.AdmobNativeUtils
import com.base.datarecovery.ads.admob.AdmobOpenUtils import com.base.datarecovery.ads.admob.AdmobOpenUtils
......
...@@ -9,7 +9,7 @@ import com.base.datarecovery.help.ConfigHelper ...@@ -9,7 +9,7 @@ import com.base.datarecovery.help.ConfigHelper
import com.base.datarecovery.utils.LogEx import com.base.datarecovery.utils.LogEx
object AdmobMaxHelper { object AdmobMaxHelper {
private val TAG="" private val TAG = ""
fun admobMaxShowInterstitialAd(activity: Activity, onHidden: (() -> Unit)? = null) { fun admobMaxShowInterstitialAd(activity: Activity, onHidden: (() -> Unit)? = null) {
if (ConfigHelper.admobTrueMaxFlase) { if (ConfigHelper.admobTrueMaxFlase) {
...@@ -23,5 +23,17 @@ object AdmobMaxHelper { ...@@ -23,5 +23,17 @@ object AdmobMaxHelper {
} }
} }
fun admobMaxShowOpenAd(activity: Activity, onHidden: (() -> Unit)? = null) {
if (ConfigHelper.admobTrueMaxFlase) {
AdmobOpenUtils.showAppOpenAd(activity) {
onHidden?.invoke()
}
} else {
AdMaxOpenUtils.showAppOpenAd(activity) {
onHidden?.invoke()
}
}
}
} }
\ No newline at end of file
...@@ -28,7 +28,7 @@ object AdMaxInterstitialUtils { ...@@ -28,7 +28,7 @@ object AdMaxInterstitialUtils {
private var onHidden: (() -> Unit)? = null private var onHidden: (() -> Unit)? = null
private var loadingListener: (() -> Unit)? = null private var loadingListener: (() -> Unit)? = null
private var retryAttempt = 0 private var retryAttempt = 0
private var maxRetryAttempt = 8 private var maxRetryAttempt = 3
@SuppressLint("StaticFieldLeak") @SuppressLint("StaticFieldLeak")
private var customDialog: CustomDialog? = null private var customDialog: CustomDialog? = null
......
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