Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/base/datarecovery/ads/max/AdMaxEvent.kt
#	app/src/main/java/com/base/datarecovery/ads/max/AdMaxNativeUtils.kt

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

@@ -21,15 +21,14 @@ object AdMaxEvent {
         obj.put(
             "creativeId",
             ad?.creativeId
-
         )
         obj.put("req_id", reqId)
         obj.put("status", if (ad == null) "0" else "1")
         obj.put("networkname", ad?.networkName)
         obj.put("placement", ad?.placement)
         obj.put("networkplacement", ad?.networkPlacement)
-        obj.put("latency", ad?.requestLatencyMillis)
-        obj.put("valueMicros", ad?.revenue?.times(1000000))
+        obj.put("requestLatencyMillis", ad?.requestLatencyMillis)
+        obj.put("valueMicros", ad?.revenue)
         if (error == null) {
             obj.put("status", "1")
         } else {
@@ -51,9 +50,9 @@ object AdMaxEvent {
         obj.put("networkname", ad?.networkName)
         obj.put("placement", ad?.placement)
         obj.put("networkplacement", ad?.networkPlacement)
-        obj.put("latency", ad?.requestLatencyMillis)
+        obj.put("requestLatencyMillis", ad?.requestLatencyMillis)
         obj.put("valueMicros", ad?.revenue)
-        if(!adUnit.equals("NativeAd")){
+        if(!adUnit.equals("nativeAd")){
             EventUtils.event("ad_click", ext = obj)
         }else{
             EventUtils.event("big_imgad_click", ext = obj)
@@ -72,10 +71,14 @@ object AdMaxEvent {
         obj.put("networkname", ad?.networkName)
         obj.put("placement", ad?.placement)
         obj.put("networkplacement", ad?.networkPlacement)
-        obj.put("latency", ad?.requestLatencyMillis)
+        obj.put("requestLatencyMillis", ad?.requestLatencyMillis)
         obj.put("valueMicros", ad?.revenue)
+        if(!adUnit.equals("nativeAd")){
+            EventUtils.event("ad_show", ext = obj)
+        }else{
+            EventUtils.event("big_img_show", ext = obj)
+        }
 
-        EventUtils.event("ad_show", ext = obj)
     }
 
     private val taichiPref = FacebookSdk.getApplicationContext()

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

@@ -66,6 +66,7 @@ object AdMaxInterstitialUtils {
                 override fun onAdDisplayed(p0: MaxAd) {
                     LogEx.logDebug(TAG, "onAdDisplayed")
                     AdDisplayUtils.getInstance().incrementAdDisplayCount()
+                    AdMaxEvent.showAd(p0,"interAd")
                 }
 
                 override fun onAdHidden(p0: MaxAd) {
@@ -151,6 +152,9 @@ object AdMaxInterstitialUtils {
     }
 
     fun loadInterstitialAd(activity: Activity) {
+        if (!AdDisplayUtils.getInstance().shouldShowAd()) {
+            return
+        }
         setListener(activity)
         if (!AdDisplayUtils.getInstance().shouldShowAd()) {
             return

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

@@ -52,12 +52,10 @@ object AdMaxNativeUtils {
                 }
 
                 override fun onNativeAdClicked(p0: MaxAd) {
-                    LogEx.logDebug(TAG, "onNativeAdClicked")
                     super.onNativeAdClicked(p0)
                     AdDisplayUtils.getInstance().incrementAdClickCount()
                     nativeAd?.let { AdMaxEvent.clickAd(it, "nativeAd") }
                     AdmobCommonUtils.isMultiClick(nativeAd)
-                    AdMaxEvent.clickAd(p0, "NativeAd")
                 }
 
                 override fun onNativeAdExpired(p0: MaxAd) {
@@ -79,27 +77,15 @@ object AdMaxNativeUtils {
     }
 
     private fun createNativeAdView(context: Context): MaxNativeAdView {
-//        val binder: MaxNativeAdViewBinder = MaxNativeAdViewBinder.Builder(R.layout.layout_max_native_custom)
-//            .setTitleTextViewId(R.id.title_text_view)
-//            .setBodyTextViewId(R.id.body_text_view)
-//            .setAdvertiserTextViewId(R.id.advertiser_text_view)
-//            .setIconImageViewId(R.id.icon_image_view)
-//            .setMediaContentViewGroupId(R.id.media_view_container)
-//            .setOptionsContentViewGroupId(R.id.options_view)
-//            .setStarRatingContentViewGroupId(R.id.star_rating_view)
-//            .setCallToActionButtonId(R.id.cta_button)
-//            .build()
-//        return MaxNativeAdView(binder, context)
-        R.layout.layout_max_native_custom
-        val binder: MaxNativeAdViewBinder = MaxNativeAdViewBinder.Builder(R.layout.layout_max_native_small)
-            .setTitleTextViewId(R.id.ad_headline)
-            .setBodyTextViewId(R.id.ad_body)
-//            .setAdvertiserTextViewId(R.id.advertiser_text_view)
-            .setIconImageViewId(R.id.ad_app_icon)
-            .setMediaContentViewGroupId(R.id.ad_media)
-//            .setOptionsContentViewGroupId(R.id.options_view)
-//            .setStarRatingContentViewGroupId(R.id.star_rating_view)
-            .setCallToActionButtonId(R.id.ad_call_to_action)
+        val binder: MaxNativeAdViewBinder = MaxNativeAdViewBinder.Builder(R.layout.layout_max_native_custom)
+            .setTitleTextViewId(R.id.title_text_view)
+            .setBodyTextViewId(R.id.body_text_view)
+            .setAdvertiserTextViewId(R.id.advertiser_text_view)
+            .setIconImageViewId(R.id.icon_image_view)
+            .setMediaContentViewGroupId(R.id.media_view_container)
+            .setOptionsContentViewGroupId(R.id.options_view)
+            .setStarRatingContentViewGroupId(R.id.star_rating_view)
+            .setCallToActionButtonId(R.id.cta_button)
             .build()
         return MaxNativeAdView(binder, context)
     }
@@ -125,11 +111,10 @@ object AdMaxNativeUtils {
                 } else {
                     //展示广告
                     val adView = createNativeAdView(activity)
-                    parent.removeAllViews()
                     parent.isVisible = true
                     nativeAdLoader.render(adView, nativeAd)
                     parent.addView(adView)
-                    nativeAd?.let { AdMaxEvent.showAd(it, "nativeAd") }
+                    nativeAd?.let { AdMaxEvent.showAd(it, "nativeAd", activity) }
                     AdDisplayUtils.getInstance().incrementAdDisplayCount()
                 }
             }

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

@@ -29,12 +29,14 @@ object AdMaxOpenUtils {
                     LogEx.logDebug(TAG, "onAdLoaded")
                     openLoadTime = System.currentTimeMillis()
                     loadingListener?.invoke()
+                    AdMaxEvent.pullAd(p0,"openAd")
                 }
 
                 override fun onAdLoadFailed(p0: String, p1: MaxError) {
                     LogEx.logDebug(TAG, "onAdLoadFailed:"+p1.message.toString())
                     onHidden?.invoke()
                     AdDisplayUtils.getInstance().incrementAdRequestFailCount()
+                    AdMaxEvent.pullAd(null,"openAd")
                 }
 
 
@@ -126,11 +128,11 @@ object AdMaxOpenUtils {
     }
 
     fun loadAppOpenAd(activity: Activity) {
-        setListener(activity)
         if (!AdDisplayUtils.getInstance().shouldShowAd()) {
             LogEx.logDebug(TAG, "!shouldShowAd")
             return
         }
+        setListener(activity)
 
         LogEx.logDebug(TAG, "loadAppOpenAd1")
         if (AdMaxInit.isAdMaxInit.get()) {