更新穿山甲、广点通及快手SDK版本号

GoodMoney/app/build.gradle

@@ -228,7 +228,7 @@ dependencies {
     // TalkingDada（已集成）
     // 一览视频
     implementation("com.yilan.sdk:ui:3.3.3.0") {
-        exclude group: 'com.yilan.sdk', module: 'yb_extra'
+//        exclude group: 'com.yilan.sdk', module: 'yb_extra'
         exclude group: 'com.yilan.sdk', module: 'gdt'
         exclude group: 'com.yilan.sdk', module: 'ks'
     }
@@ -361,18 +361,10 @@ dependencies {
 //    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
 //    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
-    // 穿山甲 GroMore
-    // mediation_ad_sdk
-    implementation(name: 'mediation_ad_sdk_2.7.1.2', ext: 'aar')
-    implementation(name: 'gdt_adapter_4.351.1221.1', ext: 'aar')
-    implementation(name: 'ks_adapter_3.3.9.0', ext: 'aar')
     // 穿山甲广告
-    implementation(name: 'open_ad_sdk_3.6.1.3', ext: 'aar')
+    implementation(name: 'open_ad_sdk_4.0.1.1', ext: 'aar')
     // 广点通广告 腾讯
-    implementation(name: 'GDTSDK.unionNormal.4.351.1221', ext: 'aar')
+    implementation(name: 'GDTSDK.unionNormal.4.420.1290', ext: 'aar')
     // 快手
-    implementation(name: 'kssdk-ad-3.3.9', ext: 'aar')
-//    implementation(name: 'kssdk-all--3.3.16-publishRelease-9ffe2b94e', ext: 'aar')
-    // applog
-    implementation 'com.bytedance.applog:RangersAppLog-All-cn:5.2.6'
+    implementation(name: 'kssdk-ad-3.3.16', ext: 'aar')
 }

GoodMoney/app/src/main/AndroidManifest.xml

@@ -131,23 +131,21 @@
         <!--                    </intent-filter>-->
         <!--                </activity>-->
 
-        <activity
-            android:name=".ui.activitys.SplashGroMoreActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/NormalSplash">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
+        <!--        <activity-->
+        <!--            android:name=".ui.activitys.SplashGroMoreActivity"-->
+        <!--            android:screenOrientation="portrait"-->
+        <!--            android:theme="@style/NormalSplash">-->
+        <!--           -->
+        <!--        </activity>-->
 
         <activity
             android:name=".ui.activitys.MainActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoneTranslucent" />
+            android:theme="@style/AppTheme.NoneTranslucent">
+
+        </activity>
         <activity android:name=".ui.activitys.WebActivity" />
         <activity
             android:name="com.mints.library.base.BaseWebActivity"
@@ -171,7 +169,13 @@
             android:theme="@style/AppTheme.NoActionBarTranslucent" />
         <activity
             android:name=".ui.activitys.SettingsActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".ui.activitys.AboutusActivity"
             android:screenOrientation="portrait" />
@@ -210,7 +214,10 @@
             android:screenOrientation="portrait" />
         <activity
             android:name=".ui.activitys.SplashCsjADActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:theme="@style/NormalSplash">
+
+        </activity>
         <activity
             android:name=".ui.activitys.MorningClockActivity"
             android:screenOrientation="portrait" />

GoodMoney/app/src/main/java/com/mints/goodmoney/MintsApplication.java

@@ -12,8 +12,6 @@ import androidx.multidex.MultiDexApplication;
 
 import com.hjq.toast.ToastUtils;
 import com.mints.goodmoney.common.Constant;
-import com.mints.goodmoney.manager.CsjAppLogManager;
-import com.mints.goodmoney.manager.CsjGroMoreManager;
 import com.mints.goodmoney.manager.KsManager;
 import com.mints.goodmoney.manager.LiebaoManager;
 import com.mints.goodmoney.manager.MhManager;
@@ -127,43 +125,37 @@ public class MintsApplication extends MultiDexApplication {
         YlhAdManager.INSTANCE.initYlhAd(this);
 
         // 穿山甲
-        TtCsjAdManager.init(this);
-
-        // GroMore
-        CsjGroMoreManager.INSTANCE.init(this);
-
-        // AppLog
-        CsjAppLogManager.INSTANCE.init(this);
+//        TtCsjAdManager.init(this);
 
         // 快手
-        KsManager.INSTANCE.initKs(this);
+//        KsManager.INSTANCE.initKs(this);
 
         // 闪电盒子
-        WnManager.INSTANCE.initWn(this);
+//        WnManager.INSTANCE.initWn(this);
 
         // 枫岚广告
-        MhManager.INSTANCE.initMn(this);
+//        MhManager.INSTANCE.initMn(this);
 
         // OneWay
-        OwManager.INSTANCE.init(this);
+//        OwManager.INSTANCE.init(this);
 
         // 天卓珊瑚[INSTANCE是设置单例模式]
-        TzManager.INSTANCE.initTz(this);
+//        TzManager.INSTANCE.initTz(this);
 
         //小满
-        XmManager.INSTANCE.initXm(this);
+//        XmManager.INSTANCE.initXm(this);
 
         // 一览视频
         YlVideoManager.INSTANCE.init(this);
 
         // 猎豹游戏初始化
-        LiebaoManager.getInstance().initCmGameSdk();
+//        LiebaoManager.getInstance().initCmGameSdk();
 
         // 瑞狮新闻
-        RsNewsManager.INSTANCE.init(this);
+//        RsNewsManager.INSTANCE.init(this);
 
         // 喜马拉雅
-        initXmly();
+//        initXmly();
 
         // 自定义logger
         bindLogger();

GoodMoney/app/src/main/java/com/mints/goodmoney/ad/express/KsPreLoadExpressManager.kt

@@ -13,6 +13,8 @@ import android.widget.TextView
 import com.bumptech.glide.Glide
 import com.kwad.sdk.api.*
 import com.kwad.sdk.api.KsNativeAd.VideoPlayListener
+import com.kwad.sdk.api.model.InteractionType
+import com.kwad.sdk.api.model.MaterialType
 import com.mints.goodmoney.MintsApplication
 import com.mints.goodmoney.R
 import com.mints.goodmoney.manager.KsManager
@@ -59,15 +61,15 @@ object KsPreLoadExpressManager {
         val adView: View
         // 判断广告素材类型
         when (ksNativeAd.materialType) {
-            KsNativeAd.MaterialType.VIDEO -> {
+            MaterialType.VIDEO -> {
                 // 视频素材，渲染自定义的视频广告
                 adView = getVideoItemView(parent, ksNativeAd)!!
             }
-            KsNativeAd.MaterialType.SINGLE_IMG -> {
+            MaterialType.SINGLE_IMG -> {
                 // 单图素材，渲染自定义的单图广告
                 adView = getSingleImageItemView(parent, ksNativeAd)!!
             }
-            KsNativeAd.MaterialType.GROUP_IMG -> {
+            MaterialType.GROUP_IMG -> {
                 // 组图素材，渲染自定义的组图广告
                 adView = getGroupImageItemView(parent, ksNativeAd)!!
             }
@@ -196,6 +198,10 @@ object KsPreLoadExpressManager {
                     override fun handleDownloadDialog(p0: DialogInterface.OnClickListener?): Boolean {
                         return false
                     }
+
+                    override fun onDownloadTipsDialogShow() {}
+
+                    override fun onDownloadTipsDialogDismiss() {}
                 })
 
         // 广告描述
@@ -215,7 +221,7 @@ object KsPreLoadExpressManager {
         // 获取app下载次数文案，例如：800W此下载，自行渲染。
         Log.d("AppInfo", "app下载次数文案 = " + ad.appDownloadCountDes)
         when (ad.interactionType) {
-            KsNativeAd.InteractionType.H5 -> {
+            InteractionType.H5 -> {
                 // 广告描述
                 adBaseViewHolder.mH5Desc.text = ad.adDescription
                 // 广告转化文案
@@ -223,7 +229,7 @@ object KsPreLoadExpressManager {
                 adBaseViewHolder.mAppContainer.visibility = View.GONE
                 adBaseViewHolder.mH5Container.visibility = View.VISIBLE
             }
-            KsNativeAd.InteractionType.DOWNLOAD -> {
+            InteractionType.DOWNLOAD -> {
                 // appIcon，非下载类型的没有
                 if (TextUtils.isEmpty(ad.appIconUrl)) {
                     adBaseViewHolder.mAppIcon.visibility = View.GONE

GoodMoney/app/src/main/java/com/mints/goodmoney/ad/express/PreLoadExpressManager.kt

 package com.mints.goodmoney.ad.express
 
+import android.annotation.SuppressLint
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import com.bytedance.msdk.api.nativeAd.TTNativeAd
 import com.mints.goodmoney.MintsApplication
 import com.mints.goodmoney.common.Constant
 import com.mints.goodmoney.mvp.model.WeightBean
@@ -11,11 +11,12 @@ import com.mints.goodmoney.utils.LogUtil
 import com.qq.e.ads.nativ.NativeExpressADView
 import java.util.*
 
-
 /**
  * 预加载信息流管理类
  */
-object PreLoadExpressManager : TTADLoadSuccessListener, YLHADLoadSuccessListener, KSADLoadSuccessListener, GMADLoadSuccessListener {
+@SuppressLint("StaticFieldLeak")
+object PreLoadExpressManager : TTADLoadSuccessListener, YLHADLoadSuccessListener,
+    KSADLoadSuccessListener {
 
     private val TAG = PreLoadExpressManager::class.java.simpleName
 
@@ -36,7 +37,7 @@ object PreLoadExpressManager : TTADLoadSuccessListener, YLHADLoadSuccessListener
         YlhPreLoadExpressManager.setListener(this)
         TTPreLoadExpressManager.getInstance().setListener(this)
         KsPreLoadExpressManager.setListener(this)
-        GroMoreExpressManager.instance.setListener(this)
+//        GroMoreExpressManager.instance.setListener(this)
     }
 
     fun init(csjWeight: Int, ylhWeight: Int, ksWeight: Int, gmWeight: Int) {
@@ -62,10 +63,11 @@ object PreLoadExpressManager : TTADLoadSuccessListener, YLHADLoadSuccessListener
 //        }
 
         when (getRandomWeight()) {
-            Constant.CSJ_EXPRESS_AD -> TTPreLoadExpressManager.getInstance().loadTtFrameLayout(mAdFrameLayout)
+            Constant.CSJ_EXPRESS_AD -> TTPreLoadExpressManager.getInstance()
+                .loadTtFrameLayout(mAdFrameLayout)
             Constant.YLH_EXPRESS_AD -> YlhPreLoadExpressManager.loadYlhFrameLayout()
             Constant.KS_EXPRESS_AD -> KsPreLoadExpressManager.loadKsFrameLayout(mAdFrameLayout as ViewGroup)
-            Constant.GM_EXPRESS_AD -> GroMoreExpressManager.instance.loadADFrameLayout()
+//            Constant.GM_EXPRESS_AD -> GroMoreExpressManager.instance.loadADFrameLayout()
             else -> {
                 TTPreLoadExpressManager.getInstance().loadTtFrameLayout(mAdFrameLayout)
             }
@@ -152,12 +154,12 @@ object PreLoadExpressManager : TTADLoadSuccessListener, YLHADLoadSuccessListener
         mAdFrameLayout?.addView(view)
     }
 
-    override fun onGMAdLoadSuc(ttNativeAd: TTNativeAd?) {
+//    override fun onGMAdLoadSuc(ttNativeAd: TTNativeAd?) {
 //        if (currentIndex == 3) {
 //            mAdFrameLayout?.addView(view)
 //        }
-        mAdFrameLayout?.addView(ttNativeAd?.expressView)
-    }
+//        mAdFrameLayout?.addView(ttNativeAd?.expressView)
+//    }
 
 }
 
@@ -173,6 +175,6 @@ interface KSADLoadSuccessListener {
     fun onKSAdLoadSuc(ksNativeAd: View?)
 }
 
-interface GMADLoadSuccessListener {
-    fun onGMAdLoadSuc(ttNativeAd: TTNativeAd?)
-}
+//interface GMADLoadSuccessListener {
+//    fun onGMAdLoadSuc(ttNativeAd: TTNativeAd?)
+//}
\ No newline at end of file

GoodMoney/app/src/main/java/com/mints/goodmoney/ad/video/CsjFullVideoAdManager.java

@@ -141,6 +141,10 @@ public class CsjFullVideoAdManager extends BaseVideoAd {
                     }
                 }
             }
+
+            @Override
+            public void onFullScreenVideoCached(TTFullScreenVideoAd ttFullScreenVideoAd) {
+            }
         });
     }
 

GoodMoney/app/src/main/java/com/mints/goodmoney/ad/video/CsjVideoAdManager.java

@@ -174,6 +174,10 @@ public class CsjVideoAdManager extends BaseVideoAd {
                     }
                 }
 
+                @Override
+                public void onRewardVideoCached(TTRewardVideoAd ttRewardVideoAd) {
+                }
+
                 //视频广告的素材加载完毕，比如视频url等，在此回调后，可以播放在线视频，网络不好可能出现加载缓冲，影响体验。
                 @Override
                 public void onRewardVideoAdLoad(TTRewardVideoAd ad) {

GoodMoney/app/src/main/java/com/mints/goodmoney/ad/video/KsVideoAdManager.kt

@@ -105,6 +105,9 @@ class KsVideoAdManager private constructor(activity: Activity) :
 //                            ToastUtil.show(activity, "快手激励视频⼴告播放完成")
                         }
 
+                        override fun onVideoSkipToEnd(p0: Long) {
+                        }
+
                         override fun onVideoPlayStart() {
 //                            ToastUtil.show(activity, "快手激励视频⼴告播放开始")
                         }
@@ -115,6 +118,9 @@ class KsVideoAdManager private constructor(activity: Activity) :
                             TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_KS, Constant.EVENT_TYPE_ZERO, "", "")
                         }
 
+                        override fun onRewardStepVerify(p0: Int, p1: Int) {
+                        }
+
                     })
                     // PlayConfig默认竖屏播放，传null
                     mRewardVideoAd!!.showRewardVideoAd(activity, null)

GoodMoney/app/src/main/java/com/mints/goodmoney/ad/video/VideoAdingManager.java

@@ -41,7 +41,7 @@ public class VideoAdingManager {
     private ShVideoAdManager shVideoAdManager;
     private CsjFullVideoAdManager csjFullVideoAdManager;
     private KsVideoAdManager ksVideoAdManager;
-    private CsjGroMoreVideoAdManager csjGroMoreVideoAdManager;
+//    private CsjGroMoreVideoAdManager csjGroMoreVideoAdManager;
     private OwVideoAdManager owVideoAdManager;
 
     private int wnWeight;
@@ -91,7 +91,7 @@ public class VideoAdingManager {
         shVideoAdManager = ShVideoAdManager.Companion.getInstance(activity);
         csjFullVideoAdManager = CsjFullVideoAdManager.getInstance(activity);
         ksVideoAdManager = KsVideoAdManager.Companion.getInstance(activity);
-        csjGroMoreVideoAdManager = CsjGroMoreVideoAdManager.getInstance(activity);
+//        csjGroMoreVideoAdManager = CsjGroMoreVideoAdManager.getInstance(activity);
         owVideoAdManager = OwVideoAdManager.Companion.getInstance();
         weightList = new ArrayList<>();
     }
@@ -453,11 +453,11 @@ public class VideoAdingManager {
             owVideoAdManager.onDestroy();
             owVideoAdManager = null;
         }
-        if (csjGroMoreVideoAdManager != null) {
-            csjGroMoreVideoAdManager.setVideoAdStatusListener(null);
-            csjGroMoreVideoAdManager.onDestroy();
-            csjGroMoreVideoAdManager = null;
-        }
+//        if (csjGroMoreVideoAdManager != null) {
+//            csjGroMoreVideoAdManager.setVideoAdStatusListener(null);
+//            csjGroMoreVideoAdManager.onDestroy();
+//            csjGroMoreVideoAdManager = null;
+//        }
 
         if (mReceiverBroadcastReceiver != null) {
             activity.stopService(new Intent(activity, AppInstallService.class));
@@ -808,44 +808,45 @@ public class VideoAdingManager {
                     }
                 });
                 owVideoAdManager.loadAd(activity, bean.getCurCoin(), bean.getCarrierType(), bean.getExtraId());
-            } else if (TextUtils.equals(videoAdType, Constant.GROMORE_VEDIO_AD)) {
-                // GROMORE广告激励视频
-                if (csjGroMoreVideoAdManager == null) {
-                    if (activity == null) {
-                        if (videoAdingListener != null) {
-                            videoAdingListener.videoAdingListenerError(Constant.GROMORE_VEDIO_AD);
-                        }
-                        return;
-                    }
-                    csjGroMoreVideoAdManager = CsjGroMoreVideoAdManager.getInstance(activity);
-                }
-                csjGroMoreVideoAdManager.setVideoAdStatusListener(new VideoAdStatusListener() {
-                    @Override
-                    public void adSuccess() {
-                        AppConfig.groMoreVideoAdCount--;
-                        if (videoAdingListener != null) {
-                            videoAdingListener.videoAdingListenerSuccess(Constant.GROMORE_VEDIO_AD);
-                        }
-                    }
-
-                    @Override
-                    public void adFail() {
-                        if (videoAdingListener != null) {
-                            videoAdingListener.videoAdingListenerFail(Constant.GROMORE_VEDIO_AD);
-                        }
-                    }
-
-                    @Override
-                    public void adDownload() {
-                        isVideoAdDownload = true;
-
-                        // 注册下载任务监听
-                        registerBroad();
-                    }
-                });
-
-                csjGroMoreVideoAdManager.loadAd(activity, bean.getCurCoin(), bean.getCarrierType(), bean.getExtraId());
             }
+//            else if (TextUtils.equals(videoAdType, Constant.GROMORE_VEDIO_AD)) {
+//                // GROMORE广告激励视频
+//                if (csjGroMoreVideoAdManager == null) {
+//                    if (activity == null) {
+//                        if (videoAdingListener != null) {
+//                            videoAdingListener.videoAdingListenerError(Constant.GROMORE_VEDIO_AD);
+//                        }
+//                        return;
+//                    }
+//                    csjGroMoreVideoAdManager = CsjGroMoreVideoAdManager.getInstance(activity);
+//                }
+//                csjGroMoreVideoAdManager.setVideoAdStatusListener(new VideoAdStatusListener() {
+//                    @Override
+//                    public void adSuccess() {
+//                        AppConfig.groMoreVideoAdCount--;
+//                        if (videoAdingListener != null) {
+//                            videoAdingListener.videoAdingListenerSuccess(Constant.GROMORE_VEDIO_AD);
+//                        }
+//                    }
+//
+//                    @Override
+//                    public void adFail() {
+//                        if (videoAdingListener != null) {
+//                            videoAdingListener.videoAdingListenerFail(Constant.GROMORE_VEDIO_AD);
+//                        }
+//                    }
+//
+//                    @Override
+//                    public void adDownload() {
+//                        isVideoAdDownload = true;
+//
+//                        // 注册下载任务监听
+//                        registerBroad();
+//                    }
+//                });
+//
+//                csjGroMoreVideoAdManager.loadAd(activity, bean.getCurCoin(), bean.getCarrierType(), bean.getExtraId());
+//            }
         } catch (Exception e) {
             e.printStackTrace();
             if (videoAdingListener != null) {

GoodMoney/app/src/main/java/com/mints/goodmoney/manager/BxmPlayVideo.java

@@ -59,6 +59,10 @@ public class BxmPlayVideo {
                 public void onRewardVideoCached() {
 
                 }
+
+                @Override
+                public void onRewardVideoCached(TTRewardVideoAd ttRewardVideoAd) {
+                }
             });
         } catch (Throwable e) {
             appNative.onError(0);

GoodMoney/app/src/main/java/com/mints/goodmoney/manager/CsjAppLogManager.kt

-package com.mints.goodmoney.manager
-
-import android.app.Application
-import com.bytedance.applog.AppLog
-import com.bytedance.applog.InitConfig
-import com.bytedance.applog.util.UriConstants
-import com.bytedance.hume.readapk.HumeSDK
-import com.mints.goodmoney.MintsApplication
-import com.mints.goodmoney.utils.LogUtil
-import com.mints.library.utils.CommonUtils
-
-private val TAG = CsjAppLogManager::class.java.simpleName
-
-object CsjAppLogManager {
-
-    fun init(application: Application) {
-        /* 初始化开始 */
-        val config = InitConfig(TtCsjAdManager.TT_AD_APPID, CommonUtils.getAppMetaData(MintsApplication.getContext(), "CHANNEL_NAME") + HumeSDK.getChannel(MintsApplication.getContext())) // appid和渠道，appid如不清楚请联系对接同学
-
-        //上报域名只支持中国
-        config.setUriConfig(UriConstants.DEFAULT)
-
-        // 是否在控制台输出日志，可用于观察用户行为日志上报情况
-        config.setLogger { msg, t -> LogUtil.d(TAG, "$msg -> $t") }
-
-        config.setAutoStart(true)
-        AppLog.init(application, config)
-        /* 初始化结束 */
-
-        /* 自定义 “用户公共属性”（可选，初始化后调用, key相同会覆盖）
-      	关于自定义 “用户公共属性” 请注意：1. 上报机制是随着每一次日志发送进行提交，默认的日志发送频率是1分钟，所以如果在一分钟内连续修改自定义用户公共属性，，按照日志发送前的最后一次修改为准， 2. 不推荐高频次修改，如每秒修改一次 */
-        //Map<String,Object> headerMap = new HashMap<String, Object>();
-        //headerMap.put("your_custom_key","your_custom_value");
-        //AppLog.setHeaderInfo((HashMap<String, Object>)headerMap);
-
-        //移除公共属性
-        //AppLog.removeHeaderInfo("your_custom_key");
-    }
-
-}
+//package com.mints.goodmoney.manager
+//
+//import android.app.Application
+//import com.bytedance.applog.AppLog
+//import com.bytedance.applog.InitConfig
+//import com.bytedance.applog.util.UriConstants
+//import com.bytedance.hume.readapk.HumeSDK
+//import com.mints.goodmoney.MintsApplication
+//import com.mints.goodmoney.utils.LogUtil
+//import com.mints.library.utils.CommonUtils
+//
+//private val TAG = CsjAppLogManager::class.java.simpleName
+//
+//object CsjAppLogManager {
+//
+//    fun init(application: Application) {
+//        /* 初始化开始 */
+//        val config = InitConfig(TtCsjAdManager.TT_AD_APPID, CommonUtils.getAppMetaData(MintsApplication.getContext(), "CHANNEL_NAME") + HumeSDK.getChannel(MintsApplication.getContext())) // appid和渠道，appid如不清楚请联系对接同学
+//
+//        //上报域名只支持中国
+//        config.setUriConfig(UriConstants.DEFAULT)
+//
+//        // 是否在控制台输出日志，可用于观察用户行为日志上报情况
+//        config.setLogger { msg, t -> LogUtil.d(TAG, "$msg -> $t") }
+//
+//        config.setAutoStart(true)
+//        AppLog.init(application, config)
+//        /* 初始化结束 */
+//
+//        /* 自定义 “用户公共属性”（可选，初始化后调用, key相同会覆盖）
+//      	关于自定义 “用户公共属性” 请注意：1. 上报机制是随着每一次日志发送进行提交，默认的日志发送频率是1分钟，所以如果在一分钟内连续修改自定义用户公共属性，，按照日志发送前的最后一次修改为准， 2. 不推荐高频次修改，如每秒修改一次 */
+//        //Map<String,Object> headerMap = new HashMap<String, Object>();
+//        //headerMap.put("your_custom_key","your_custom_value");
+//        //AppLog.setHeaderInfo((HashMap<String, Object>)headerMap);
+//
+//        //移除公共属性
+//        //AppLog.removeHeaderInfo("your_custom_key");
+//    }
+//
+//}
\ No newline at end of file

GoodMoney/app/src/main/java/com/mints/goodmoney/manager/CsjGroMoreManager.kt

@@ -8,7 +8,7 @@ object CsjGroMoreManager {
     const val AD_UNIT_ID = "946167770"
 
     fun init(application: MintsApplication) {
-        TTGroMoreAdManagerHolder.init(application)
+//        TTGroMoreAdManagerHolder.init(application)
     }
 
 }
\ No newline at end of file

GoodMoney/app/src/main/java/com/mints/goodmoney/manager/LiebaoManager.java

@@ -3,9 +3,6 @@ package com.mints.goodmoney.manager;
 
 import android.content.Context;
 
-import com.bytedance.sdk.openadsdk.TTAdConfig;
-import com.bytedance.sdk.openadsdk.TTAdConstant;
-import com.bytedance.sdk.openadsdk.TTAdSdk;
 import com.cmcm.cmgame.CmGameSdk;
 import com.cmcm.cmgame.gamedata.CmGameAppInfo;
 import com.mints.goodmoney.BuildConfig;
@@ -55,20 +52,30 @@ public class LiebaoManager {
      * 游戏SDK初始化
      */
     public void initCmGameSdk() {
-        final String adAppId = TtCsjAdManager.TT_AD_APPID;   // 穿山甲appid
-
-        TTAdSdk.init(context,
-                new TTAdConfig.Builder()
-                        .appId(adAppId)
-                        .useTextureView(false) //使用TextureView控件播放视频,默认为SurfaceView,当有SurfaceView冲突的场景，可以使用TextureView
-                        .appName(TtCsjAdManager.TT_AD_NAME)
-                        .titleBarTheme(TTAdConstant.TITLE_BAR_THEME_DARK)
-                        .allowShowNotify(true) //是否允许sdk展示通知栏提示
-                        .allowShowPageWhenScreenLock(true) //是否在锁屏场景支持展示广告落地页
-                        .debug(BuildConfig.DEBUG) //测试阶段打开，可以通过日志排查问题，上线时去除该调用
-                        .directDownloadNetworkType(TTAdConstant.NETWORK_STATE_WIFI, TTAdConstant.NETWORK_STATE_3G) //允许直接下载的网络状态集合
-                        .supportMultiProcess(false) //是否支持多进程，true支持
-                        .build());
+//        final String adAppId = TtCsjAdManager.TT_AD_APPID;   // 穿山甲appid
+
+//        TTAdSdk.init(context,
+//                new TTAdConfig.Builder()
+//                        .appId(adAppId)
+//                        .useTextureView(false) //使用TextureView控件播放视频,默认为SurfaceView,当有SurfaceView冲突的场景，可以使用TextureView
+//                        .appName(TtCsjAdManager.TT_AD_NAME)
+//                        .titleBarTheme(TTAdConstant.TITLE_BAR_THEME_DARK)
+//                        .allowShowNotify(true) //是否允许sdk展示通知栏提示
+//                        .allowShowPageWhenScreenLock(true) //是否在锁屏场景支持展示广告落地页
+//                        .debug(BuildConfig.DEBUG) //测试阶段打开，可以通过日志排查问题，上线时去除该调用
+//                        .directDownloadNetworkType(TTAdConstant.NETWORK_STATE_WIFI, TTAdConstant.NETWORK_STATE_3G) //允许直接下载的网络状态集合
+//                        .supportMultiProcess(false) //是否支持多进程，true支持
+//                        .build(), new TTAdSdk.InitCallback() {
+//                    @Override
+//                    public void success() {
+//
+//                    }
+//
+//                    @Override
+//                    public void fail(int i, String s) {
+//
+//                    }
+//                });
 
 
         CmGameAppInfo cmGameAppInfo = new CmGameAppInfo();

GoodMoney/app/src/main/java/com/mints/goodmoney/manager/ReadToutiaoAD.java

@@ -196,6 +196,11 @@ public class ReadToutiaoAD {
                 LogUtils.i("ToutiaoAd", "rewardVideoAd video cached");
             }
 
+            @Override
+            public void onRewardVideoCached(TTRewardVideoAd ttRewardVideoAd) {
+
+            }
+
             //视频广告素材加载到，如title,视频url等，不包括视频文件
             @Override
             public void onRewardVideoAdLoad(TTRewardVideoAd ad) {

GoodMoney/app/src/main/java/com/mints/goodmoney/manager/TTGroMoreAdManagerHolder.java

-package com.mints.goodmoney.manager;
-
-import android.app.Activity;
-import android.content.Context;
-import android.provider.Settings;
-
-import com.bytedance.hume.readapk.HumeSDK;
-import com.bytedance.msdk.api.TTAdConfig;
-import com.bytedance.msdk.api.TTAdConstant;
-import com.bytedance.msdk.api.TTMediationAdSdk;
-import com.bytedance.msdk.api.UserInfoForSegment;
-import com.mints.goodmoney.BuildConfig;
-import com.mints.goodmoney.MintsApplication;
-import com.mints.goodmoney.common.Constant;
-import com.mints.library.utils.CommonUtils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-/**
- * 可以用一个单例来保存TTAdManager实例，在需要初始化sdk的时候调用
- */
-public class TTGroMoreAdManagerHolder {
-
-    public static final String TT_AD_APPID = "5113521";
-    public static final String TT_AD_NAME = Constant.MINTS_APP_NAME;
-
-    private static boolean sInit;
-
-    public static void init(Context context) {
-        doInit(context);
-    }
-
-    public static void initUnitySdkBanner(Activity activity) {
-        TTMediationAdSdk.initUnityForBanner(activity);
-    }
-
-
-    //step1:接入网盟广告sdk的初始化操作，详情见接入文档和穿山甲平台说明
-    private static void doInit(Context context) {
-        if (!sInit) {
-            TTMediationAdSdk.initialize(context, buildConfig(context));
-            sInit = true;
-        }
-    }
-
-    private static TTAdConfig buildConfig(Context context) {
-        UserInfoForSegment userInfo = new UserInfoForSegment();
-        userInfo.setUserId(UserManager.getInstance().getUserID());
-        userInfo.setGender(UserInfoForSegment.GENDER_UNKNOWN);
-        userInfo.setChannel(CommonUtils.getAppMetaData(MintsApplication.getContext(), "CHANNEL_NAME"));
-        userInfo.setSubChannel(HumeSDK.getChannel(MintsApplication.getContext()));
-        userInfo.setAge(999);
-        userInfo.setUserValueGroup("msdk demo user value group");
-
-        Map<String, String> customInfos = new HashMap<>();
-//        customInfos.put("aaaa", "test111");
-//        customInfos.put("bbbb", "test222");
-        userInfo.setCustomInfos(customInfos);
-        return new TTAdConfig.Builder()
-                .appId(TT_AD_APPID) //必填 ，不能为空
-                .appName(TT_AD_NAME) //必填，不能为空
-                .openAdnTest(false)//开启第三方ADN测试时需要设置为true，会每次重新拉去最新配置，release 包情况下必须关闭.默认false
-                .isPanglePaid(false)//是否为费用户
-                .setPublisherDid(getAndroidId(context)) //用户自定义device_id
-                .openDebugLog(BuildConfig.DEBUG) //测试阶段打开，可以通过日志排查问题，上线时去除该调用
-                .usePangleTextureView(true) //使用TextureView控件播放视频,默认为SurfaceView,当有SurfaceView冲突的场景，可以使用TextureView
-                .setPangleTitleBarTheme(TTAdConstant.TITLE_BAR_THEME_DARK)
-                .allowPangleShowNotify(true) //是否允许sdk展示通知栏提示
-                .allowPangleShowPageWhenScreenLock(true) //是否在锁屏场景支持展示广告落地页
-                .setPangleDirectDownloadNetworkType(TTAdConstant.NETWORK_STATE_WIFI, TTAdConstant.NETWORK_STATE_3G) //允许直接下载的网络状态集合
-                .needPangleClearTaskReset()//特殊机型过滤，部分机型出现包解析失败问题（大部分是三星）。参数取android.os.Build.MODEL
-                .setUserInfoForSegment(userInfo) // 设置流量分组的信息
-                .build();
-    }
-
-    public static String getAndroidId(Context context) {
-        String androidId = null;
-        try {
-            androidId = Settings.System.getString(context.getContentResolver(), Settings.System.ANDROID_ID);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return androidId;
-    }
-
-}
+//package com.mints.goodmoney.manager;
+//
+//import android.app.Activity;
+//import android.content.Context;
+//import android.provider.Settings;
+//
+//import com.bytedance.hume.readapk.HumeSDK;
+//import com.bytedance.msdk.api.TTAdConfig;
+//import com.bytedance.msdk.api.TTAdConstant;
+//import com.bytedance.msdk.api.TTMediationAdSdk;
+//import com.bytedance.msdk.api.UserInfoForSegment;
+//import com.mints.goodmoney.BuildConfig;
+//import com.mints.goodmoney.MintsApplication;
+//import com.mints.goodmoney.common.Constant;
+//import com.mints.library.utils.CommonUtils;
+//
+//import java.util.HashMap;
+//import java.util.Map;
+//
+//
+///**
+// * 可以用一个单例来保存TTAdManager实例，在需要初始化sdk的时候调用
+// */
+//public class TTGroMoreAdManagerHolder {
+//
+//    public static final String TT_AD_APPID = "5113521";
+//    public static final String TT_AD_NAME = Constant.MINTS_APP_NAME;
+//
+//    private static boolean sInit;
+//
+//    public static void init(Context context) {
+//        doInit(context);
+//    }
+//
+//    public static void initUnitySdkBanner(Activity activity) {
+//        TTMediationAdSdk.initUnityForBanner(activity);
+//    }
+//
+//
+//    //step1:接入网盟广告sdk的初始化操作，详情见接入文档和穿山甲平台说明
+//    private static void doInit(Context context) {
+//        if (!sInit) {
+//            TTMediationAdSdk.initialize(context, buildConfig(context));
+//            sInit = true;
+//        }
+//    }
+//
+//    private static TTAdConfig buildConfig(Context context) {
+//        UserInfoForSegment userInfo = new UserInfoForSegment();
+//        userInfo.setUserId(UserManager.getInstance().getUserID());
+//        userInfo.setGender(UserInfoForSegment.GENDER_UNKNOWN);
+//        userInfo.setChannel(CommonUtils.getAppMetaData(MintsApplication.getContext(), "CHANNEL_NAME"));
+//        userInfo.setSubChannel(HumeSDK.getChannel(MintsApplication.getContext()));
+//        userInfo.setAge(999);
+//        userInfo.setUserValueGroup("msdk demo user value group");
+//
+//        Map<String, String> customInfos = new HashMap<>();
+////        customInfos.put("aaaa", "test111");
+////        customInfos.put("bbbb", "test222");
+//        userInfo.setCustomInfos(customInfos);
+//        return new TTAdConfig.Builder()
+//                .appId(TT_AD_APPID) //必填 ，不能为空
+//                .appName(TT_AD_NAME) //必填，不能为空
+//                .openAdnTest(false)//开启第三方ADN测试时需要设置为true，会每次重新拉去最新配置，release 包情况下必须关闭.默认false
+//                .isPanglePaid(false)//是否为费用户
+//                .setPublisherDid(getAndroidId(context)) //用户自定义device_id
+//                .openDebugLog(BuildConfig.DEBUG) //测试阶段打开，可以通过日志排查问题，上线时去除该调用
+//                .usePangleTextureView(true) //使用TextureView控件播放视频,默认为SurfaceView,当有SurfaceView冲突的场景，可以使用TextureView
+//                .setPangleTitleBarTheme(TTAdConstant.TITLE_BAR_THEME_DARK)
+//                .allowPangleShowNotify(true) //是否允许sdk展示通知栏提示
+//                .allowPangleShowPageWhenScreenLock(true) //是否在锁屏场景支持展示广告落地页
+//                .setPangleDirectDownloadNetworkType(TTAdConstant.NETWORK_STATE_WIFI, TTAdConstant.NETWORK_STATE_3G) //允许直接下载的网络状态集合
+//                .needPangleClearTaskReset()//特殊机型过滤，部分机型出现包解析失败问题（大部分是三星）。参数取android.os.Build.MODEL
+//                .setUserInfoForSegment(userInfo) // 设置流量分组的信息
+//                .build();
+//    }
+//
+//    public static String getAndroidId(Context context) {
+//        String androidId = null;
+//        try {
+//            androidId = Settings.System.getString(context.getContentResolver(), Settings.System.ANDROID_ID);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return androidId;
+//    }
+//
+//}

GoodMoney/app/src/main/java/com/mints/goodmoney/manager/TtCsjAdManager.java

@@ -6,10 +6,9 @@ import com.bytedance.sdk.openadsdk.TTAdConfig;
 import com.bytedance.sdk.openadsdk.TTAdConstant;
 import com.bytedance.sdk.openadsdk.TTAdSdk;
 import com.mints.goodmoney.BuildConfig;
-import com.mints.goodmoney.MintsApplication;
 import com.mints.goodmoney.common.Constant;
 import com.mints.goodmoney.mvp.model.AdcodeBean;
-import com.mints.library.utils.CommonUtils;
+import com.mints.goodmoney.utils.LogUtil;
 
 /**
  * 穿山甲广告
@@ -81,7 +80,17 @@ public class TtCsjAdManager {
     //step1:接入网盟广告sdk的初始化操作，详情见接入文档和穿山甲平台说明
     private static void doInit(Context context) {
         if (!sInit) {
-            TTAdSdk.init(context, buildConfig(context));
+            TTAdSdk.init(context, buildConfig(context), new TTAdSdk.InitCallback() {
+                @Override
+                public void success() {
+                    LogUtil.d("TTAdSdk init success");
+                }
+
+                @Override
+                public void fail(int i, String s) {
+                    LogUtil.d("TTAdSdk init fail " + i + " " + s);
+                }
+            });
             sInit = true;
         }
     }
@@ -106,7 +115,7 @@ public class TtCsjAdManager {
                 .allowShowNotify(true) //是否允许sdk展示通知栏提示
                 .allowShowPageWhenScreenLock(false) //是否在锁屏场景支持展示广告落地页
                 .debug(logFlag) //测试阶段打开，可以通过日志排查问题，上线时去除该调用
-                .directDownloadNetworkType(TTAdConstant.NETWORK_STATE_WIFI, TTAdConstant.NETWORK_STATE_3G) //允许直接下载的网络状态集合
+                .directDownloadNetworkType(TTAdConstant.NETWORK_STATE_WIFI, TTAdConstant.NETWORK_STATE_4G, TTAdConstant.NETWORK_STATE_3G) //允许直接下载的网络状态集合
                 .supportMultiProcess(false)//是否支持多进程
                 //.httpStack(new MyOkStack3())//自定义网络库，demo中给出了okhttp3版本的样例，其余请自行开发或者咨询工作人员。
                 .build();

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/AboutusActivity.kt

@@ -3,23 +3,16 @@ package com.mints.goodmoney.ui.activitys
 import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.View
-import android.widget.FrameLayout
-import android.widget.ImageView
 import com.bytedance.hume.readapk.HumeSDK
 import com.mints.goodmoney.MintsApplication
 import com.mints.goodmoney.R
-import com.mints.goodmoney.ad.banner.BannerManager
-import com.mints.goodmoney.ad.video.CsjGroMoreVideoAdManager
 import com.mints.goodmoney.common.AppConfig
 import com.mints.goodmoney.common.Constant
-import com.mints.goodmoney.manager.TtCsjAdManager
 import com.mints.goodmoney.ui.activitys.base.BaseActivity
-import com.mints.goodmoney.ui.adapter.AdBannerAdapter
 import com.mints.goodmoney.utils.ToastUtil
 import com.mints.library.utils.CommonUtils
 import com.mints.library.utils.ConstantUtil
 import kotlinx.android.synthetic.main.activity_aboutus.*
-import kotlinx.android.synthetic.main.fragment_main_my.*
 import kotlinx.android.synthetic.main.header_layout.*
 
 /**

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/AwardActivity.kt

@@ -11,7 +11,6 @@ import android.view.KeyEvent
 import android.view.View
 import androidx.core.content.ContextCompat
 import com.mints.goodmoney.R
-import com.mints.goodmoney.ad.express.GroMoreExpressManager
 import com.mints.goodmoney.ad.express.PreLoadExpressManager
 import com.mints.goodmoney.ad.video.VideoAdingManager
 import com.mints.goodmoney.common.AppConfig

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/FoodSubsidyActivity.kt

@@ -3,8 +3,9 @@ package com.mints.goodmoney.ui.activitys
 import android.os.Bundle
 import android.view.View
 import com.mints.goodmoney.R
-import com.mints.goodmoney.ad.express.GroMoreCarrierExpressManager
+import com.mints.goodmoney.ad.express.TTPreLoadCarrierExpressManager
 import com.mints.goodmoney.common.Constant
+import com.mints.goodmoney.manager.TtCsjAdManager
 import com.mints.goodmoney.mvp.model.MealBean
 import com.mints.goodmoney.mvp.presenters.FoodSubsidyPresenter
 import com.mints.goodmoney.mvp.views.FoodSubsidyView
@@ -87,8 +88,8 @@ class FoodSubsidyActivity : BaseActivity(), View.OnClickListener, FoodSubsidyVie
         }
 
         // 预加载信息流
-//        TTPreLoadCarrierExpressManager.getInstance().loadTtFrameLayout(TtCsjAdManager.TT_AD_NATIVEEXPRESS_EAT)
-        GroMoreCarrierExpressManager.instance.loadADFrameLayout()
+        TTPreLoadCarrierExpressManager.getInstance().loadTtFrameLayout(TtCsjAdManager.TT_AD_NATIVEEXPRESS_EAT)
+//        GroMoreCarrierExpressManager.instance.loadADFrameLayout()
     }
 
 
@@ -97,11 +98,11 @@ class FoodSubsidyActivity : BaseActivity(), View.OnClickListener, FoodSubsidyVie
      */
     private fun initExpress() {
         try {
-            if (GroMoreCarrierExpressManager.instance.getADFrameLayout() != null) {
+            if (TTPreLoadCarrierExpressManager.getInstance().ttFrameLayout != null) {
                 if (flSubsidykAd != null) {
                     flSubsidykAd.removeAllViews()
-//                    flSubsidykAd.addView(TTPreLoadCarrierExpressManager.getInstance().ttFrameLayout)
-                    flSubsidykAd.addView(GroMoreCarrierExpressManager.instance.getADFrameLayout())
+                    flSubsidykAd.addView(TTPreLoadCarrierExpressManager.getInstance().ttFrameLayout)
+//                    flSubsidykAd.addView(GroMoreCarrierExpressManager.instance.getADFrameLayout())
                 }
             }
         } catch (e: Exception) {

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/MorningClockActivity.kt

@@ -5,7 +5,6 @@ import android.view.View
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.GridLayoutManager
 import com.mints.goodmoney.R
-import com.mints.goodmoney.ad.express.GroMoreCarrierExpressManager
 import com.mints.goodmoney.ad.video.VideoAdingManager
 import com.mints.goodmoney.common.Constant
 import com.mints.goodmoney.ad.express.TTPreLoadCarrierExpressManager
@@ -184,11 +183,12 @@ class MorningClockActivity : BaseActivity(), View.OnClickListener, MorningClockV
      */
     private fun initExpress() {
         try {
-            if (GroMoreCarrierExpressManager.instance.getADFrameLayout() != null) {
+//            if (GroMoreCarrierExpressManager.instance.getADFrameLayout() != null) {
+            if (TTPreLoadCarrierExpressManager.getInstance().ttFrameLayout != null) {
                 if (flMorningClockAd != null) {
                     flMorningClockAd.removeAllViews()
-//                flMorningClockAd.addView(TTPreLoadCarrierExpressManager.getInstance().ttFrameLayout)
-                    flMorningClockAd.addView(GroMoreCarrierExpressManager.instance.getADFrameLayout())
+                flMorningClockAd.addView(TTPreLoadCarrierExpressManager.getInstance().ttFrameLayout)
+//                    flMorningClockAd.addView(GroMoreCarrierExpressManager.instance.getADFrameLayout())
                 }
             }
         } catch (e: Exception) {

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/SplashCsjADActivity.kt

 package com.mints.goodmoney.ui.activitys
 
+import android.text.TextUtils
 import android.view.KeyEvent
 import android.view.View
 import android.view.ViewGroup
 import com.bytedance.sdk.openadsdk.AdSlot
 import com.bytedance.sdk.openadsdk.TTAdNative
 import com.bytedance.sdk.openadsdk.TTSplashAd
+import com.mints.goodmoney.MintsApplication
 import com.mints.goodmoney.R
+import com.mints.goodmoney.common.Constant
 import com.mints.goodmoney.manager.TTNativeExpressManager
 import com.mints.goodmoney.manager.TtCsjAdManager
+import com.mints.goodmoney.manager.UserManager
 import com.mints.goodmoney.ui.activitys.base.BaseActivity
 import com.mints.library.net.netstatus.NetUtils
+import com.mints.library.utils.CommonUtils
+import net.grandcentrix.tray.AppPreferences
 
 private val TAG = SplashCsjADActivity::class.java.simpleName
 
@@ -18,6 +24,9 @@ private val TAG = SplashCsjADActivity::class.java.simpleName
  * 后台返回时每次都展示 快手广告
  */
 class SplashCsjADActivity : BaseActivity() {
+
+    private val ps by lazy { AppPreferences(context) }
+
     private var container: ViewGroup? = null
     private var mIsPaused = false
     var canJump = false
@@ -143,7 +152,18 @@ class SplashCsjADActivity : BaseActivity() {
     }
 
     private fun readyGoOtherActivity() {
-        finish()
+        val customVersion: Int = ps.getInt(Constant.CUSTOM_VERSION, 0)
+        val isFirstEnter: Boolean = ps.getBoolean(Constant.ISFIRSTENTER + customVersion, true)
+        if (isFirstEnter) {
+            readyGoThenKill(GuideActivity::class.java)
+        } else {
+            val channel = CommonUtils.getAppMetaData(MintsApplication.getContext(), "CHANNEL_NAME")
+            if (TextUtils.equals(channel, Constant.CHANNEL_SHARE) && !UserManager.getInstance().userIsLogin()) {
+                readyGo(WxLoginActivity::class.java)
+            } else {
+                readyGoThenKill(MainActivity::class.java)
+            }
+        }
     }
 
 }
\ No newline at end of file

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/SplashKsADActivity.kt

@@ -76,6 +76,15 @@ class SplashKsADActivity : BaseActivity() {
 
                 next()
             }
+
+            override fun onDownloadTipsDialogShow() {
+            }
+
+            override fun onDownloadTipsDialogDismiss() {
+            }
+
+            override fun onDownloadTipsDialogCancel() {
+            }
         })
 
         if (!isFinishing) {

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/WalkActivity.kt

@@ -3,8 +3,9 @@ package com.mints.goodmoney.ui.activitys
 import android.os.Bundle
 import android.view.View
 import com.mints.goodmoney.R
-import com.mints.goodmoney.ad.express.GroMoreCarrierExpressManager
+import com.mints.goodmoney.ad.express.TTPreLoadCarrierExpressManager
 import com.mints.goodmoney.common.Constant
+import com.mints.goodmoney.manager.TtCsjAdManager
 import com.mints.goodmoney.mvp.model.WalkBean
 import com.mints.goodmoney.mvp.presenters.WalkPresenter
 import com.mints.goodmoney.mvp.views.WalkView
@@ -98,8 +99,8 @@ class WalkActivity : BaseActivity(), View.OnClickListener, WalkView, StepView.St
         }
 
         // 预加载信息流
-//        TTPreLoadCarrierExpressManager.getInstance().loadTtFrameLayout(TtCsjAdManager.TT_AD_NATIVEEXPRESS_WALK)
-        GroMoreCarrierExpressManager.instance.loadADFrameLayout()
+        TTPreLoadCarrierExpressManager.getInstance().loadTtFrameLayout(TtCsjAdManager.TT_AD_NATIVEEXPRESS_WALK)
+//        GroMoreCarrierExpressManager.instance.loadADFrameLayout()
     }
 
     /**
@@ -107,11 +108,12 @@ class WalkActivity : BaseActivity(), View.OnClickListener, WalkView, StepView.St
      */
     private fun initExpress() {
         try {
-            if (GroMoreCarrierExpressManager.instance.getADFrameLayout() != null) {
+//            if (GroMoreCarrierExpressManager.instance.getADFrameLayout() != null) {
+            if (TTPreLoadCarrierExpressManager.getInstance().ttFrameLayout != null) {
                 if (flWalkAd != null) {
                     flWalkAd.removeAllViews()
-//                    flWalkAd.addView(TTPreLoadCarrierExpressManager.getInstance().ttFrameLayout)
-                    flWalkAd.addView(GroMoreCarrierExpressManager.instance.getADFrameLayout())
+                    flWalkAd.addView(TTPreLoadCarrierExpressManager.getInstance().ttFrameLayout)
+//                    flWalkAd.addView(GroMoreCarrierExpressManager.instance.getADFrameLayout())
                 }
             }
         } catch (e: Exception) {

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/WaterActivity.kt

@@ -3,8 +3,9 @@ package com.mints.goodmoney.ui.activitys
 import android.os.Bundle
 import android.view.View
 import com.mints.goodmoney.R
-import com.mints.goodmoney.ad.express.GroMoreCarrierExpressManager
+import com.mints.goodmoney.ad.express.TTPreLoadCarrierExpressManager
 import com.mints.goodmoney.common.Constant
+import com.mints.goodmoney.manager.TtCsjAdManager
 import com.mints.goodmoney.mvp.model.WaterBean
 import com.mints.goodmoney.mvp.presenters.WaterPresenter
 import com.mints.goodmoney.ui.activitys.base.BaseActivity
@@ -68,8 +69,8 @@ class WaterActivity : BaseActivity(), View.OnClickListener, WaterView.WaterViewL
         }
 
         // 预加载信息流
-//        TTPreLoadCarrierExpressManager.getInstance().loadTtFrameLayout(TtCsjAdManager.TT_AD_NATIVEEXPRESS_WATER)
-        GroMoreCarrierExpressManager.instance.loadADFrameLayout()
+        TTPreLoadCarrierExpressManager.getInstance().loadTtFrameLayout(TtCsjAdManager.TT_AD_NATIVEEXPRESS_WATER)
+//        GroMoreCarrierExpressManager.instance.loadADFrameLayout()
     }
 
     override fun clickForWaterSuc(waterCoin: Int) {
@@ -111,11 +112,12 @@ class WaterActivity : BaseActivity(), View.OnClickListener, WaterView.WaterViewL
      */
     private fun initExpress() {
         try {
-            if (GroMoreCarrierExpressManager.instance.getADFrameLayout() != null) {
+//            if (GroMoreCarrierExpressManager.instance.getADFrameLayout() != null) {
+            if (TTPreLoadCarrierExpressManager.getInstance().ttFrameLayout != null) {
                 if (flWaterAd != null) {
                     flWaterAd.removeAllViews()
-//                flWaterAd.addView(TTPreLoadCarrierExpressManager.getInstance().ttFrameLayout)
-                    flWaterAd.addView(GroMoreCarrierExpressManager.instance.getADFrameLayout())
+                flWaterAd.addView(TTPreLoadCarrierExpressManager.getInstance().ttFrameLayout)
+//                    flWaterAd.addView(GroMoreCarrierExpressManager.instance.getADFrameLayout())
                 }
             }
         } catch (e: Exception) {

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/XiaomanActivity.kt

@@ -349,6 +349,7 @@ class XiaomanActivity : BaseActivity(), View.OnClickListener {
 
             //视频广告加载后的视频文件资源缓存到本地的回调
             override fun onRewardVideoCached() {}
+            override fun onRewardVideoCached(p0: TTRewardVideoAd?) {}
 
             //视频广告素材加载到，如title,视频url等，不包括视频文件
             override fun onRewardVideoAdLoad(ad: TTRewardVideoAd) {

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MainFragment.kt

@@ -16,7 +16,6 @@ import com.daimajia.androidanimations.library.YoYo
 import com.daimajia.androidanimations.library.YoYo.YoYoString
 import com.mints.goodmoney.MintsApplication
 import com.mints.goodmoney.R
-import com.mints.goodmoney.ad.express.GroMoreExpressManager
 import com.mints.goodmoney.ad.express.PreLoadExpressManager
 import com.mints.goodmoney.ad.express.TTPreLoadExpressXmlyManager
 import com.mints.goodmoney.ad.video.VideoAdingManager

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MyFragment.kt

@@ -19,7 +19,6 @@ import com.mints.goodmoney.BuildConfig
 import com.mints.goodmoney.MintsApplication
 import com.mints.goodmoney.R
 import com.mints.goodmoney.ad.banner.BannerManager
-import com.mints.goodmoney.ad.express.GroMoreCarrierExpressManager
 import com.mints.goodmoney.ad.express.PreLoadExpressManager
 import com.mints.goodmoney.ad.express.TTPreLoadCarrierExpressManager
 import com.mints.goodmoney.ad.express.TTPreLoadExpressXmlyManager
@@ -1013,13 +1012,13 @@ class MyFragment : BaseFragment(),
                         readyGo(XiaomanActivity::class.java, bundle)
                     }
                     Constant.HOT_ACTIVITY_WATER -> {
-                        GroMoreCarrierExpressManager.instance.loadADFrameLayout()
-//                        TTPreLoadCarrierExpressManager.getInstance().loadTtFrameLayout(TtCsjAdManager.TT_AD_NATIVEEXPRESS_WATER)
+//                        GroMoreCarrierExpressManager.instance.loadADFrameLayout()
+                        TTPreLoadCarrierExpressManager.getInstance().loadTtFrameLayout(TtCsjAdManager.TT_AD_NATIVEEXPRESS_WATER)
                         readyGo(WaterActivity::class.java)
                     }
                     Constant.HOT_ACTIVITY_WALK -> {
-                        GroMoreCarrierExpressManager.instance.loadADFrameLayout()
-//                        TTPreLoadCarrierExpressManager.getInstance().loadTtFrameLayout(TtCsjAdManager.TT_AD_NATIVEEXPRESS_WALK)
+//                        GroMoreCarrierExpressManager.instance.loadADFrameLayout()
+                        TTPreLoadCarrierExpressManager.getInstance().loadTtFrameLayout(TtCsjAdManager.TT_AD_NATIVEEXPRESS_WALK)
                         readyGo(WalkActivity::class.java)
                     }
                     Constant.HOT_ACTIVITY_CARD -> {
@@ -1029,8 +1028,8 @@ class MyFragment : BaseFragment(),
                         readyGo(LiebaoGameActivity::class.java)
                     }
                     Constant.HOT_ACTIVITY_MORNINGCLOCK -> {
-                        GroMoreCarrierExpressManager.instance.loadADFrameLayout()
-//                        TTPreLoadCarrierExpressManager.getInstance().loadTtFrameLayout(TtCsjAdManager.TT_AD_NATIVEEXPRESS_MORNINGCLOCK)
+//                        GroMoreCarrierExpressManager.instance.loadADFrameLayout()
+                        TTPreLoadCarrierExpressManager.getInstance().loadTtFrameLayout(TtCsjAdManager.TT_AD_NATIVEEXPRESS_MORNINGCLOCK)
                         readyGo(MorningClockActivity::class.java)
                     }
                     Constant.HOT_ACTIVITY_BXM -> {
@@ -1110,8 +1109,8 @@ class MyFragment : BaseFragment(),
                         readyGo(WrapperActivity::class.java, bundle)
                     }
                     Constant.HOT_ACTIVITY_EAT -> {
-                        GroMoreCarrierExpressManager.instance.loadADFrameLayout()
-//                        TTPreLoadCarrierExpressManager.getInstance().loadTtFrameLayout(TtCsjAdManager.TT_AD_NATIVEEXPRESS_EAT)
+//                        GroMoreCarrierExpressManager.instance.loadADFrameLayout()
+                        TTPreLoadCarrierExpressManager.getInstance().loadTtFrameLayout(TtCsjAdManager.TT_AD_NATIVEEXPRESS_EAT)
                         readyGo(FoodSubsidyActivity::class.java)
                     }
                     Constant.HOT_ACTIVITY_SHARE_NEWS -> {

GoodMoney/app/src/main/java/com/mints/goodmoney/utils/ForegroundOrBackground.java

@@ -8,9 +8,7 @@ import android.text.TextUtils;
 
 import com.mints.goodmoney.manager.TrackManager;
 import com.mints.goodmoney.mvp.presenters.VersionUpdatePresenter;
-import com.mints.goodmoney.ui.activitys.SplashADActivity;
 import com.mints.goodmoney.ui.activitys.SplashCsjADActivity;
-import com.mints.goodmoney.ui.activitys.SplashGroMoreActivity;
 
 import java.lang.ref.WeakReference;
 
@@ -131,7 +129,7 @@ public class ForegroundOrBackground implements Application.ActivityLifecycleCall
 ////                    activity.startActivity(ksIntent);
 //                }
                 if (ksIntent == null) {
-                    ksIntent = new Intent(activity, SplashGroMoreActivity.class);
+                    ksIntent = new Intent(activity, SplashCsjADActivity.class);
                 }
                 activity.startActivity(ksIntent);
             }

GoodMoney/build.gradle

@@ -80,7 +80,9 @@ allprojects {
     repositories {
         google()
         jcenter()
-        maven { url 'https://dl.bintray.com/umsdk/release' }
+//        maven { url 'https://dl.bintray.com/umsdk/release' }
+        // umeng仓库
+        maven { url 'https://repo1.maven.org/maven2/' }
         maven { url "https://jitpack.io" }
 
         //添加一览 maven地址