优化9宫格抽奖逻辑、添加banner广告，代码合并

video/app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "com.mints.helivideo"
         minSdkVersion rootProject.ext.androidMinSdkVersion
         targetSdkVersion rootProject.ext.androidTargetSdkVersion
-        versionCode 2
-        versionName "1.0.1"
+        versionCode 4
+        versionName "1.0.3"
         flavorDimensions "default"
 
         // dex突破65535的限制
@@ -66,6 +66,7 @@ android {
             buildConfigField "String", "GROMORE_VIDEO_CODE", GROMORE_VIDEO_CODE
             buildConfigField "String", "GROMORE_DRAW_CODE", GROMORE_DRAW_CODE
             buildConfigField "String", "GROMORE_EXPRESS_CODE", GROMORE_EXPRESS_CODE
+            buildConfigField "String", "GROMORE_BANNER_CODE", GROMORE_BANNER_CODE
             buildConfigField "String", "WEIXIN_APP_PAY_ID", WEIXIN_APP_PAY_ID
 
             //混淆
@@ -87,6 +88,7 @@ android {
             buildConfigField "String", "GROMORE_VIDEO_CODE", GROMORE_VIDEO_CODE
             buildConfigField "String", "GROMORE_DRAW_CODE", GROMORE_DRAW_CODE
             buildConfigField "String", "GROMORE_EXPRESS_CODE", GROMORE_EXPRESS_CODE
+            buildConfigField "String", "GROMORE_BANNER_CODE", GROMORE_BANNER_CODE
             buildConfigField "String", "WEIXIN_APP_PAY_ID", WEIXIN_APP_PAY_ID
 
             //混淆
@@ -236,7 +238,6 @@ dependencies {
     // sharesdk
     implementation 'com.squareup:javawriter:2.1.1'
     // umeng 接入
-    // 穿山甲聚合 接入【穿山甲、快手】
 
     // 穿山甲短剧
     implementation("com.pangle.cn:pangrowth-sdk:3.7.0.1") {
@@ -249,7 +250,10 @@ dependencies {
         exclude group: 'com.tencent.mm.opensdk', module: 'wechat-sdk-android'
     }
 
+    // 穿山甲聚合 接入【穿山甲、快手】
     implementation "com.pangle.cn:mediation-sdk:5.3.6.0"
+    // 穿山甲测试工具
+//    implementation "com.pangle.cn:mediation-test-tools:5.3.6.0"
 
     // 腾讯播放器
     implementation "com.tencent.liteav:LiteAVSDK_Player:latest.release"

video/app/src/main/java/com/mints/helivideo/MintsApplication.java

@@ -76,7 +76,6 @@ public class MintsApplication extends MultiDexApplication {
         if (AppPreferencesManager.INSTANCE.get()
                 .getBoolean(Constant.LOAN_PERMISSION_FLAG, true)) return;
 
-
         initMiitHelper();
 
         TTAdManagerHolder.init(this);

video/app/src/main/java/com/mints/helivideo/ad/TTAdManagerHolder.java

@@ -14,6 +14,7 @@ import com.mints.helivideo.BuildConfig;
 import com.mints.helivideo.MintsApplication;
 import com.mints.helivideo.common.Constant;
 import com.mints.helivideo.utils.DeviceUuidFactory;
+import com.mints.helivideo.utils.LogUtil;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -45,17 +46,16 @@ public class TTAdManagerHolder {
     //step1:接入网盟广告sdk的初始化操作，详情见接入文档和穿山甲平台说明
     private static void doInit(Context context) {
         if (!sInit) {
-
             TTAdSdk.init(context, buildConfig(context), new TTAdSdk.InitCallback() {
                 @Override
                 public void success() {
 
-                    Log.i(TAG, "success: " + TTAdSdk.isInitSuccess());
+                    LogUtil.d(TAG, "TTAdManagerHolder 初始化：success: " + TTAdSdk.isInitSuccess());
                 }
 
                 @Override
                 public void fail(int code, String msg) {
-                    Log.i(TAG, "fail:  code = " + code + " msg = " + msg);
+                    LogUtil.d(TAG, "TTAdManagerHolder 初始化：fail:  code = " + code + " msg = " + msg);
                 }
             });
             sInit = true;
@@ -74,7 +74,7 @@ public class TTAdManagerHolder {
                 /**
                  * 上线前需要关闭debug开关，否则会影响性能
                  */
-                .debug(false)
+                .debug(BuildConfig.DEBUG)
                 /**
                  * 使用聚合功能此开关必须设置为true，默认为false，不会初始化聚合模板，聚合功能会吟唱
                  */

video/app/src/main/java/com/mints/helivideo/ad/banner/BannerManager.kt

+package com.mints.helivideo.ad.banner
+
+import android.app.Activity
+import android.view.View
+import android.widget.FrameLayout
+import com.bytedance.sdk.openadsdk.*
+import com.bytedance.sdk.openadsdk.mediation.ad.IMediationNativeAdInfo
+import com.bytedance.sdk.openadsdk.mediation.ad.MediationAdSlot
+import com.bytedance.sdk.openadsdk.mediation.ad.MediationNativeToBannerListener
+import com.mints.helivideo.BuildConfig
+import com.mints.helivideo.manager.UserManager
+import com.mints.helivideo.utils.LogUtil
+import com.mints.helivideo.utils.UIUtils
+import java.lang.ref.WeakReference
+
+/**
+ * banner
+ */
+object BannerManager {
+
+    private val TAG = BannerManager::class.java.simpleName
+
+    private var weakFrameLayout: WeakReference<FrameLayout>? = null
+    private var weakActivity: WeakReference<Activity>? = null
+    private var bannerAd: TTNativeExpressAd? = null
+
+    fun loadAd(act: Activity?, view: FrameLayout?) {
+        weakActivity = WeakReference<Activity>(act)
+        weakFrameLayout = WeakReference<FrameLayout>(view)
+//        if (UserManager.getInstance().vipFlag) {
+//            return
+//        }
+
+        LogUtil.d(TAG, "gromore banner广告-> 1、进入加载")
+        /** 这里是简单的banner请求adSlot设置，如果需要更多的设置，可参考AdUtils.kt中bannerAdSlot函数部分。 */
+        var adSlot: AdSlot = AdSlot.Builder()
+            .setCodeId(BuildConfig.GROMORE_BANNER_CODE)
+//            .setImageAcceptedSize(UIUtils.dp2px(weakActivity?.get(), 300f), UIUtils.dp2px(weakActivity?.get(), 45f)) // 单位px
+            .setImageAcceptedSize(UIUtils.dp2px(weakActivity?.get(), 300f), 0) // 单位px
+            .setUserID("1234")
+            .setMediationAdSlot(
+                MediationAdSlot.Builder()
+                    /**
+                     * banner混出自渲染信息流时，需要提供该转换listener，将信息流自渲染素材转成view。模板类型无需处理
+                     * 如果未使用banner混出信息流功能，则无需设置MediationNativeToBannerListener。
+                     * 如要使用混出功能，可参考AdUtils.kt类中getCSJMBannerViewFromNativeAd函数部分。
+                     */
+                    .setMediationNativeToBannerListener(object: MediationNativeToBannerListener() {
+                        override fun getMediationBannerViewFromNativeAd(adInfo: IMediationNativeAdInfo): View? {
+                            return null
+                        }
+                    })
+                    .build()
+            )
+            .build()
+
+        var adNativeLoader: TTAdNative = TTAdSdk.getAdManager().createAdNative(weakActivity?.get())
+        adNativeLoader.loadBannerExpressAd(adSlot, object : TTAdNative.NativeExpressAdListener {
+            override fun onNativeExpressAdLoad(ads: MutableList<TTNativeExpressAd>?) {
+                LogUtil.d(TAG, "banner广告-> 2、 load success: " + if (ads == null) "0" else ads?.size)
+
+                ads?.let {
+                    if (it.size > 0) {
+                        val ad: TTNativeExpressAd = it[0]
+                        bannerAd = ad
+                        bannerAd?.setExpressInteractionListener(object :
+                            TTNativeExpressAd.ExpressAdInteractionListener {
+                            override fun onAdClicked(view: View?, type: Int) {
+                            }
+
+                            override fun onAdShow(view: View?, type: Int) {
+                            }
+
+                            override fun onRenderFail(view: View?, msg: String?, code: Int) {
+                            }
+
+                            override fun onRenderSuccess(view: View?, width: Float, height: Float) {
+                            }
+
+                        })
+                        bannerAd?.setDislikeCallback(
+                            weakActivity?.get(),
+                            object : TTAdDislike.DislikeInteractionCallback {
+                                override fun onShow() {
+                                }
+
+                                override fun onSelected(
+                                    position: Int,
+                                    value: String?,
+                                    enforce: Boolean
+                                ) {
+                                    weakFrameLayout?.get()?.removeAllViews()
+                                }
+
+                                override fun onCancel() {
+                                }
+
+                            })
+
+                        showAd()
+                    }
+                }
+            }
+
+            override fun onError(code: Int, message: String?) {
+                LogUtil.e(TAG, "banner广告-> 2、 load fail: $code, $message")
+            }
+        })
+    }
+
+    private fun showAd() {
+        val bannerView: View? = bannerAd?.expressAdView
+        if (bannerView != null && weakFrameLayout != null) {
+            val bannerContainer = weakFrameLayout!!.get()
+            bannerContainer!!.removeAllViews()
+            bannerContainer!!.addView(bannerView)
+        }
+    }
+}
\ No newline at end of file

video/app/src/main/java/com/mints/helivideo/ad/splash/SplashManager.kt

 package com.mints.helivideo.ad.splash
 
 import android.app.Activity
+import android.util.Log
 import android.view.View
+import android.view.ViewGroup
 import android.widget.FrameLayout
-import com.bytedance.sdk.openadsdk.AdSlot
-import com.bytedance.sdk.openadsdk.TTAdNative
-import com.bytedance.sdk.openadsdk.TTAdSdk
-import com.bytedance.sdk.openadsdk.TTSplashAd
+import com.bytedance.sdk.openadsdk.*
 import com.bytedance.sdk.openadsdk.mediation.MediationConstant
 import com.bytedance.sdk.openadsdk.mediation.ad.MediationAdSlot
 import com.bytedance.sdk.openadsdk.mediation.ad.MediationSplashRequestInfo
 import com.mints.helivideo.BuildConfig
 import com.mints.helivideo.ad.AdStatusListener
+import com.mints.helivideo.utils.GromorePrintUtil
 import com.mints.helivideo.utils.LogUtil
 import com.mints.helivideo.utils.UIUtils
 import java.lang.ref.WeakReference
@@ -22,8 +22,11 @@ import java.lang.ref.WeakReference
 object SplashManager {
 
     // 兜底配置
-//    val pangleSplashBottom = object :
-//        MediationSplashRequestInfo(MediationConstant.ADN_PANGLE, "887382976", "5001121", "") {} //ok
+    val pangleSplashBottom = object :
+        MediationSplashRequestInfo(
+            MediationConstant.ADN_PANGLE, "888403155",
+            BuildConfig.GROMORE_APP_ID, ""
+        ) {} //ok
 
     private val TAG = SplashManager::class.java.simpleName
 
@@ -53,14 +56,14 @@ object SplashManager {
             )
             .setMediationAdSlot(
                 MediationAdSlot.Builder()
-//                    .setMediationSplashRequestInfo(pangleSplashBottom)
+                    .setMediationSplashRequestInfo(pangleSplashBottom)
                     .build()
             )
             .build()
 
         adNativeLoader.loadSplashAd(adslot, object : TTAdNative.SplashAdListener {
             override fun onError(p0: Int, p1: String?) {
-                LogUtil.d(
+                LogUtil.e(
                     TAG,
                     "gromore 开屏广告--> 3、Gromore  onSplashAdLoadFail  adErrorCode=${p0}  " + p1
                 )
@@ -84,13 +87,54 @@ object SplashManager {
     /**
      * 展示开屏广告
      */
-    fun showAd(view: FrameLayout, adStatusListener: AdStatusListener?) {
+    fun showAd(activity: Activity, view: FrameLayout, adStatusListener: AdStatusListener?) {
         this.adStatusListener = adStatusListener
         isShowAd = false
         if (mTTSplashAd != null && isLoadSuccess == 2) {
             LogUtil.d(TAG, "gromore 开屏广告--> 准备调用show")
             mTTSplashAd?.let {
                 it.setSplashInteractionListener(adInteractionListener)
+//                it.setSplashClickEyeListener(object: ISplashClickEyeListener {
+//                    override fun onSplashClickEyeAnimationStart() {
+//                    }
+//
+//                    override fun onSplashClickEyeAnimationFinish() {
+//                    }
+//
+//                    override fun isSupportSplashClickEye(isSupport: Boolean): Boolean {
+//                        var dp = it.splashClickEyeSizeToDp
+//
+//                        // 点睛相关处理
+//                        val minWindowSizeFromSdk: IntArray = it.getSplashClickEyeSizeToDp()
+//                        val flContent=it.splashView
+//                        val params: ViewGroup.LayoutParams = flContent.getLayoutParams() as ViewGroup.LayoutParams
+//                        params.height = UIUtils.dp2px(activity, minWindowSizeFromSdk[1].toFloat())
+//                        params.width = UIUtils.dp2px(activity, minWindowSizeFromSdk[0].toFloat())
+//                        flContent.setLayoutParams(params)
+//                        flContent.setBackgroundResource(R.color.common_half_alpha)
+//                        flContent.translationX = 200f
+//                        flContent.translationY = 200f
+//                        it.splashClickEyeAnimationFinish()
+//                        return false
+//                    }
+//                })
+//                it.setSplashCardListener(object : ISplashCardListener {
+//                    override fun onSplashEyeReady() {
+//                        it.splashClickEyeAnimationFinish()
+//                    }
+//
+//                    override fun onSplashClickEyeClose() {
+//                        adStatusListener?.adClose(null)
+//                    }
+//
+//                    override fun setSupportSplashClickEye(isSupport: Boolean) {
+//                    }
+//
+//                    override fun getActivity(): Activity {
+//                        return  activity
+//                    }
+//
+//                })
                 view.addView(it.splashView)
             }
         } else {

video/app/src/main/java/com/mints/helivideo/ad/video/InMoneyVideo.java

@@ -145,7 +145,7 @@ public class InMoneyVideo {
             public void onError(int i, String s) {
                 isLoadSuccess = 0;
 
-                LogUtil.e(TAG, "onError  " + i + s + "isPreLoad[为true是预加载调用]=" + isPreLoad);
+                LogUtil.e(TAG, "gromore预加载 激励视频广告-->onError  " + i + s + "isPreLoad[为true是预加载调用]=" + isPreLoad);
 
                 // isPreLoad=true 表示是预加载调用  不需要调用监听回调
                 if (!isPreLoad) {
@@ -168,7 +168,7 @@ public class InMoneyVideo {
 
             @Override
             public void onRewardVideoCached(TTRewardVideoAd ttRewardVideoAd) {
-                LogUtil.d(TAG, "gromore激励视频广告--> 4、onRewardVideoCached ");
+                LogUtil.d(TAG, "gromore预加载 激励视频广告--> 4、onRewardVideoCached ");
                 isLoadSuccess = 2;
                 adLoadTime = System.currentTimeMillis();
 
@@ -231,6 +231,10 @@ public class InMoneyVideo {
         public void onVideoError() {
             isLoadSuccess = 0;
             LogUtil.e(TAG, "gromore预加载 激励视频广告-->onVideoError");
+
+            if (adStatusListener != null) {
+                adStatusListener.adFail();
+            }
         }
 
         @Override

video/app/src/main/java/com/mints/helivideo/ad/video/InMoneyVideoNoPre.java

@@ -81,6 +81,9 @@ public class InMoneyVideoNoPre {
             public void onError(int i, String s) {
                 LogUtil.e(TAG, "gromore实时加载 激励视频广告-->onError  " + i + s);
 
+                if (adStatusListener != null) {
+                    adStatusListener.adFail();
+                }
             }
 
             @Override
@@ -165,6 +168,9 @@ public class InMoneyVideoNoPre {
 
         @Override
         public void onVideoError() {
+            if (adStatusListener != null) {
+                adStatusListener.adFail();
+            }
             LogUtil.e(TAG, "gromore实时加载 激励视频广告-->onVideoError");
         }
 

video/app/src/main/java/com/mints/helivideo/common/Constant.kt

@@ -24,6 +24,7 @@ object Constant {
     const val LUCKY_FLAG = "LUCKY_FLAG"
     const val LUCKY_COMPLETE = "LUCKY_COMPLETE"
     const val LUCKY_NEED = "LUCKY_NEED"
+    const val LUCKY_MY_FIRST = "LUCKY_MY_FIRST"
 
 
     const val CARRIERTYPE_CSJ_VEDIO = "1"

video/app/src/main/java/com/mints/helivideo/ui/activitys/AboutusActivity.kt

@@ -4,10 +4,11 @@ import android.annotation.SuppressLint
 import android.os.Bundle
 import android.util.Log
 import android.view.View
-import android.widget.Button
+import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
 import com.bytedance.hume.readapk.HumeSDK
+import com.bytedance.mtesttools.api.TTMediationTestTool
 import com.bytedance.sdk.dp.DPDrama
 import com.bytedance.sdk.dp.DPSdk
 import com.bytedance.sdk.dp.IDPWidgetFactory
@@ -57,6 +58,11 @@ class AboutusActivity : BaseActivity(), View.OnClickListener {
         tvAboutasVersion.setOnLongClickListener {
             ToastUtil.showLong(this, "包名：" + Constant.MINTS_PKG_NAME)
 
+//            TTMediationTestTool.launchTestTools(
+//                this@AboutusActivity,
+//                object : TTMediationTestTool.ImageCallBack {
+//                   override fun loadImage(imageView: ImageView?, s: String?) {}
+//                })
 //            readyGo(NinePayActivity::class.java)
 //            VoiceRedEnvelopeManager.load(23,23)
             true

video/app/src/main/java/com/mints/helivideo/ui/activitys/NineActivity.kt

@@ -222,6 +222,7 @@ class NineActivity : BaseActivity(), View.OnClickListener, NineView {
                         val bundle = Bundle()
                         bundle.putString(NinePayActivity.PID, data.pid)
                         bundle.putString(NinePayActivity.TITLE, data.title)
+                        bundle.putString(NinePayActivity.TYPE, data.type)
                         readyGoThenKill(NinePayActivity::class.java, bundle)
                     }, 1500)
                 }
@@ -243,20 +244,20 @@ class NineActivity : BaseActivity(), View.OnClickListener, NineView {
 
     private fun initData() {
         val messages = ArrayList<String>()
-        messages.add("恭喜用户183******66抽中 +7天会员")
-        messages.add("恭喜用户177******34抽中 +1天会员")
-        messages.add("恭喜用户134******49抽中 +3天会员")
-        messages.add("恭喜用户159******51抽中 +5天会员")
+        messages.add("恭喜用户183******66抽中 终身会员")
+        messages.add("恭喜用户177******34抽中 +1年会员")
+        messages.add("恭喜用户134******49抽中 +14天会员")
+        messages.add("恭喜用户159******51抽中 +3天会员")
         messages.add("恭喜用户150******87抽中 +7天会员")
-        messages.add("恭喜用户134******65抽中 +3天会员")
-        messages.add("恭喜用户183******40抽中 +5天会员")
-        messages.add("恭喜用户131******08抽中 +1天会员")
-        messages.add("恭喜用户177******65抽中 +7天会员")
-        messages.add("恭喜用户180******39抽中 +1天会员")
-        messages.add("恭喜用户150******43抽中 +3天会员")
-        messages.add("恭喜用户152******05抽中 +5天会员")
+        messages.add("恭喜用户134******65抽中 +5天会员")
+        messages.add("恭喜用户183******40抽中 +30天会员")
+        messages.add("恭喜用户131******08抽中 +7天会员")
+        messages.add("恭喜用户177******65抽中 +1年会员")
+        messages.add("恭喜用户180******39抽中 +3天会员")
+        messages.add("恭喜用户150******43抽中 +14天会员")
+        messages.add("恭喜用户152******05抽中 终身会员")
         messages.add("恭喜用户133******87抽中 +7天会员")
-        messages.add("恭喜用户151******64抽中 +5天会员")
+        messages.add("恭喜用户151******64抽中 +14天会员")
         marqueeView.startWithList(SplitArrayUtils.getRandomList(messages) as List<Nothing>?)
     }
 }
\ No newline at end of file

video/app/src/main/java/com/mints/helivideo/ui/activitys/NinePayActivity.kt

@@ -15,12 +15,9 @@ import com.jobo.rxpay.callback.IPayCallback
 import com.mints.helivideo.R
 import com.mints.helivideo.manager.ActivityPageManager
 import com.mints.helivideo.manager.UserManager
-import com.mints.helivideo.mvp.model.OrderRecordBean
 import com.mints.helivideo.mvp.model.WxPayParamBean
 import com.mints.helivideo.mvp.presenters.NinePayPresenter
-import com.mints.helivideo.mvp.presenters.NinePresenter
 import com.mints.helivideo.mvp.views.NinePayView
-import com.mints.helivideo.mvp.views.NineView
 import com.mints.helivideo.ui.activitys.base.BaseActivity
 import com.mints.library.utils.nodoubleclick.AntiShake
 import kotlinx.android.synthetic.main.activity_nine_pay.*
@@ -33,12 +30,14 @@ class NinePayActivity : BaseActivity(), View.OnClickListener, NinePayView {
     companion object {
         const val PID = "PID"
         const val TITLE = "TITLE"
+        const val TYPE = "TYPE"
     }
 
     private val ninePayPresenter by lazy { NinePayPresenter() }
 
     private var pid = ""
     private var title = ""
+    private var type = ""
 
     override fun isApplyKitKatTranslucency() = false
 
@@ -53,6 +52,7 @@ class NinePayActivity : BaseActivity(), View.OnClickListener, NinePayView {
         extras?.let {
             pid = it.getString(PID, "")
             title = it.getString(TITLE, "")
+            type = it.getString(TYPE, "")
         }
     }
 
@@ -60,6 +60,16 @@ class NinePayActivity : BaseActivity(), View.OnClickListener, NinePayView {
         ninePayPresenter.attachView(this)
         initListener()
         tv_nine_pay_title.text = title
+        when (type) {
+            "o" ->// 一年
+                iv_nine_pay_type.setImageResource(R.mipmap.ic_nine_year)
+            "f" ->// 终身
+                iv_nine_pay_type.setImageResource(R.mipmap.ic_nine_all)
+            "m" -> // 手机
+                iv_nine_pay_type.setImageResource(R.mipmap.ic_nine_mobile)
+            else ->// 支付
+                iv_nine_pay_type.setImageResource(R.mipmap.ic_nine_vip)
+        }
     }
 
     override fun finish() {
@@ -159,7 +169,7 @@ class NinePayActivity : BaseActivity(), View.OnClickListener, NinePayView {
                     activity.clickTab3Layout()
                 }
             }, 500)
-        }else{
+        } else {
             finish()
         }
     }

video/app/src/main/java/com/mints/helivideo/ui/activitys/SplashActivity.kt

@@ -114,8 +114,6 @@ class SplashActivity : BaseActivity() {
             override fun onFinish() {
                 if (isAdSuc) return
 
-                LogUtil.d("SplashNewActivity-->", "SplashNewActivity-->onFinish =")
-
                 if (!isFinishing) {
                     if (mProgressBar != null) {
                         mProgressBar!!.setCompleteNoAnim()

video/app/src/main/java/com/mints/helivideo/ui/activitys/SplashAdActivity.kt

@@ -47,7 +47,7 @@ class SplashAdActivity : BaseActivity() {
         LogUtil.d("gromore应用内开屏广告-->", "gromore应用内开屏广告-->1111initViewsAndEvents ")
 
         mMainHandler.postDelayed({
-            SplashManager.showAd(fl_gromore_root, object : AdStatusListener {
+            SplashManager.showAd(this@SplashAdActivity,fl_gromore_root, object : AdStatusListener {
                 override fun adSuccess() {
 
                 }

video/app/src/main/java/com/mints/helivideo/ui/fragment/MainFragment.kt

@@ -14,6 +14,7 @@ import com.google.android.material.tabs.TabLayoutMediator
 import com.scwang.smartrefresh.layout.api.RefreshLayout
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener
 import com.mints.helivideo.R
+import com.mints.helivideo.ad.banner.BannerManager
 import com.mints.helivideo.common.AppConfig
 import com.mints.helivideo.common.Constant
 import com.mints.helivideo.manager.LocalVedioManager
@@ -94,6 +95,8 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
         if (AppConfig.fragmentClickFlag == Constant.FRAGMENT_CLICK_ONE) {
             if (AntiShake.check(banner?.id)) return
 
+            BannerManager.loadAd(requireActivity(), fl_main_banner)
+
             if (AppConfig.exitLoginMainRefresh) {
                 AppConfig.exitLoginMainRefresh = false
                 loadData()
@@ -292,7 +295,7 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
         get().put(Constant.IS_FIRST_VEDIO, true)
         if (data != null && data.vedioMsg != null) {
             LocalVedioManager.startVedioDetailActivityForType(requireActivity(), data.vedioMsg)
-        }else{
+        } else {
             if (UserManager.getInstance().newFlag && !UserManager.getInstance().vipFlag) {
                 readyGo(VipActivity::class.java)
             }

video/app/src/main/java/com/mints/helivideo/ui/fragment/MyFragment.kt

@@ -131,6 +131,21 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
                     return
                 }
 
+                if (nineShowBean != null) {
+                    if (nineShowBean!!.complete != nineShowBean!!.need) {
+                        val luckyFirst =
+                            AppPreferencesManager.get().getBoolean(Constant.LUCKY_MY_FIRST, false)
+                        if (!luckyFirst) {
+                            AppPreferencesManager.get().put(Constant.LUCKY_MY_FIRST, true)
+                            val bundle = Bundle()
+                            bundle.putInt(NineKnowActivity.COMPLETE, nineShowBean!!.complete)
+                            bundle.putInt(NineKnowActivity.NEED, nineShowBean!!.need)
+                            readyGo(NineKnowActivity::class.java, bundle)
+                            return
+                        }
+                    }
+                }
+
                 luckyAward()
             }
         }
@@ -320,6 +335,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
                         val bundle = Bundle()
                         bundle.putString(NinePayActivity.PID, data.pid)
                         bundle.putString(NinePayActivity.TITLE, data.title)
+                        bundle.putString(NinePayActivity.TYPE, data.type)
                         readyGo(NinePayActivity::class.java, bundle)
                     }, 1500)
                 }

video/app/src/main/java/com/mints/helivideo/ui/widgets/luckymonkeypanel/PanelItemView.java

@@ -44,12 +44,23 @@ public class PanelItemView extends FrameLayout implements ItemView {
     }
 
     public void setStyle(String type, String text) {
-        if (TextUtils.equals(type, "p")) {
-            // 支付
-            iv_panel_item_pic.setImageResource(R.mipmap.ic_nine_vip);
-        } else {
+        switch (type) {
+            case "o":
+                // 一年
+                iv_panel_item_pic.setImageResource(R.mipmap.ic_nine_year);
+                break;
+            case "f":
+                // 终身
+                iv_panel_item_pic.setImageResource(R.mipmap.ic_nine_all);
+                break;
+            case "m":
                 // 手机
                 iv_panel_item_pic.setImageResource(R.mipmap.ic_nine_mobile);
+                break;
+            default:
+                // 支付
+                iv_panel_item_pic.setImageResource(R.mipmap.ic_nine_vip);
+                break;
         }
         tv_panel_item_text.setText(text);
     }

video/app/src/main/java/com/mints/helivideo/ui/widgets/luckymonkeypanel/PanelItemView2.java

@@ -44,12 +44,23 @@ public class PanelItemView2 extends FrameLayout implements ItemView {
     }
 
     public void setStyle(String type, String text) {
-        if (TextUtils.equals(type, "p")) {
-            // 支付
-            iv_panel_item_pic.setImageResource(R.mipmap.ic_nine_vip);
-        } else {
+        switch (type) {
+            case "o":
+                // 一年
+                iv_panel_item_pic.setImageResource(R.mipmap.ic_nine_year);
+                break;
+            case "f":
+                // 终身
+                iv_panel_item_pic.setImageResource(R.mipmap.ic_nine_all);
+                break;
+            case "m":
                 // 手机
                 iv_panel_item_pic.setImageResource(R.mipmap.ic_nine_mobile);
+                break;
+            default:
+                // 支付
+                iv_panel_item_pic.setImageResource(R.mipmap.ic_nine_vip);
+                break;
         }
         tv_panel_item_text.setText(text);
     }

video/app/src/main/java/com/mints/helivideo/utils/GromorePrintUtil.kt

+package com.mints.helivideo.utils
+
+import com.bytedance.sdk.openadsdk.mediation.manager.MediationBaseManager
+
+class GromorePrintUtil {
+    
+    companion object {
+        private val TAG = GromorePrintUtil::class.java.simpleName
+
+        /**
+         * 打印其他加载信息
+         */
+        fun printLoadInfo(adInfo: MediationBaseManager?) {
+            LogUtil.d(TAG, "--------------------- printLoadInfo 11111111 ------------------------")
+
+            adInfo?.let {
+                val adLoadInfo = adInfo.adLoadInfo
+                LogUtil.d(TAG, "--------------------- 广告加载信息 start ------------------------")
+                LogUtil.d(TAG, "------ 广告加载信息 ")
+                adLoadInfo.forEach { it ->
+                    LogUtil.d(
+                        TAG,
+                        "代码位id = ${it.mediationRit} adnName = ${it.adnName} adType = ${it.adType}" +
+                                " errCode = ${it.errCode} errMsg = ${it.errMsg}"
+                    )
+                }
+
+                LogUtil.d(TAG, "------ 广告价格信息 ")
+                val multiBiddingEcpm = adInfo.multiBiddingEcpm
+                multiBiddingEcpm?.let {
+                    it.forEach { item ->
+                        LogUtil.d(
+                            TAG,
+                            "sdkName = ${item.sdkName} slotId = ${item.slotId} levelTag = ${item.levelTag}" +
+                                    " ecpm = ${item.ecpm} reqBiddingType = ${item.reqBiddingType} errorMsg = ${item.errorMsg} requestId = ${item.requestId}"
+                        )
+                    }
+                }
+
+                LogUtil.d(TAG, "------ 最优广告价格信息 ")
+                val bestEcpm = adInfo.bestEcpm
+                bestEcpm?.let {
+                    LogUtil.d(
+                        TAG,
+                        "sdkName = ${bestEcpm.sdkName} slotId = ${bestEcpm.slotId} levelTag = ${bestEcpm.levelTag}" +
+                                " ecpm = ${bestEcpm.ecpm} reqBiddingType = ${bestEcpm.reqBiddingType} " +
+                                "errorMsg = ${bestEcpm.errorMsg} requestId = ${bestEcpm.requestId}"
+                    )
+                }
+
+                LogUtil.d(TAG, "------ 当前缓存池的全部信息 ")
+                val cacheList = adInfo.cacheList
+                cacheList?.let {
+                    it.forEach { item ->
+                        LogUtil.d(
+                            TAG,
+                            "sdkName = ${item.sdkName} slotId = ${item.slotId} levelTag = ${item.levelTag}" +
+                                    " ecpm = ${item.ecpm} reqBiddingType = ${item.reqBiddingType} errorMsg = ${item.errorMsg} requestId = ${item.requestId}"
+                        )
+                    }
+                }
+                LogUtil.d(TAG, "--------------------- 广告加载信息 end ------------------------")
+            }
+            LogUtil.d(TAG, "--------------------- printLoadInfo 22222222 ------------------------")
+        }
+
+        /**
+         * 打印展示
+         */
+        fun printShowInfo(adInfo: MediationBaseManager?) {
+            adInfo?.let {
+                LogUtil.d(TAG, "--------------------- 广告展示信息 start ------------------------")
+                val showEcpm = adInfo.showEcpm
+                if(showEcpm != null){
+                    LogUtil.d(
+                        TAG,
+                        "sdkName = ${showEcpm.sdkName} slotId = ${showEcpm.slotId} levelTag = ${showEcpm.levelTag}" +
+                                " ecpm = ${showEcpm.ecpm} reqBiddingType = ${showEcpm.reqBiddingType} " +
+                                "errorMsg = ${showEcpm.errorMsg} requestId = ${showEcpm.requestId}"
+                    )
+                } else {
+                    LogUtil.d(TAG, "showEcpm is null")
+                }
+                LogUtil.d(TAG, "--------------------- 广告加载信息 end ------------------------")
+            }
+        }
+    }
+}
\ No newline at end of file

video/app/src/main/java/com/mints/helivideo/utils/UIUtils.java

@@ -110,10 +110,6 @@ public class UIUtils {
         return height;
     }
 
-    public static int px2dip(Context context, float pxValue) {
-        final float scale = context.getResources().getDisplayMetrics().density;
-        return (int) (pxValue / (scale <= 0 ? 1 : scale) + 0.5f);
-    }
 
     /**
      * 判断是否是刘海屏
@@ -273,6 +269,16 @@ public class UIUtils {
                 Resources.getSystem().getDisplayMetrics());
     }
 
+    public static int px2dip(Context context, float pxValue) {
+        final float scale = context.getResources().getDisplayMetrics().density;
+        return (int) (pxValue / (scale <= 0 ? 1 : scale) + 0.5f);
+    }
+
+    public static int dp2px(Context context, float dp) {
+        final float scale = context.getResources().getDisplayMetrics().density;
+        return (int) (dp * scale + 0.5f);
+    }
+
     public static float getDensity(Context context) {
         WindowManager manager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
 

video/app/src/main/res/layout/activity_nine.xml

@@ -36,8 +36,8 @@
         </RelativeLayout>
 
         <RelativeLayout
-            android:layout_width="276dp"
-            android:layout_height="276dp"
+            android:layout_width="315dp"
+            android:layout_height="315dp"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="14dp">
 
@@ -48,8 +48,8 @@
 
             <RelativeLayout
                 android:id="@+id/btn_action"
-                android:layout_width="68dp"
-                android:layout_height="68dp"
+                android:layout_width="80dp"
+                android:layout_height="80dp"
                 android:layout_centerInParent="true"
                 android:background="@mipmap/ic_lucky_vedio">
 

video/app/src/main/res/layout/activity_nine_pay.xml

@@ -24,19 +24,19 @@
             android:orientation="vertical">
 
             <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@mipmap/ic_nine_vip_big"></ImageView>
+                android:id="@+id/iv_nine_pay_type"
+                android:layout_width="60dp"
+                android:layout_height="60dp"
+                android:src="@mipmap/ic_nine_vip"></ImageView>
 
             <TextView
                 android:id="@+id/tv_nine_pay_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
-                android:layout_marginTop="14dp"
+                android:layout_marginTop="8dp"
                 android:layout_marginRight="10dp"
                 android:gravity="center"
-                android:text="12312312312312313123123123"
                 android:textColor="#A24240"
                 android:textSize="12sp"></TextView>
         </LinearLayout>

video/app/src/main/res/layout/activity_tx_video.xml

@@ -64,7 +64,7 @@
         android:id="@+id/ll_lucky"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="11dp"
+        android:layout_marginEnd="1dp"
         android:visibility="gone"
         android:layout_gravity="bottom|right"
         android:layout_marginBottom="220dp"
@@ -72,8 +72,8 @@
         android:orientation="vertical">
 
         <ImageView
-            android:layout_width="60dp"
-            android:layout_height="50dp"
+            android:layout_width="80dp"
+            android:layout_height="70dp"
             android:src="@mipmap/ic_get_mobile" />
 
         <TextView
@@ -82,8 +82,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
             android:background="@drawable/shape_bg_black2"
-            android:paddingLeft="12dp"
-            android:paddingRight="12dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
             android:text="0/5"
             android:textColor="@color/white"
             android:textSize="12sp" />

video/app/src/main/res/layout/drama_activity_api_detail.xml

@@ -62,7 +62,7 @@
             android:id="@+id/ll_lucky"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="11dp"
+            android:layout_marginEnd="1dp"
             android:layout_marginBottom="220dp"
             android:visibility="gone"
             android:gravity="center"
@@ -71,8 +71,8 @@
             app:layout_constraintRight_toRightOf="parent">
 
             <ImageView
-                android:layout_width="60dp"
-                android:layout_height="50dp"
+                android:layout_width="80dp"
+                android:layout_height="70dp"
                 android:src="@mipmap/ic_get_mobile" />
 
             <TextView
@@ -81,8 +81,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
                 android:background="@drawable/shape_bg_black2"
-                android:paddingLeft="12dp"
-                android:paddingRight="12dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:text="0/5"
                 android:textColor="@color/white"
                 android:textSize="12sp" />

video/app/src/main/res/layout/fragment_main.xml

@@ -73,7 +73,6 @@
                                 android:layout_marginLeft="16dp"
                                 android:layout_marginTop="18dp"
                                 android:layout_marginRight="16dp"
-                                android:layout_marginBottom="10dp"
                                 android:background="@drawable/shape_bg_write"
                                 android:orientation="vertical">
 
@@ -98,16 +97,30 @@
                                     android:overScrollMode="never" />
                             </LinearLayout>
 
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:minHeight="45dp"
+                                android:orientation="horizontal">
+
                                 <TextView
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
+                                    android:layout_gravity="center_vertical"
                                     android:layout_marginLeft="16dp"
-                                android:layout_marginTop="2dp"
-                                android:layout_marginBottom="2dp"
                                     android:text="分类"
                                     android:textColor="@color/black"
                                     android:textSize="16sp"
                                     android:textStyle="bold" />
+
+                                <FrameLayout
+                                    android:id="@+id/fl_main_banner"
+                                    android:layout_width="wrap_content"
+                                    android:layout_gravity="center_vertical"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginLeft="4dp"></FrameLayout>
+                            </LinearLayout>
+
                         </LinearLayout>
 
                     </com.google.android.material.appbar.CollapsingToolbarLayout>
@@ -115,9 +128,10 @@
                     <com.google.android.material.tabs.TabLayout
                         android:id="@+id/tablayout"
                         android:layout_width="wrap_content"
-                        android:layout_height="48dp"
+                        android:layout_height="38dp"
                         android:layout_marginLeft="10dp"
                         android:layout_marginRight="10dp"
+                        android:paddingTop="-10dp"
                         app:tabBackground="@null"
                         app:tabIndicatorHeight="0dp"
                         app:tabMaxWidth="200dp"

video/app/src/main/res/layout/view_lucky_mokey_panel2.xml

 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="276dp"
-    android:layout_height="276dp"
+    android:layout_width="315dp"
+    android:layout_height="315dp"
     android:background="@drawable/bg_lucky_monkey_panel">
 
 
@@ -34,8 +34,8 @@
 
             <com.mints.helivideo.ui.widgets.luckymonkeypanel.PanelItemView2
                 android:id="@+id/item1"
-                android:layout_width="76dp"
-                android:layout_height="76dp"
+                android:layout_width="88dp"
+                android:layout_height="88dp"
                 android:background="@mipmap/ic_nine_item_bg" />
 
             <View
@@ -45,8 +45,8 @@
 
             <com.mints.helivideo.ui.widgets.luckymonkeypanel.PanelItemView2
                 android:id="@+id/item2"
-                android:layout_width="76dp"
-                android:layout_height="76dp"
+                android:layout_width="88dp"
+                android:layout_height="88dp"
                 android:background="@mipmap/ic_nine_item_bg" />
 
             <View
@@ -56,8 +56,8 @@
 
             <com.mints.helivideo.ui.widgets.luckymonkeypanel.PanelItemView2
                 android:id="@+id/item3"
-                android:layout_width="76dp"
-                android:layout_height="76dp"
+                android:layout_width="88dp"
+                android:layout_height="88dp"
                 android:background="@mipmap/ic_nine_item_bg" />
         </LinearLayout>
 
@@ -73,8 +73,8 @@
 
             <com.mints.helivideo.ui.widgets.luckymonkeypanel.PanelItemView2
                 android:id="@+id/item4"
-                android:layout_width="76dp"
-                android:layout_height="76dp"
+                android:layout_width="88dp"
+                android:layout_height="88dp"
                 android:background="@mipmap/ic_nine_item_bg" />
 
             <View
@@ -84,8 +84,8 @@
 
 
             <View
-                android:layout_width="76dp"
-                android:layout_height="76dp" />
+                android:layout_width="88dp"
+                android:layout_height="88dp" />
 
 
             <View
@@ -95,8 +95,8 @@
 
             <com.mints.helivideo.ui.widgets.luckymonkeypanel.PanelItemView2
                 android:id="@+id/item6"
-                android:layout_width="76dp"
-                android:layout_height="76dp"
+                android:layout_width="88dp"
+                android:layout_height="88dp"
                 android:background="@mipmap/ic_nine_item_bg" />
         </LinearLayout>
 
@@ -112,8 +112,8 @@
 
             <com.mints.helivideo.ui.widgets.luckymonkeypanel.PanelItemView2
                 android:id="@+id/item7"
-                android:layout_width="76dp"
-                android:layout_height="76dp"
+                android:layout_width="88dp"
+                android:layout_height="88dp"
                 android:background="@mipmap/ic_nine_item_bg" />
 
             <View
@@ -123,8 +123,8 @@
 
             <com.mints.helivideo.ui.widgets.luckymonkeypanel.PanelItemView2
                 android:id="@+id/item8"
-                android:layout_width="76dp"
-                android:layout_height="76dp"
+                android:layout_width="88dp"
+                android:layout_height="88dp"
                 android:background="@mipmap/ic_nine_item_bg" />
 
             <View
@@ -134,8 +134,8 @@
 
             <com.mints.helivideo.ui.widgets.luckymonkeypanel.PanelItemView2
                 android:id="@+id/item9"
-                android:layout_width="76dp"
-                android:layout_height="76dp"
+                android:layout_width="88dp"
+                android:layout_height="88dp"
                 android:background="@mipmap/ic_nine_item_bg" />
         </LinearLayout>
     </LinearLayout>

video/app/src/main/res/layout/view_panel_item.xml

@@ -17,19 +17,18 @@
 
             <ImageView
                 android:id="@+id/iv_panel_item_pic"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"></ImageView>
+                android:layout_width="32dp"
+                android:layout_height="32dp"></ImageView>
 
             <TextView
                 android:id="@+id/tv_panel_item_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="6dp"
-                android:layout_marginTop="2dp"
                 android:layout_marginRight="6dp"
                 android:gravity="center_horizontal"
                 android:textColor="#A24240"
-                android:textSize="12sp"></TextView>
+                android:textSize="11sp"></TextView>
         </LinearLayout>
 
 

video/app/src/main/res/layout/view_panel_item2.xml

@@ -17,8 +17,8 @@
 
             <ImageView
                 android:id="@+id/iv_panel_item_pic"
-                android:layout_width="30dp"
-                android:layout_height="30dp"></ImageView>
+                android:layout_width="36dp"
+                android:layout_height="36dp"></ImageView>
 
             <TextView
                 android:id="@+id/tv_panel_item_text"

video/gradle.properties

@@ -48,3 +48,4 @@ GROMORE_SPLASH_CODE="102398740"
 GROMORE_VIDEO_CODE="102398300"
 GROMORE_EXPRESS_CODE="102405261"
 GROMORE_DRAW_CODE="102405069"
+GROMORE_BANNER_CODE="102405532"