Merge branch 'master' of gitlab.huolea.com:koko/data-recovery-white

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

@@ -52,7 +52,12 @@ object AdMaxEvent {
         obj.put("networkplacement", ad?.networkPlacement)
         obj.put("requestLatencyMillis", ad?.requestLatencyMillis)
         obj.put("valueMicros", ad?.revenue)
-        EventUtils.event("ad_click", ext = obj)
+        if(!adUnit.equals("NativeAd")){
+            EventUtils.event("ad_click", ext = obj)
+        }else{
+            EventUtils.event("big_imgad_click", ext = obj)
+        }
+
     }
 
     fun showAd(ad: MaxAd?, adUnit: String) {

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

@@ -77,6 +77,7 @@ object AdMaxInterstitialUtils {
                 override fun onAdClicked(p0: MaxAd) {
                     LogEx.logDebug(TAG, "onAdClicked")
                     AdDisplayUtils.getInstance().incrementAdClickCount()
+                    AdMaxEvent.clickAd(p0,"interAd")
                 }
 
 

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

@@ -56,6 +56,7 @@ object AdMaxNativeUtils {
                     AdDisplayUtils.getInstance().incrementAdClickCount()
                     nativeAd?.let { AdMaxEvent.clickAd(it, "nativeAd") }
                     AdmobCommonUtils.isMultiClick(nativeAd)
+                    AdMaxEvent.clickAd(p0,"NativeAd")
                 }
 
                 override fun onNativeAdExpired(p0: MaxAd) {

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

@@ -40,6 +40,7 @@ object AdMaxOpenUtils {
 
                 override fun onAdDisplayed(p0: MaxAd) {
                     AdDisplayUtils.getInstance().incrementAdDisplayCount()
+                    AdMaxEvent.showAd(p0,"openAd")
                 }
 
                 override fun onAdHidden(p0: MaxAd) {
@@ -52,6 +53,7 @@ object AdMaxOpenUtils {
                     AdDisplayUtils.getInstance().incrementAdClickCount()
 //                    com.base.datarecovery.ads.max.AdMaxEvent.clickAd(appOpenAd, "openAd")
                     AdmobCommonUtils.isMultiClick(appOpenAd)
+                    AdMaxEvent.clickAd(p0,"openAd")
                 }
 
 
@@ -107,6 +109,7 @@ object AdMaxOpenUtils {
 
         if (appOpenAd?.isReady == true) {
             LogEx.logDebug(TAG, "isReady=false")
+            appOpenAd?.setRevenueListener(AdMaxEvent.EventOnPaidEventListener())
             appOpenAd?.showAd()
         } else {
             appOpenAd?.loadAd()