update

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

@@ -61,7 +61,7 @@ object AdMaxEvent {
 
     }
 
-    fun showAd(ad: MaxAd?, adUnit: String,activity: Activity) {
+    fun showAd(ad: MaxAd?, adUnit: String,activity: Activity?) {
         val obj = JSONObject()
         obj.put("UnitId", ad?.adUnitId)
         obj.put("ad_unit", adUnit)
@@ -74,8 +74,8 @@ object AdMaxEvent {
         obj.put("networkplacement", ad?.networkPlacement)
         obj.put("latency", ad?.requestLatencyMillis)
         obj.put("valueMicros", ad?.revenue)
-        obj.put("from",activity.javaClass.simpleName)
-        LogEx.logDebug("glc","from:   "+activity.javaClass.simpleName)
+        obj.put("from",activity?.javaClass?.simpleName)
+        LogEx.logDebug("glc","from:   "+activity?.javaClass?.simpleName)
         if(!adUnit.equals("nativeAd")){
             EventUtils.event("ad_show", ext = obj)
         }else{

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

@@ -32,7 +32,6 @@ object AdMaxInterstitialUtils {
 
     private fun setListener(activity: Activity) {
         if (interstitialAd == null) {
-
             val reqId = UUID.randomUUID().toString()
             val obj = JSONObject()
             obj.put("req_id", reqId)
@@ -87,7 +86,7 @@ object AdMaxInterstitialUtils {
                     val obj2 = JSONObject()
                     obj2.put("code", p1.code)
                     obj2.put("reason", p1.message)
-                    obj2.put("ad_unit", "interstitialAd")
+                    obj2.put("ad_unit", "interAd")
                     EventUtils.event("ad_show_error", ext = obj2)
                 }
             })
@@ -95,18 +94,12 @@ object AdMaxInterstitialUtils {
         }
     }
 
-    fun showInterstitialAd(
-        activity: Activity,
-        onHidden: (() -> Unit)? = null
-    ) {
+    fun showInterstitialAd(activity: Activity, onHidden: (() -> Unit)? = null) {
         setListener(activity)
 
         if (activity.isFinishing || activity.isDestroyed) {
             return
         }
-        val obj1 = JSONObject()
-        obj1.put("ad_unit", "interAd")
-        EventUtils.event("ad_prepare_show", ext = obj1)
 
         if (isAdExpired()) {
             val obj2 = JSONObject()
@@ -123,10 +116,14 @@ object AdMaxInterstitialUtils {
             return
         }
 
+        val obj1 = JSONObject()
+        obj1.put("ad_unit", "interAd")
+        EventUtils.event("ad_prepare_show", ext = obj1)
+
         this.onHidden = onHidden
         if (interstitialAd?.isReady == true) {
             LogEx.logDebug(TAG, "isReady=true")
-            interstitialAd?.showAd()
+            interstitialAd?.showAd(activity)
         } else {
             LogEx.logDebug(TAG, "onAdDisplayFailed")
             val obj2 = JSONObject()
@@ -155,7 +152,7 @@ object AdMaxInterstitialUtils {
         }
         loadingListener = {
             customDialog?.dismiss()
-            interstitialAd?.showAd()
+            interstitialAd?.showAd(activity)
             loadingListener = null
         }
 

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

@@ -105,7 +105,9 @@ object AdMaxOpenUtils {
 
 
         LogEx.logDebug(TAG, "showAppOpenAd continue")
-
+        val obj1 = JSONObject()
+        obj1.put("ad_unit", "openAd")
+        EventUtils.event("ad_prepare_show", ext = obj1)
         AdMaxOpenUtils.onHidden = onHidden
 
         if (appOpenAd?.isReady == true) {
@@ -116,9 +118,6 @@ object AdMaxOpenUtils {
             loadingListener = {
                 LogEx.logDebug(TAG, "loadingListener callback")
                 loaded?.invoke()
-                val obj1 = JSONObject()
-                obj1.put("ad_unit", "openAd")
-                EventUtils.event("ad_prepare_show", ext = obj1)
                 appOpenAd?.showAd()
                 loadingListener = null
             }