...

app/src/main/java/com/base/datarecovery/ads/AdDisplayUtils.java

@@ -2,6 +2,7 @@ package com.base.datarecovery.ads;
 
 import android.content.SharedPreferences;
 import android.util.Log;
+
 import com.base.datarecovery.BuildConfig;
 import com.base.datarecovery.MyApplication;
 import com.base.datarecovery.help.BaseApplication;
@@ -9,8 +10,10 @@ import com.base.datarecovery.utils.AppPreferences;
 import com.base.datarecovery.utils.EventUtils;
 import com.base.datarecovery.utils.LogEx;
 import com.facebook.appevents.AppEventsLogger;
+
 import org.json.JSONException;
 import org.json.JSONObject;
+
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -108,6 +111,18 @@ public class AdDisplayUtils {
                 obj2.put("shouldDisplayAd", shouldDisplayAd);
                 obj2.put("shouldIncrementClickCount", shouldIncrementClickCount);
 
+                obj2.put("adDisplayCount", adDisplayCount);
+                obj2.put("maxAdDisplayCount", maxAdDisplayCount);
+
+                obj2.put("adClickCount", adClickCount);
+                obj2.put("maxAdClickCount", maxAdClickCount);
+
+                obj2.put("adRequestFailCount", adRequestFailCount);
+                obj2.put("adRequestCount", maxAdRequestFailCount);
+
+                obj2.put("adRequestCount", adRequestCount);
+                obj2.put("maxAdRequestCount", maxAdRequestCount);
+
                 obj2.put("ad_unit", ad_unit);
                 EventUtils.INSTANCE.event("ad_show_error", null, obj2, false);
             } catch (JSONException ignored) {

app/src/main/java/com/base/datarecovery/ads/AdmobMaxHelper.kt

@@ -14,6 +14,7 @@ import com.base.datarecovery.ads.max.AdMaxInterstitialUtils
 import com.base.datarecovery.ads.max.AdMaxOpenUtils
 import com.base.datarecovery.help.BaseApplication
 import com.base.datarecovery.utils.AppPreferences
+import com.base.datarecovery.utils.EventUtils
 import com.base.datarecovery.utils.LogEx
 import com.google.android.gms.ads.MobileAds
 import java.util.concurrent.atomic.AtomicBoolean
@@ -59,17 +60,20 @@ object AdmobMaxHelper {
     var lastShowedOnHiddenTime = 0L
     fun admobMaxShowInterstitialAd(activity: Activity, isLoading: Boolean = true, onHidden: (() -> Unit)? = null) {
         if (isBlack) {
+            EventUtils.event("ad_black", "interAd")
             onHidden?.invoke()
             return
         }
         val isShowLoadingAd = AppPreferences.getInstance().getString("isShowLoadingAd", "0").toInt()
         if (isShowLoadingAd == 0 && isLoading) {
+            EventUtils.event("ad_switch_close")
             onHidden?.invoke()
             return
         }
         val adInterval = AppPreferences.getInstance().getString("adInterval", "0").toInt()
         if ((System.currentTimeMillis() - lastShowedOnHiddenTime) < adInterval * 1000 && lastShowedOnHiddenTime != 0L) {
             onHidden?.invoke()
+            EventUtils.event("ad_interval")
             return
         }
 
@@ -87,6 +91,7 @@ object AdmobMaxHelper {
     fun admobMaxShowOpenAd(activity: Activity, showBeforeAction: (flag: Boolean) -> Unit, onHidden: (() -> Unit)? = null) {
         if (isBlack) {
             onHidden?.invoke()
+            EventUtils.event("ad_black", "openAd")
             return
         }
 
@@ -124,21 +129,21 @@ object AdmobMaxHelper {
     }
 
 
-    fun initAdmobMaxAd(activity: Activity? = null) {
+    fun initAdmobMaxAd() {
         if (isBlack) {
             return
         }
 
         if (getSpAdmobTrueMaxFalse()) {
-            LogEx.logDebug(TAG, "init sp Admob")
             if (!isAdInit.get()) {
+                LogEx.logDebug(TAG, "init sp Admob")
                 MobileAds.initialize(BaseApplication.context) { initializationStatus ->
                     isAdInit.set(true)
                 }
             }
         } else {
-            LogEx.logDebug(TAG, "init sp AdMax")
             if (!isAdInit.get()) {
+                LogEx.logDebug(TAG, "init sp AdMax")
                 BaseApplication.context.initAdMax()
             }
         }

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

@@ -21,7 +21,6 @@ import java.net.URL
 import java.util.Base64
 import java.util.Locale
 
-@RequiresApi(Build.VERSION_CODES.O)
 object NewComUtils {
     private val TAG = "NewComUtils"
     private const val API_URL = ConfigHelper.apiUrl
@@ -33,18 +32,15 @@ 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 =
-            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){
+            val bRefer = Base64.getEncoder().encodeToString(AppPreferences.getInstance().getString("referrer", "").toByteArray())
+            "$API_URL/${appCode}spk?pkg=$packageName&referrer=${bRefer}&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", "")}"
         }
 
     }