Merge branch 'dev_heliduanshipinxiariban_0725' of...

Merge branch 'dev_heliduanshipinxiariban_0725' of http://gitlab.mints-id.com/android/android_vedio into dev_heliduanshipinxiariban_0725

video/app/src/main/java/com/mints/helivideo/ad/draw/DrawExpressManager.kt

@@ -54,6 +54,8 @@ class DrawExpressManager {
 
     private var mExpressAdCallback: ExpressAdCallback? = null
 
+    private var viewCache = Stack<FrameLayout>()
+
     // 载体
     private var adcode = ""
     private var ecpm = ""
@@ -190,8 +192,8 @@ class DrawExpressManager {
             adShowTime = System.currentTimeMillis()
             isLoadSuccess = 0
             isClickScreen = true
-            callback?.loadSuccess(frameLayout)
-//            callback?.loadSuccess(viewCache.lastElement())
+//            callback?.loadSuccess(frameLayout)
+            callback?.loadSuccess(viewCache.lastElement())
         } else {
             LogUtil.e(TAG, "gromore draw信息流--> 5、展示广告时失败了，广告可能超时45分钟  onError  ")
             // 状态重置
@@ -223,11 +225,25 @@ class DrawExpressManager {
                         (view.parent as ViewGroup).removeView(view)
                     }
                     frameLayout?.addView(view)
-//                    val view: FrameLayout = frameLayout!!
-//                    val frameLayout = FrameLayout(MintsApplication.getContext())
-//                    frameLayout.addView(view)
-//                    viewCache.add(frameLayout)
                 }
+//                val view: FrameLayout = frameLayout!!
+//                val frameLayout = FrameLayout(MintsApplication.getContext())
+//                frameLayout.addView(view)
+                viewCache.add(frameLayout)
+
+//                mExpressAdCallback?.let {
+//                    if (it.renderSuccess(viewCache.lastElement())) {
+//                        LogUtil.d(
+//                            TAG,
+//                            "gromore信息流 onRenderSuccess -> showAd->$isShowAd \n adcode->$adcode ecpm->$ecpm"
+//                        )
+//
+//                        isLoadSuccess = 0
+//                        isShowAd = true
+//                        adShowTime = System.currentTimeMillis()
+//                    }
+//                }
+//                mExpressAdCallback = null
             }
 
             override fun onRenderFail(p0: View?, p1: String?, p2: Int) {
@@ -259,6 +275,8 @@ class DrawExpressManager {
         ecpm = ""
         adSource = ""
 
+        viewCache.clear()
+
         mTTFeedAd?.destroy()
         this.mExpressAdCallback = null
     }

video/app/src/main/java/com/mints/helivideo/ad/express/ExpressManager.kt

@@ -194,20 +194,6 @@ class ExpressManager {
     private fun showExpressView(it: TTFeedAd) {
         it.setExpressRenderListener(object : MediationExpressRenderListener {
             override fun onRenderSuccess(p0: View?, p1: Float, p2: Float, p3: Boolean) {
-                mExpressAdCallback?.let {
-                    if (it.renderSuccess(frameLayout)) {
-                        LogUtil.d(
-                            TAG,
-                            "gromore信息流 onRenderSuccess -> showAd->$isShowAd \n adcode->$adcode ecpm->$ecpm"
-                        )
-
-                        isLoadSuccess = 0
-                        isShowAd = true
-                        adShowTime = System.currentTimeMillis()
-                    }
-                }
-                mExpressAdCallback = null
-
                 Log.i(TAG, "onRenderSuccess")
                 it.setDislikeCallback(ForegroundOrBackground.getTopActivity(),
                     object : TTAdDislike.DislikeInteractionCallback {
@@ -229,6 +215,20 @@ class ExpressManager {
                     }
                     frameLayout?.addView(view)
                 }
+
+                mExpressAdCallback?.let {
+                    if (it.renderSuccess(frameLayout)) {
+                        LogUtil.d(
+                            TAG,
+                            "gromore信息流 onRenderSuccess -> showAd->$isShowAd \n adcode->$adcode ecpm->$ecpm"
+                        )
+
+                        isLoadSuccess = 0
+                        isShowAd = true
+                        adShowTime = System.currentTimeMillis()
+                    }
+                }
+                mExpressAdCallback = null
             }
 
             override fun onRenderFail(p0: View?, p1: String?, p2: Int) {