[李俊岐] 优化

app/src/main/java/com/ym/game/activity/SplashActivity.kt

@@ -71,7 +71,7 @@ class SplashActivity : BaseActivity(), SplashContract.View {
         if (!SettingPreference.getIsShowGuide()) {
             EventUtils.onEvent("SplashActivity_loadSplash")
             AdManager.loadSplashAd(this,
-                ADConfig.AD_SPLASH, "splash",tv_skipview, splash_container!!,object : ZXADSplashListener {
+                AdUtils.AD_SPLASH, "splash",tv_skipview, splash_container!!,object : ZXADSplashListener {
                     override fun onAdShow() {}
 
                     override fun onAdSkip() {

app/src/main/java/com/ym/game/view/PuzzleDialog.kt

@@ -43,7 +43,6 @@ import com.ym.library.module.StatusEntity
 import com.ym.library.net.BaseObserver
 import com.ym.library.net.GameApiClient
 import com.ym.library.net.RxSchedulers
-import com.ym.library.utils.ADConfig
 import com.ym.library.utils.AdUtils
 import com.ym.library.utils.EventUtils
 import com.ym.piggybank.adapter.PuzzleTopAdapter

app/src/main/java/com/ym/game/view/TurntableDialog.kt

@@ -129,11 +129,12 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
 
     private fun showAd() {
         AdManager.playRewardAd(
-            ADConfig.AD_REWARD_VIDIO,
+            AdUtils.AD_REWARD_VIDIO,
             "turntable_lottery",
             (context as Activity),
             object : ZXADVideoListener {
                 override fun onAdClose() {
+                    AdUtils.loadNextCacheRewardVideoAd((context as Activity))
                     getVideoAcceleratorsReceive3();
                     reset()
                     btnTurntableLottery?.isEnabled = false

library/src/main/java/com/ym/library/utils/ADConfig.kt

-package com.ym.library.utils;
-
-
-object ADConfig{
-
-
-  val AD_SPLASH = "splash"//开屏
-  val AD_LOAD_SPLASH = "task_load_splash"//开屏
-  val AD_VIDEO = "luck_card_video"
-  val AD_COINS_VIDEO = "sleep_coins_video"
-  val AD_CARD_BIGIMAGE = "scratch_card_bigimage"//模板
-  val AD_ACTIVITY_POPUP = "home_activity_popup"//插屏
-//        val AD_FEED = "feed"
-//        val AD_LOCK_SCREEN = "lock_screen"
-//        val AD_CLEANING_UP_POP = "cleaning_up_pop"
-//        val AD_AFTER_CLOSING_SCREEN = "after_closing_screen"
-//        val AD_AFTER_CLEANING_VIDEO = "after_cleaning_video"
-//        val AD_DRAW_CLEANING_VIDEO = "small_video_list_bigimage"//TODO  设置draw视频
-//        val CLEAR_FINISH = "clear_finish"//清理完成全屏视频
-//        val OTHER_APP_START = "other_app_start"//其他app打开监听
-
-
-  //    862 开屏广告位 splash
-  //    863 信息流广告位 feed
-  //    864 锁屏广告位 lock_screen
-  //    865 清理中弹窗广告位 cleaning_up_pop
-  //    866 关闭后插屏广告位 after_closing_screen
-  //    867 清理后激励视频广告位 after_cleaning_video
-  //    868 Draw视频广告位 small_video_list_bigimage
-  //=================================农场
-  val AD_REWARD_VIDIO = "common_video"//激励视频
-  val AD_IMG_FADE = "common_bigimage"//大图
-}
\ No newline at end of file

library/src/main/java/com/ym/library/utils/AdUtils.kt

 package com.ym.library.utils
 
 import android.app.Activity
+import android.os.Handler
+import android.os.Message
 import android.util.Log
 import android.widget.FrameLayout
 import com.ym.admodule.config.AdManager
@@ -11,14 +13,30 @@ import com.ym.library.module.StatusEntity
 import com.ym.library.net.BaseObserver
 import com.ym.library.net.GameApiClient
 import com.ym.library.net.RxSchedulers
-import com.ym.modulecommon.AppliContext
-import java.lang.Exception
 
 object AdUtils {
-    val TAG = "AdUtils"
+    private const val TAG = "AdUtils"
+    const val AD_SPLASH = "splash"//开屏
+    const val AD_IMG_FADE = "common_bigimage"//大图
+    const val AD_REWARD_VIDIO = "common_video"//激励视频
+    private var activity: Activity? = null
+    private var handler = object : Handler() {
+        override fun handleMessage(msg: Message?) {
+            super.handleMessage(msg)
+            when (msg?.what) {
+                0 -> {
+                    if (activity != null) {
+                        AdManager.loadNextCacheRewardVideoAd(AD_REWARD_VIDIO, activity!!)
+                    }
+                }
+            }
+        }
+    }
+
     fun playRewardAd(activity: Activity, actionName: String, listener: IAdVideoListener) {
+        this.activity = activity
         AdManager.playRewardAd(
-            ADConfig.AD_REWARD_VIDIO,
+            AD_REWARD_VIDIO,
             actionName,
             activity,
             object : ZXADVideoListener {
@@ -30,20 +48,21 @@ object AdUtils {
                     loadNextCacheRewardVideoAd(activity)
                     //看视频上报
                     getVideoAcceleratorsReceive();
+                    handler?.removeCallbacksAndMessages(null)
                 }
 
                 override fun onAdShow() {
                     Utils.showToast(activity, "看完视频可获得奖励")
-                  // AdManager.loadNextCacheRewardVideoAd(ADConfig.AD_VIDEO, activity!!)
+                    handler?.sendEmptyMessageDelayed(0, 2000)
                 }
 
                 override fun onAdVideoBarClick() {
-                    Log.d(TAG,"onAdVideoBarClick:")
+                    Log.d(TAG, "onAdVideoBarClick:")
                 }
 
                 override fun onError(errorMsg: String?) {
                     listener?.onError(errorMsg)
-                    Log.d(TAG,"onError:" + errorMsg)
+                    Log.d(TAG, "onError:" + errorMsg)
                 }
 
             })
@@ -52,7 +71,7 @@ object AdUtils {
 
     fun showFeedAd(activity: Activity, actionName: String, view: FrameLayout) {
         AdManager.showFeedAd(
-            ADConfig.AD_IMG_FADE,
+            AD_IMG_FADE,
             actionName,
             ZXADSizeConfig(
                 //                Utils.px2dip(PhoneUtils.getScreenWidth(activity).toFloat()) - 40, 280
@@ -80,13 +99,13 @@ object AdUtils {
 
     //预加载激励
     fun loadNextCacheRewardVideoAd(activity: Activity) {
-        AdManager.loadNextCacheRewardVideoAd(ADConfig.AD_REWARD_VIDIO, activity)
+        AdManager.loadNextCacheRewardVideoAd(AD_REWARD_VIDIO, activity)
     }
 
     //预加载信息流
     fun loadFeedCacheAdToCache(activity: Activity) {
         AdManager.loadFeedAdToCache(
-            ADConfig.AD_IMG_FADE, activity, ZXADSizeConfig(
+            AD_IMG_FADE, activity, ZXADSizeConfig(
 //                Utils.px2dip(PhoneUtils.getScreenWidth(activity).toFloat()) - 40, 280
                 Utils.px2dip(PhoneUtils.getScreenWidth(activity).toFloat()) - 56,
                 ((Utils.px2dip(activity.windowManager?.defaultDisplay?.width!!.toFloat()) - 56) * 0.66).toInt()