...

app/src/main/java/com/base/datarecovery/MyApplication.kt

@@ -50,8 +50,8 @@ class MyApplication : BaseApplication() {
         }
     }
 
-    fun initApp(isFirst: Boolean = false) {
-        if (!isFirst) {
+    fun initApp(isStartClick: Boolean = false) {
+        if (!isStartClick) {
             @Suppress("DEPRECATION")
             FacebookSdk.sdkInitialize(applicationContext)
 //            FacebookSdk.setIsDebugEnabled(true)

app/src/main/java/com/base/datarecovery/ads/admob/AdmobCommonUtils.kt

-package com.base.datarecovery.ads.admob
-
-import com.base.datarecovery.ads.AdDisplayUtils
-import com.base.datarecovery.utils.ActivityManagerUtils
-
-object AdmobCommonUtils {
-
-    private var lastAd: Any? = null
-    private var maxMultiClick = 20
-    private var multiClick = 0
-    fun isMultiClick(currentAd: Any?) {
-        if (currentAd == null) {
-            return
-        }
-        if (lastAd == currentAd) {
-            multiClick++
-            if (multiClick >= maxMultiClick) {
-                AdDisplayUtils.getInstance()
-                    .setAdClickCount(AdDisplayUtils.getInstance().maxAdClickCount)
-                ActivityManagerUtils.getInstance().finishAllActivity()
-                return
-            }
-        } else {
-            multiClick = 0
-        }
-
-        lastAd = currentAd
-
-    }
-}
\ No newline at end of file

app/src/main/java/com/base/datarecovery/ads/admob/AdmobInterstitialUtils.kt

@@ -8,13 +8,11 @@ import com.base.datarecovery.BuildConfig
 import com.base.datarecovery.R
 import com.base.datarecovery.ads.AdDisplayUtils
 import com.base.datarecovery.ads.AdmobMaxHelper.lastShowedOnHiddenTime
-import com.base.datarecovery.ads.admob.AdmobCommonUtils.isMultiClick
 import com.base.datarecovery.ads.admob.AdmobEvent.clickAd
 import com.base.datarecovery.ads.admob.AdmobEvent.pullAd
 import com.base.datarecovery.ads.admob.AdmobEvent.showAd
 import com.base.datarecovery.help.BaseApplication
 import com.base.datarecovery.help.ConfigHelper
-import com.base.datarecovery.utils.AppPreferences
 import com.base.datarecovery.utils.EventUtils
 import com.base.datarecovery.view.CustomDialog
 import com.google.android.gms.ads.AdError
@@ -169,7 +167,6 @@ object AdmobInterstitialUtils {
             override fun onAdClicked() {
                 clickAd(thisInterAd?.responseInfo, "interAd")
                 AdDisplayUtils.getInstance().incrementAdClickCount()
-                isMultiClick(thisInterAd)
             }
 
             override fun onAdDismissedFullScreenContent() {

app/src/main/java/com/base/datarecovery/ads/admob/AdmobNativeUtils.kt

@@ -6,7 +6,6 @@ import androidx.core.view.isVisible
 import com.base.datarecovery.BuildConfig
 import com.base.datarecovery.R
 import com.base.datarecovery.ads.AdDisplayUtils
-import com.base.datarecovery.ads.admob.AdmobCommonUtils.isMultiClick
 import com.base.datarecovery.ads.admob.AdmobEvent.clickAd
 import com.base.datarecovery.ads.admob.AdmobEvent.pullAd
 import com.base.datarecovery.ads.admob.AdmobEvent.showAd
@@ -64,11 +63,9 @@ object AdmobNativeUtils {
         }.withAdListener(object : AdListener() {
             override fun onAdClicked() {
                 clickAd(nativeAd?.responseInfo, "nativeAd")
-                isMultiClick(nativeAd)
             }
 
             override fun onAdFailedToLoad(p0: LoadAdError) {
-                AdDisplayUtils.getInstance().incrementAdRequestFailCount()
                 LogEx.logDebug(TAG, "onAdFailedToLoad=${p0.message}")
                 nativeAd = null
                 isLoading = false

app/src/main/java/com/base/datarecovery/ads/admob/AdmobOpenUtils.kt

@@ -3,7 +3,6 @@ package com.base.datarecovery.ads.admob
 import android.app.Activity
 import com.base.datarecovery.BuildConfig
 import com.base.datarecovery.ads.AdDisplayUtils
-import com.base.datarecovery.ads.admob.AdmobCommonUtils.isMultiClick
 import com.base.datarecovery.ads.admob.AdmobEvent.clickAd
 import com.base.datarecovery.ads.admob.AdmobEvent.pullAd
 import com.base.datarecovery.ads.admob.AdmobEvent.showAd
@@ -103,7 +102,6 @@ object AdmobOpenUtils {
             thisMOpenAd?.fullScreenContentCallback = object : FullScreenContentCallback() {
                 override fun onAdClicked() {
                     clickAd(thisMOpenAd?.responseInfo, "openAd")
-                    isMultiClick(thisMOpenAd)
                 }
 
                 override fun onAdDismissedFullScreenContent() {

app/src/main/java/com/base/datarecovery/ads/max/AdMaxNativeUtils.kt

@@ -10,7 +10,6 @@ import com.applovin.mediation.nativeAds.MaxNativeAdView
 import com.applovin.mediation.nativeAds.MaxNativeAdViewBinder
 import com.base.datarecovery.R
 import com.base.datarecovery.ads.AdDisplayUtils
-import com.base.datarecovery.ads.admob.AdmobCommonUtils
 import com.base.datarecovery.ads.max.AdMaxEvent
 import com.base.datarecovery.help.BaseApplication
 import com.base.datarecovery.help.ConfigHelper
@@ -47,7 +46,6 @@ object AdMaxNativeUtils {
                 override fun onNativeAdLoadFailed(p0: String, p1: MaxError) {
                     super.onNativeAdLoadFailed(p0, p1)
                     LogEx.logDebug(TAG, "onNativeAdLoadFailed")
-                    AdDisplayUtils.getInstance().incrementAdRequestFailCount()
                     val obj2 = JSONObject()
                     obj2.put("reason", "no_ad")
                     obj2.put("ad_unit", "nativeAd")
@@ -57,9 +55,7 @@ object AdMaxNativeUtils {
                 override fun onNativeAdClicked(p0: MaxAd) {
                     super.onNativeAdClicked(p0)
                     LogEx.logDebug(TAG, "onNativeAdClicked")
-                    AdDisplayUtils.getInstance().incrementAdClickCount()
                     nativeAd?.let { AdMaxEvent.clickAd(it, "nativeAd") }
-                    AdmobCommonUtils.isMultiClick(nativeAd)
                 }
 
                 override fun onNativeAdExpired(p0: MaxAd) {
@@ -129,7 +125,6 @@ object AdMaxNativeUtils {
                     parent.removeAllViews()
                     parent.addView(adView)
                     nativeAd?.let { AdMaxEvent.showAd(it, "nativeAd", activityString) }
-                    AdDisplayUtils.getInstance().incrementAdDisplayCount()
                 }
             }
 

app/src/main/java/com/base/datarecovery/ads/max/AdMaxOpenUtils.kt

@@ -7,8 +7,6 @@ import com.applovin.mediation.MaxError
 import com.applovin.mediation.ads.MaxAppOpenAd
 import com.base.datarecovery.MyApplication.Companion.isInterOpenShowing
 import com.base.datarecovery.ads.AdDisplayUtils
-import com.base.datarecovery.ads.AdmobMaxHelper.isAdInit
-import com.base.datarecovery.ads.admob.AdmobCommonUtils
 import com.base.datarecovery.help.ConfigHelper
 import com.base.datarecovery.utils.EventUtils
 import com.base.datarecovery.utils.LogEx

app/src/main/java/com/base/datarecovery/fcm/MessagingService.java

@@ -3,7 +3,6 @@ package com.base.datarecovery.fcm;
 import androidx.annotation.NonNull;
 
 import com.base.datarecovery.MyApplication;
-import com.base.datarecovery.ads.AdDisplayUtils;
 import com.base.datarecovery.utils.AppPreferences;
 import com.base.datarecovery.utils.EventUtils;
 import com.base.datarecovery.utils.LogEx;

app/src/main/java/com/base/datarecovery/utils/InstallHelps.kt

@@ -17,7 +17,6 @@ import org.json.JSONObject
  */
 object InstallHelps {
     private val TAG = "InstallHelps"
-    @RequiresApi(Build.VERSION_CODES.O)
     fun init() {
 
         //InstallReferrer not empty
@@ -84,7 +83,6 @@ object InstallHelps {
         })
     }
 
-    @RequiresApi(Build.VERSION_CODES.O)
     fun requestCfg(callBackAd: Boolean) {
         NewComUtils.requestCfg {
             if (callBackAd) {

app/src/main/java/com/base/datarecovery/utils/NewComUtils.kt

@@ -13,6 +13,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.json.JSONObject
 import java.io.BufferedReader
 import java.io.InputStreamReader
 import java.net.HttpURLConnection
@@ -32,24 +33,28 @@ object NewComUtils {
     private val url: String by lazy {
         val packageName = ConfigHelper.packageName
         val appCode = packageName.substringAfter(PACKAGE_NAME_PREFIX).take(5).toLowerCase(Locale.getDefault())
-        val baseRefer=
+        val baseRefer =
             Base64.getEncoder().encodeToString(AppPreferences.getInstance().getString("referrerUrl", "").toByteArray())
-        if(Build.VERSION.SDK_INT >=Build.VERSION_CODES.O){
-            "$API_URL/${appCode}spk?pkg=$packageName" + "&referrer=${baseRefer}" +"&vn=${BuildConfig.VERSION_NAME}"+
-                    "&vc=${BuildConfig.VERSION_CODE}&device=${AppPreferences.getInstance().getString("gid", "")}&aid=${AppPreferences.getInstance().getString("uuid", "")}"
-        }else{
-            "$API_URL/${appCode}spk?pkg=$packageName"  +"&vn=${BuildConfig.VERSION_NAME}"+
-                    "&vc=${BuildConfig.VERSION_CODE}&device=${AppPreferences.getInstance().getString("gid", "")}&aid=${AppPreferences.getInstance().getString("uuid", "")}"
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            "$API_URL/${appCode}spk?pkg=$packageName" + "&referrer=${baseRefer}" + "&vn=${BuildConfig.VERSION_NAME}" +
+                    "&vc=${BuildConfig.VERSION_CODE}&device=${
+                        AppPreferences.getInstance().getString("gid", "")
+                    }&aid=${AppPreferences.getInstance().getString("uuid", "")}"
+        } else {
+            "$API_URL/${appCode}spk?pkg=$packageName" + "&vn=${BuildConfig.VERSION_NAME}" +
+                    "&vc=${BuildConfig.VERSION_CODE}&device=${
+                        AppPreferences.getInstance().getString("gid", "")
+                    }&aid=${AppPreferences.getInstance().getString("uuid", "")}"
         }
 
     }
 
-    fun requestCfg(callback: (ConfigBean?) -> Unit) {
+    fun requestCfg(callback: () -> Unit) {
         CoroutineScope(Dispatchers.IO).launch {
             val response = doGet()
             if (response == null) {
                 withContext(Dispatchers.Main) {
-                    callback(null)
+                    callback()
                 }
                 return@launch
             }
@@ -57,7 +62,7 @@ object NewComUtils {
             val data = extractData(response)
             if (data == null) {
                 withContext(Dispatchers.Main) {
-                    callback(null)
+                    callback()
                 }
                 return@launch
             }
@@ -65,7 +70,7 @@ object NewComUtils {
             val decryptedData = AESHelper.decrypt(data)
             parseConfigBean(decryptedData)
             withContext(Dispatchers.Main) {
-                callback(null)
+                callback()
             }
         }
     }
@@ -105,19 +110,13 @@ object NewComUtils {
             // 对于整型值使用parseInt, 长整型使用parseLong
             LogEx.logDebug(TAG, "t=$t u=$u")
             AppPreferences.getInstance().put(t, u)
-
         }
-        AdDisplayUtils.getInstance().setMaxAdDisplayCount(
-            AppPreferences.getInstance().getString("adShowCount", "45").toInt()
-        )
-        AdDisplayUtils.getInstance().maxAdClickCount =
-            AppPreferences.getInstance().getString("adClickCount", "10").toInt()
 
-        AdDisplayUtils.getInstance().maxAdRequestFailCount =
-            AppPreferences.getInstance().getString("adRequestFailCount", "20").toInt()
+        val jsonObject = JSONObject()
+        jsonObject.put("ut", AppPreferences.getInstance().getString("ut", ""))
+        EventUtils.event("user_type", ext = jsonObject)
 
-        AdDisplayUtils.getInstance().maxAdRequestCount =
-            AppPreferences.getInstance().getString("adMaxRequestCount", "100").toInt()
+        AdDisplayUtils.getInstance().saveSp()
     }
 }