RTA激励视频集成，热门活动样式改变

GoodMoney/app/build.gradle

@@ -272,6 +272,10 @@ dependencies {
     // 抖音滑动LayoutManager
     implementation(name: 'LayoutManagerGroup', ext: 'aar')
 
+    // 激励视频RTA
+    implementation(name: 'taskwake1.0', ext: 'aar')
+    implementation 'com.squareup.retrofit2:converter-gson:2.6.2'
+
 //    testImplementation 'junit:junit:4.13'
 //    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
 //    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'

GoodMoney/app/src/main/AndroidManifest.xml

@@ -60,7 +60,8 @@
         android:supportsRtl="true"
         android:theme="@style/CustomAppTheme"
         android:usesCleartextTraffic="true"
-        tools:ignore="GoogleAppIndexingWarning">
+        tools:ignore="GoogleAppIndexingWarning"
+        tools:replace="android:theme">
 
         <uses-library
             android:name="org.apache.http.legacy"

GoodMoney/app/src/main/java/com/mints/goodmoney/ad/draw/CsjDrawAdManager.kt

@@ -14,6 +14,9 @@ import com.mints.goodmoney.utils.LogUtil
 import com.mints.goodmoney.utils.ToastUtil
 import com.mints.goodmoney.utils.UIUtils
 
+/**
+ * 描述：穿山甲Draw 信息流广告
+ */
 class CsjDrawAdManager private constructor(activity: Activity) {
 
     companion object {

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

@@ -8,7 +8,7 @@ import com.bytedance.sdk.openadsdk.TTAdNative;
 import com.bytedance.sdk.openadsdk.TTAdSdk;
 import com.bytedance.sdk.openadsdk.TTFullScreenVideoAd;
 import com.mints.goodmoney.ad.video.base.BaseVideoAd;
-import com.mints.goodmoney.ad.video.base.VedioAdStatusListener;
+import com.mints.goodmoney.ad.video.base.VideoAdStatusListener;
 import com.mints.goodmoney.common.Constant;
 import com.mints.goodmoney.manager.TrackManager;
 import com.mints.goodmoney.manager.TtCsjAdManager;
@@ -20,7 +20,7 @@ public class CsjFullVideoAdManager extends BaseVideoAd {
 
     private static CsjFullVideoAdManager _inst;
 
-    private VedioAdStatusListener vedioAdStatusListener;
+    private VideoAdStatusListener videoAdStatusListener;
 
     Activity activity;
     private TTAdNative ttAdNative;
@@ -68,8 +68,8 @@ public class CsjFullVideoAdManager extends BaseVideoAd {
             public void onError(int code, String message) {
                 TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_CSJFULL, Constant.EVENT_TYPE_ONE, String.valueOf(code), message);
 
-                if (vedioAdStatusListener != null) {
-                    vedioAdStatusListener.adFail();
+                if (videoAdStatusListener != null) {
+                    videoAdStatusListener.adFail();
                 }
             }
 
@@ -92,16 +92,16 @@ public class CsjFullVideoAdManager extends BaseVideoAd {
                         }
                         TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_CSJFULL, Constant.EVENT_TYPE_TWO, "", "");
 
-                        if (vedioAdStatusListener != null) {
-                            vedioAdStatusListener.adDownload();
+                        if (videoAdStatusListener != null) {
+                            videoAdStatusListener.adDownload();
                         }
                     }
 
                     @Override
                     public void onAdClose() {
                         TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_CSJFULL, Constant.EVENT_TYPE_THREE, "", "");
-                        if (vedioAdStatusListener != null) {
-                            vedioAdStatusListener.adSuccess();
+                        if (videoAdStatusListener != null) {
+                            videoAdStatusListener.adSuccess();
                         }
                         if (activity != null) {
                             TrackManager.getInstance().reportAddCoinMsg(activity, getAdMapVO(carrierType, Constant.AD_SOURCE_CSJFULL, extraId, curCoin));
@@ -129,8 +129,8 @@ public class CsjFullVideoAdManager extends BaseVideoAd {
                 } else {
                     TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_CSJFULL, Constant.EVENT_TYPE_ONE, "999999", "Cached Fail");
 
-                    if (vedioAdStatusListener != null) {
-                        vedioAdStatusListener.adFail();
+                    if (videoAdStatusListener != null) {
+                        videoAdStatusListener.adFail();
                     }
                 }
             }
@@ -146,8 +146,8 @@ public class CsjFullVideoAdManager extends BaseVideoAd {
         activity = null;
     }
 
-    public void setVedioAdStatusListener(VedioAdStatusListener vedioAdStatusListener) {
-        this.vedioAdStatusListener = vedioAdStatusListener;
+    public void setVideoAdStatusListener(VideoAdStatusListener videoAdStatusListener) {
+        this.videoAdStatusListener = videoAdStatusListener;
     }
 
 }

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

@@ -9,7 +9,7 @@ import com.bytedance.sdk.openadsdk.TTAppDownloadListener;
 import com.bytedance.sdk.openadsdk.TTRewardVideoAd;
 import com.mints.goodmoney.BuildConfig;
 import com.mints.goodmoney.ad.video.base.BaseVideoAd;
-import com.mints.goodmoney.ad.video.base.VedioAdStatusListener;
+import com.mints.goodmoney.ad.video.base.VideoAdStatusListener;
 import com.mints.goodmoney.common.AppConfig;
 import com.mints.goodmoney.common.Constant;
 import com.mints.goodmoney.manager.TTNativeExpressManager;
@@ -33,7 +33,7 @@ public class CsjVideoAdManager extends BaseVideoAd {
     private AppPreferences ps;
     private int curCoin;
     private String extraId;
-    private VedioAdStatusListener vedioAdStatusListener;
+    private VideoAdStatusListener videoAdStatusListener;
 
     Activity activity;
     private TTAdNative ttAdNative;
@@ -151,8 +151,8 @@ public class CsjVideoAdManager extends BaseVideoAd {
 
 
                     LogUtil.d("vedioAdStatusListener", "onError  " + code + message);
-                    if (vedioAdStatusListener != null) {
-                        vedioAdStatusListener.adFail();
+                    if (videoAdStatusListener != null) {
+                        videoAdStatusListener.adFail();
                     }
                 }
 
@@ -165,8 +165,8 @@ public class CsjVideoAdManager extends BaseVideoAd {
                     } else {
                         TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_CSJ, Constant.EVENT_TYPE_ONE, "999999", "Cached Fail");
 
-                        if (vedioAdStatusListener != null) {
-                            vedioAdStatusListener.adFail();
+                        if (videoAdStatusListener != null) {
+                            videoAdStatusListener.adFail();
                         }
                     }
                 }
@@ -197,8 +197,8 @@ public class CsjVideoAdManager extends BaseVideoAd {
                                     TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_CSJ, Constant.EVENT_TYPE_FOUR, "", "");
                                     isClickScreen = false;
                                 }
-                                if (vedioAdStatusListener != null) {
-                                    vedioAdStatusListener.adDownload();
+                                if (videoAdStatusListener != null) {
+                                    videoAdStatusListener.adDownload();
                                 }
                             }
 
@@ -206,8 +206,8 @@ public class CsjVideoAdManager extends BaseVideoAd {
                             public void onAdClose() {
                                 TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_CSJ, Constant.EVENT_TYPE_THREE, "", "");
 
-                                if (vedioAdStatusListener != null) {
-                                    vedioAdStatusListener.adSuccess();
+                                if (videoAdStatusListener != null) {
+                                    videoAdStatusListener.adSuccess();
                                 }
                             }
 
@@ -219,8 +219,8 @@ public class CsjVideoAdManager extends BaseVideoAd {
                             public void onVideoError() {
                                 TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_CSJ, Constant.EVENT_TYPE_ONE, "999999", "VideoError");
 
-                                if (vedioAdStatusListener != null) {
-                                    vedioAdStatusListener.adFail();
+                                if (videoAdStatusListener != null) {
+                                    videoAdStatusListener.adFail();
                                 }
                             }
 
@@ -300,8 +300,8 @@ public class CsjVideoAdManager extends BaseVideoAd {
         return vo;
     }
 
-    public void setVedioAdStatusListener(VedioAdStatusListener vedioAdStatusListener) {
-        this.vedioAdStatusListener = vedioAdStatusListener;
+    public void setVideoAdStatusListener(VideoAdStatusListener videoAdStatusListener) {
+        this.videoAdStatusListener = videoAdStatusListener;
     }
 
 }

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

@@ -6,7 +6,7 @@ import com.kwad.sdk.api.KsLoadManager
 import com.kwad.sdk.api.KsRewardVideoAd
 import com.kwad.sdk.api.KsScene
 import com.mints.goodmoney.ad.video.base.BaseVideoAd
-import com.mints.goodmoney.ad.video.base.VedioAdStatusListener
+import com.mints.goodmoney.ad.video.base.VideoAdStatusListener
 import com.mints.goodmoney.common.AppConfig
 import com.mints.goodmoney.common.Constant
 import com.mints.goodmoney.manager.KsManager
@@ -22,7 +22,7 @@ private val TAG = KsVideoAdManager::class.java.simpleName
 class KsVideoAdManager private constructor(activity: Activity) :
         BaseVideoAd() {
 
-    private var vedioAdStatusListener: VedioAdStatusListener? = null
+    private var videoAdStatusListener: VideoAdStatusListener? = null
     private var mRewardVideoAd: KsRewardVideoAd? = null
 
     private var isClickScreen: Boolean = true
@@ -55,7 +55,7 @@ class KsVideoAdManager private constructor(activity: Activity) :
         val scene = KsScene.Builder(KsManager.KS_AD_VEDIO_POSTID).build()
         KsAdSDK.getLoadManager().loadRewardVideoAd(scene, object : KsLoadManager.RewardVideoAdListener {
             override fun onError(p0: Int, p1: String?) {
-                vedioAdStatusListener?.adFail()
+                videoAdStatusListener?.adFail()
             }
 
             override fun onRewardVideoAdLoad(p0: MutableList<KsRewardVideoAd>?) {
@@ -77,7 +77,7 @@ class KsVideoAdManager private constructor(activity: Activity) :
                                 TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_KS, Constant.EVENT_TYPE_FOUR, "", "")
                                 isClickScreen = false
                             }
-                            vedioAdStatusListener?.adDownload()
+                            videoAdStatusListener?.adDownload()
                         }
 
                         override fun onPageDismiss() {
@@ -87,7 +87,7 @@ class KsVideoAdManager private constructor(activity: Activity) :
 
                             TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_KS, Constant.EVENT_TYPE_THREE, "", "")
 
-                            vedioAdStatusListener?.adSuccess()
+                            videoAdStatusListener?.adSuccess()
                         }
 
                         override fun onVideoPlayError(p0: Int, p1: Int) {
@@ -95,7 +95,7 @@ class KsVideoAdManager private constructor(activity: Activity) :
 
                             TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_KS, Constant.EVENT_TYPE_ONE, (p0).toString(), "")
 
-                            vedioAdStatusListener?.adFail()
+                            videoAdStatusListener?.adFail()
                         }
 
                         override fun onVideoPlayEnd() {
@@ -123,8 +123,8 @@ class KsVideoAdManager private constructor(activity: Activity) :
 
     }
 
-    fun setVedioAdStatusListener(vedioAdStatusListener: VedioAdStatusListener?) {
-        this.vedioAdStatusListener = vedioAdStatusListener
+    fun setVideoAdStatusListener(videoAdStatusListener: VideoAdStatusListener?) {
+        this.videoAdStatusListener = videoAdStatusListener
     }
 
 

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

@@ -3,7 +3,7 @@ package com.mints.goodmoney.ad.video
 import android.app.Activity
 import com.maplehaze.adsdk.video.RewardVideoAd
 import com.mints.goodmoney.ad.video.base.BaseVideoAd
-import com.mints.goodmoney.ad.video.base.VedioAdStatusListener
+import com.mints.goodmoney.ad.video.base.VideoAdStatusListener
 import com.mints.goodmoney.common.AppConfig
 import com.mints.goodmoney.common.Constant
 import com.mints.goodmoney.manager.MhManager
@@ -18,7 +18,7 @@ private val TAG = MhVideoAdManager::class.java.simpleName
 class MhVideoAdManager private constructor(activity: Activity) :
         BaseVideoAd() {
 
-    private var vedioAdStatusListener: VedioAdStatusListener? = null
+    private var videoAdStatusListener: VideoAdStatusListener? = null
     private var mRewardVideoAd: RewardVideoAd? = null
 
     private var isClickScreen: Boolean = true
@@ -85,7 +85,7 @@ class MhVideoAdManager private constructor(activity: Activity) :
                     TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_FL, Constant.EVENT_TYPE_FOUR, "", "")
                     isClickScreen = false
                 }
-                vedioAdStatusListener?.adDownload()
+                videoAdStatusListener?.adDownload()
             }
 
             override fun onVideoComplete() {
@@ -99,7 +99,7 @@ class MhVideoAdManager private constructor(activity: Activity) :
 
                 TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_FL, Constant.EVENT_TYPE_THREE, "", "")
 
-                vedioAdStatusListener?.adSuccess()
+                videoAdStatusListener?.adSuccess()
             }
 
             override fun onADError(p0: Int) {
@@ -107,7 +107,7 @@ class MhVideoAdManager private constructor(activity: Activity) :
 
                 TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_FL, Constant.EVENT_TYPE_ONE, (p0).toString(), "")
 
-                vedioAdStatusListener?.adFail()
+                videoAdStatusListener?.adFail()
             }
 
         })
@@ -115,8 +115,8 @@ class MhVideoAdManager private constructor(activity: Activity) :
         mRewardVideoAd?.loadAd()
     }
 
-    fun setVedioAdStatusListener(vedioAdStatusListener: VedioAdStatusListener?) {
-        this.vedioAdStatusListener = vedioAdStatusListener
+    fun setVideoAdStatusListener(videoAdStatusListener: VideoAdStatusListener?) {
+        this.videoAdStatusListener = videoAdStatusListener
     }
 
 

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

+package com.mints.goodmoney.ad.video
+
+import android.app.Activity
+import com.fly.videowake.ad.ManageVideoAd
+import com.fly.videowake.ad.VideoRewardListener
+import com.mints.goodmoney.MintsApplication
+import com.mints.goodmoney.ad.video.base.BaseVideoAd
+import com.mints.goodmoney.ad.video.base.VideoAdStatusListener
+import com.mints.goodmoney.common.AppConfig
+import com.mints.goodmoney.common.Constant
+import com.mints.goodmoney.manager.TrackManager
+import com.mints.goodmoney.utils.LogUtil
+
+
+private val TAG = RTAVideoAdManager::class.java.simpleName
+
+/**
+ * ACT激励视频
+ */
+class RTAVideoAdManager private constructor(activity: Activity) : BaseVideoAd() {
+
+    private var videoAdStatusListener: VideoAdStatusListener? = null
+
+    private var isClickScreen: Boolean = true
+    private var activity: Activity? = null
+
+    private var manageVideoAd: ManageVideoAd? = null
+
+    companion object {
+        const val RTA_ID = 38
+
+        private var _inst: RTAVideoAdManager? = null
+        fun getInstance(activity: Activity): RTAVideoAdManager? {
+            return if (_inst != null) {
+                _inst
+            } else {
+                _inst = RTAVideoAdManager(activity)
+                _inst
+            }
+        }
+    }
+
+    init {
+        init(activity)
+    }
+
+    private fun init(activity: Activity) {
+        this.activity = activity
+    }
+
+    override fun loadAd(activity: Activity, curCoin: Int, carrierType: String, extraId: String?) {
+        this.activity = activity
+        isClickScreen = true
+
+        manageVideoAd = ManageVideoAd(activity, RTA_ID, MintsApplication.OAID)
+
+        manageVideoAd?.setVideoRewardListener(object : VideoRewardListener {
+            override fun onVideoPlayStart() {
+                LogUtil.d(TAG, "onVideoPlayStart -> ")
+
+            }
+
+            override fun onLoadSuccess() {
+                LogUtil.d(TAG, "onLoadSuccess -> ")
+
+                TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_RTA, Constant.EVENT_TYPE_ZERO, "", "")
+
+                // 展示广告
+                manageVideoAd?.showAD()
+            }
+
+            override fun onAdShow() {
+                LogUtil.d(TAG, "onAdShow -> ")
+
+            }
+
+            override fun onVideoPlaySkip() {
+                LogUtil.d(TAG, "onVideoPlaySkip -> ")
+
+            }
+
+            override fun onLoadFail(p0: String?) {
+                LogUtil.d(TAG, "onLoadFail -> " + p0)
+
+                TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_RTA, Constant.EVENT_TYPE_ONE, (p0).toString(), "")
+
+                videoAdStatusListener?.adFail()
+            }
+
+            override fun onAdClick() {
+                LogUtil.d(TAG, "onAdClick -> ")
+
+                if (AppConfig.needReportClickAdEvent) {
+                    TrackManager.getInstance().reportClickAdEvent()
+                }
+
+                LogUtil.d(TAG, "onADClick")
+                TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_RTA, Constant.EVENT_TYPE_TWO, "", "")
+                if (isClickScreen) {
+                    // 防止重复
+                    TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_RTA, Constant.EVENT_TYPE_FOUR, "", "")
+                    isClickScreen = false
+                }
+                videoAdStatusListener?.adDownload()
+            }
+
+            override fun onVideoPlayComplete() {
+                LogUtil.d(TAG, "onVideoPlayComplete -> ")
+
+            }
+
+            override fun onAdClosed() {
+                LogUtil.d(TAG, "onAdClosed -> ")
+
+                TrackManager.getInstance().reportAddCoinMsg(activity, getAdMapVO(carrierType, Constant.AD_SOURCE_RTA, extraId, curCoin))
+
+                TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_RTA, Constant.EVENT_TYPE_THREE, "", "")
+
+                videoAdStatusListener?.adSuccess()
+
+            }
+        })
+
+        manageVideoAd?.loadAD()
+    }
+
+    fun setVideoAdStatusListener(videoAdStatusListener: VideoAdStatusListener?) {
+        this.videoAdStatusListener = videoAdStatusListener
+    }
+
+    override fun onDestroy() {
+        manageVideoAd?.setVideoRewardListener(null)
+        manageVideoAd = null
+        activity = null
+    }
+}
\ No newline at end of file

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

@@ -5,7 +5,7 @@ import android.text.TextUtils
 import androidx.annotation.Nullable
 import com.mints.goodmoney.BuildConfig
 import com.mints.goodmoney.ad.video.base.BaseVideoAd
-import com.mints.goodmoney.ad.video.base.VedioAdStatusListener
+import com.mints.goodmoney.ad.video.base.VideoAdStatusListener
 import com.mints.goodmoney.common.AppConfig
 import com.mints.goodmoney.common.Constant
 import com.mints.goodmoney.manager.TrackManager
@@ -32,7 +32,7 @@ class ShVideoAdManager private constructor(activity: Activity) :
     private var isClickScreen: Boolean = true
     private var activity: Activity? = null
 
-    private var vedioAdStatusListener: VedioAdStatusListener? = null
+    private var videoAdStatusListener: VideoAdStatusListener? = null
     private lateinit var ps: AppPreferences
 
     companion object {
@@ -106,7 +106,7 @@ class ShVideoAdManager private constructor(activity: Activity) :
 
                         TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_SH, Constant.EVENT_TYPE_ONE, (adError.code).toString(), "")
 
-                        vedioAdStatusListener?.adFail()
+                        videoAdStatusListener?.adFail()
                     }
 
                     override fun onAdShow(@Nullable ad: CoralAD?): Boolean {
@@ -128,7 +128,7 @@ class ShVideoAdManager private constructor(activity: Activity) :
                             TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_SH, Constant.EVENT_TYPE_FOUR, "", "")
                             isClickScreen = false
                         }
-                        vedioAdStatusListener?.adDownload()
+                        videoAdStatusListener?.adDownload()
 
                         return super.onAdClicked(ad)
                     }
@@ -167,7 +167,7 @@ class ShVideoAdManager private constructor(activity: Activity) :
                         LogUtil.d(TAG, "onVideoClosed")
                         TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_SH, Constant.EVENT_TYPE_THREE, "", "")
 
-                        vedioAdStatusListener?.adSuccess()
+                        videoAdStatusListener?.adSuccess()
 
                         return super.onVideoClosed(coralAD, s)
                     }
@@ -175,8 +175,8 @@ class ShVideoAdManager private constructor(activity: Activity) :
 
     }
 
-    fun setVedioAdStatusListener(vedioAdStatusListener: VedioAdStatusListener?) {
-        this.vedioAdStatusListener = vedioAdStatusListener
+    fun setVideoAdStatusListener(videoAdStatusListener: VideoAdStatusListener?) {
+        this.videoAdStatusListener = videoAdStatusListener
     }
 
     override fun onDestroy() {

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

@@ -2,7 +2,7 @@ package com.mints.goodmoney.ad.video
 
 import android.app.Activity
 import com.mints.goodmoney.ad.video.base.BaseVideoAd
-import com.mints.goodmoney.ad.video.base.VedioAdStatusListener
+import com.mints.goodmoney.ad.video.base.VideoAdStatusListener
 import com.mints.goodmoney.common.AppConfig
 import com.mints.goodmoney.common.Constant
 import com.mints.goodmoney.manager.TrackManager
@@ -18,7 +18,7 @@ private val TAG = WnVideoAdManager::class.java.simpleName
 class WnVideoAdManager private constructor(activity: Activity) :
         BaseVideoAd() {
 
-    private var vedioAdStatusListener: VedioAdStatusListener? = null
+    private var videoAdStatusListener: VideoAdStatusListener? = null
     private var mRewardVideoAd: WNRewardVideoAd? = null
 
     private var isClickScreen: Boolean = true
@@ -66,7 +66,7 @@ class WnVideoAdManager private constructor(activity: Activity) :
 
                 TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_SDHZ, Constant.EVENT_TYPE_ONE, (code).toString(), message)
 
-                vedioAdStatusListener?.adFail()
+                videoAdStatusListener?.adFail()
             }
 
             override fun onLoad(ad: WNRewardVideoAd) {
@@ -87,7 +87,7 @@ class WnVideoAdManager private constructor(activity: Activity) :
                             TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_SDHZ, Constant.EVENT_TYPE_FOUR, "", "")
                             isClickScreen = false
                         }
-                        vedioAdStatusListener?.adDownload()
+                        videoAdStatusListener?.adDownload()
                     }
 
                     override fun onAdClose() {
@@ -95,7 +95,7 @@ class WnVideoAdManager private constructor(activity: Activity) :
 
                         TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_SDHZ, Constant.EVENT_TYPE_THREE, "", "")
 
-                        vedioAdStatusListener?.adSuccess()
+                        videoAdStatusListener?.adSuccess()
                     }
 
                     override fun onVideoComplete() {
@@ -120,8 +120,8 @@ class WnVideoAdManager private constructor(activity: Activity) :
         })
     }
 
-    fun setVedioAdStatusListener(vedioAdStatusListener: VedioAdStatusListener?) {
-        this.vedioAdStatusListener = vedioAdStatusListener
+    fun setVideoAdStatusListener(videoAdStatusListener: VideoAdStatusListener?) {
+        this.videoAdStatusListener = videoAdStatusListener
     }
 
     override fun onDestroy() {

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

@@ -4,7 +4,7 @@ import android.app.Activity;
 import android.os.SystemClock;
 
 import com.mints.goodmoney.ad.video.base.BaseVideoAd;
-import com.mints.goodmoney.ad.video.base.VedioAdStatusListener;
+import com.mints.goodmoney.ad.video.base.VideoAdStatusListener;
 import com.mints.goodmoney.common.AppConfig;
 import com.mints.goodmoney.common.Constant;
 import com.mints.goodmoney.manager.TrackManager;
@@ -14,8 +14,6 @@ import com.qq.e.ads.rewardvideo.RewardVideoAD;
 import com.qq.e.ads.rewardvideo.RewardVideoADListener;
 import com.qq.e.comm.util.AdError;
 
-import java.lang.ref.WeakReference;
-
 /**
  * 优量汇视频
  */
@@ -26,32 +24,21 @@ public class YlhVideoAdManager extends BaseVideoAd {
     // 优量汇激励视频
     private RewardVideoAD rewardVideoAD;
 
-    private VedioAdStatusListener vedioAdStatusListener;
-
-    private Activity activity;
+    private VideoAdStatusListener videoAdStatusListener;
 
     private boolean isClickScreen = true; // 是否点击屏幕跳转广告
 
-    public static YlhVideoAdManager getInstance(Activity activity) {
+    public static YlhVideoAdManager getInstance() {
         if (_inst != null) {
             return _inst;
         } else {
-            _inst = new YlhVideoAdManager(activity);
+            _inst = new YlhVideoAdManager();
             return _inst;
         }
     }
 
-    private YlhVideoAdManager(Activity activity) {
-        init(activity);
-    }
-
-    private void init(Activity activity) {
-        this.activity = activity;
-    }
-
     @Override
     public void onDestroy() {
-        activity = null;
         rewardVideoAD = null;
     }
 
@@ -60,7 +47,6 @@ public class YlhVideoAdManager extends BaseVideoAd {
      */
     @Override
     public void loadAd(Activity activity, int curCoin, String carrierType, String extraId) {
-        this.activity = activity;
         isClickScreen = true;
 
         String ylhPostId;
@@ -151,8 +137,8 @@ public class YlhVideoAdManager extends BaseVideoAd {
                     e.printStackTrace();
                     TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_YLH, Constant.EVENT_TYPE_ONE, "999999", "Load Fail");
 
-                    if (vedioAdStatusListener != null) {
-                        vedioAdStatusListener.adFail();
+                    if (videoAdStatusListener != null) {
+                        videoAdStatusListener.adFail();
                     }
                 }
             }
@@ -193,8 +179,8 @@ public class YlhVideoAdManager extends BaseVideoAd {
                     TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_YLH, Constant.EVENT_TYPE_FOUR, "", "");
                     isClickScreen = false;
                 }
-                if (vedioAdStatusListener != null) {
-                    vedioAdStatusListener.adDownload();
+                if (videoAdStatusListener != null) {
+                    videoAdStatusListener.adDownload();
                 }
             }
 
@@ -209,8 +195,8 @@ public class YlhVideoAdManager extends BaseVideoAd {
 
                 TrackManager.getInstance().reportAddCoinMsg(activity, getAdMapVO(carrierType, Constant.AD_SOURCE_YLH, extraId, curCoin));
 
-                if (vedioAdStatusListener != null) {
-                    vedioAdStatusListener.adSuccess();
+                if (videoAdStatusListener != null) {
+                    videoAdStatusListener.adSuccess();
                 }
             }
 
@@ -223,8 +209,8 @@ public class YlhVideoAdManager extends BaseVideoAd {
                     // 0 成功 1失败 2点击 3-有效展示
                     TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_YLH, Constant.EVENT_TYPE_ONE, String.valueOf(adError.getErrorCode()), adError.getErrorMsg());
                 }
-                if (vedioAdStatusListener != null) {
-                    vedioAdStatusListener.adFail();
+                if (videoAdStatusListener != null) {
+                    videoAdStatusListener.adFail();
                 }
             }
         });
@@ -232,7 +218,7 @@ public class YlhVideoAdManager extends BaseVideoAd {
         rewardVideoAD.loadAD();
     }
 
-    public void setVedioAdStatusListener(VedioAdStatusListener vedioAdStatusListener) {
-        this.vedioAdStatusListener = vedioAdStatusListener;
+    public void setVideoAdStatusListener(VideoAdStatusListener videoAdStatusListener) {
+        this.videoAdStatusListener = videoAdStatusListener;
     }
 }

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

@@ -3,7 +3,7 @@ package com.mints.goodmoney.ad.video.base
 /**
  * 广告状态触发事件
  */
-interface VedioAdStatusListener {
+interface VideoAdStatusListener {
     /**
      * 广告加载失败
      */

GoodMoney/app/src/main/java/com/mints/goodmoney/common/AppConfig.java

@@ -97,6 +97,10 @@ public class AppConfig {
      * ksVideo 剩余广告播放数
      */
     public static int ksVideoAdCount = 5;
+    /**
+     * rtaVideo 剩余广告播放数
+     */
+    public static int rtaVideoAdCount = 5;
 
     /**
      * 高额试玩任务标识

GoodMoney/app/src/main/java/com/mints/goodmoney/common/Constant.kt

@@ -148,6 +148,7 @@ object Constant {
     const val AD_SOURCE_CSJFULL = "CSJFULL"
     const val AD_SOURCE_SH = "CORAL" //珊瑚天卓
     const val AD_SOURCE_KS = "KS" //快手
+    const val AD_SOURCE_RTA = "RTA" //RTA
 
     // 调用事件 0 成功 1失败 2点击 3-有效展示 4-去重
     const val EVENT_TYPE_ZERO = "0"
@@ -169,6 +170,7 @@ object Constant {
     const val CSJ_FULL_AD = "CSJFULL_VEDIO_AD"
     const val SH_VEDIO_AD = "SH_VEDIO_AD"
     const val KS_VEDIO_AD = "KS_VEDIO_AD"
+    const val RTA_VEDIO_AD = "RTA_VEDIO_AD"
 
     // 信息流广告类型
     const val CSJ_EXPRESS_AD = "CSJ_EXPRESS_AD"

GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/model/DrawcashBean.java

@@ -87,6 +87,15 @@ public class DrawcashBean implements Serializable {
         private int FL_VEDIO;
         private int CORAL_VEDIO;
         private int KS_VEDIO;
+        private int RTA_VEDIO;
+
+        public int getRTA_VEDIO() {
+            return RTA_VEDIO;
+        }
+
+        public void setRTA_VEDIO(int RTA_VEDIO) {
+            this.RTA_VEDIO = RTA_VEDIO;
+        }
 
         public int getCORAL_VEDIO() {
             return CORAL_VEDIO;

GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/model/VedioRulesBean.java

@@ -11,6 +11,7 @@ public class VedioRulesBean implements Serializable {
     private CsjfullVedioBean CSJFULL_VEDIO;
     private CORALVedioBean CORAL_VEDIO;
     private KSVedioBean KS_VEDIO;
+    private RTAVedioBean RTA_VEDIO;
     private boolean flVideoFlag;
 
     public class CsjVedioBean implements Serializable {
@@ -91,6 +92,19 @@ public class VedioRulesBean implements Serializable {
         }
     }
 
+    public class RTAVedioBean implements Serializable {
+        private int surplus;
+        private int rate;
+
+        public int getSurplus() {
+            return surplus;
+        }
+
+        public int getRate() {
+            return rate;
+        }
+    }
+
     public class CsjfullVedioBean implements Serializable {
         private int surplus;
         private int rate;
@@ -125,6 +139,14 @@ public class VedioRulesBean implements Serializable {
         return CORAL_VEDIO;
     }
 
+    public RTAVedioBean getRTA_VEDIO() {
+        return RTA_VEDIO;
+    }
+
+    public void setRTA_VEDIO(RTAVedioBean RTA_VEDIO) {
+        this.RTA_VEDIO = RTA_VEDIO;
+    }
+
     public KSVedioBean getKS_VEDIO() {
         return KS_VEDIO;
     }

GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/presenters/VersionUpdatePresenter.java

@@ -8,7 +8,9 @@ import android.content.Intent;
 import android.content.ServiceConnection;
 import android.net.Uri;
 import android.os.IBinder;
+
 import androidx.appcompat.app.AlertDialog;
+
 import android.text.TextUtils;
 import android.text.method.ScrollingMovementMethod;
 import android.view.KeyEvent;
@@ -56,6 +58,7 @@ public class VersionUpdatePresenter {
     Button btnDuUpdate;
     private Subscription subscription;
 
+    private UpdateService mUpdateService;
 
     public void updateVersion(Activity activity) {
         if (activity == null)
@@ -210,6 +213,16 @@ public class VersionUpdatePresenter {
             btnDuUpdate.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
+                    if (TextUtils.equals(btnDuUpdate.getText(), "立即安装")) {
+                        if (mUpdateService != null) {
+                            mUpdateService.autoInstallApk();
+                        } else {
+                            ToastUtil.show(loanApplication.getApplicationContext(), "安装失败！");
+                            System.exit(0);
+                        }
+                        return;
+                    }
+
                     boolean url = CommonUtils.isUrl(appFileUrl);
                     if (url) {
                         updateApp(appFileUrl, granted);
@@ -254,12 +267,13 @@ public class VersionUpdatePresenter {
         public void onServiceConnected(ComponentName name, IBinder service) {
 
 //            //返回一个MsgService对象  
-            UpdateService updateService = ((UpdateService.UpdateBinder) service).getService();
+            mUpdateService = ((UpdateService.UpdateBinder) service).getService();
 //
 //            //注册回调接口来接收下载进度的变化  
-            updateService.setUpdateNotification(new UpdateService.UpdateNotification() {
+            mUpdateService.setUpdateNotification(new UpdateService.UpdateNotification() {
                 @Override
                 public void updateProgress(int progress) {
+
                     if (pbDuUpdating != null) {
                         pbDuUpdating.setProgress(progress);
                         if (btnDuUpdate != null && progress == 100) {
@@ -270,7 +284,13 @@ public class VersionUpdatePresenter {
 
                 @Override
                 public void finishProgress() {
-
+                    if (pbDuUpdating != null) {
+                        pbDuUpdating.setProgress(100);
+                    }
+                    if (btnDuUpdate != null) {
+                        btnDuUpdate.setEnabled(true);
+                        btnDuUpdate.setText("立即安装");
+                    }
                 }
             });
 
@@ -311,6 +331,7 @@ public class VersionUpdatePresenter {
     }
 
     public void dispose() {
+        mUpdateService = null;
         loanService = null;
         activity = null;
         loanApplication = null;

GoodMoney/app/src/main/java/com/mints/goodmoney/service/UpdateService.java

@@ -12,13 +12,17 @@ import android.os.Build;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
+
 import androidx.core.app.NotificationCompat;
 import androidx.core.content.FileProvider;
+
 import android.widget.RemoteViews;
 
+import com.mints.goodmoney.MintsApplication;
 import com.mints.goodmoney.R;
 import com.mints.goodmoney.common.Constant;
 import com.mints.goodmoney.ui.activitys.MainActivity;
+import com.mints.goodmoney.utils.ToastUtil;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -202,6 +206,18 @@ public class UpdateService extends Service {
         }).start();
     }
 
+    /**
+     * 安装 apk 文件
+     */
+    public void autoInstallApk() {
+        if (updateFile != null) {
+            autoInstallApk(updateFile);
+        } else {
+            ToastUtil.show(MintsApplication.getContext(), "安装失败！");
+            System.exit(0);
+        }
+    }
+
     /**
      * 安装 apk 文件
      */
@@ -210,7 +226,7 @@ public class UpdateService extends Service {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
             intent.setDataAndType(Uri.fromFile(file), "application/vnd.android.package-archive");
         } else {//Android7.0之后获取uri要用contentProvider
-            Uri contentUri = FileProvider.getUriForFile(getApplicationContext(), Constant.MINTS_PKG_NAME+".fileprovider", file);
+            Uri contentUri = FileProvider.getUriForFile(getApplicationContext(), Constant.MINTS_PKG_NAME + ".fileprovider", file);
             intent.setDataAndType(contentUri, "application/vnd.android.package-archive");
             intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
         }

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

@@ -400,7 +400,7 @@ class AwardActivity : BaseActivity(), AwardView, View.OnClickListener {
 
         flAwardAd?.removeAllViews()
         videoAdingManager.setVideoAdingListener(null)
-        videoAdingManager.onDestory()
+        videoAdingManager.onDestroy()
 
         awardPresenter.detachView()
 

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

@@ -35,7 +35,6 @@ import com.mints.goodmoney.mvp.views.KylVideoView
 import com.mints.goodmoney.ui.activitys.base.BaseActivity
 import com.mints.goodmoney.ui.adapter.DrawVideoAdapter
 import com.mints.goodmoney.utils.MD5
-import com.mints.goodmoney.utils.ToastUtil
 import com.tbruyelle.rxpermissions.RxPermissions
 import kotlinx.android.synthetic.main.activity_draw_native_video.*
 
@@ -74,9 +73,6 @@ class DrawNativeVideoActivity : BaseActivity(),
         const val WEB_VIDEO_URL = "https://vring.kuyin123.com/friend/94aa83142f7f5c98?videoId="
     }
 
-    // Video 视频播放生命周期控制
-    private var isVideoPlayPause = false
-
     // 列表页面播放page
     private var mCurrentPage = 0
 
@@ -309,7 +305,7 @@ class DrawNativeVideoActivity : BaseActivity(),
     override fun onDestroy() {
         mCsjDrawAdManager?.onDestroy()
         videoAdingManager.setVideoAdingListener(null)
-        videoAdingManager.onDestory()
+        videoAdingManager.onDestroy()
 
         super.onDestroy()
 

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

@@ -27,7 +27,6 @@ import com.mints.library.utils.CommonUtils
 import com.mints.library.utils.json.JsonUtil
 import com.mints.library.utils.nodoubleclick.AntiShake
 import kotlinx.android.synthetic.main.activity_drawcash.*
-import kotlinx.android.synthetic.main.fragment_main_my.*
 import kotlinx.android.synthetic.main.header_layout.*
 import kotlinx.android.synthetic.main.view_title.*
 import java.math.BigDecimal
@@ -57,8 +56,8 @@ class DrawcashActivity : BaseActivity(),
     private var isLoadRvItem: Boolean = true //是否首次加载rv item
 
     //    private var isJDNewUser = false
-//    private var jumpJdUrl: String? = null
-//    private var jdTintDialog: JDTintDialog? = null
+    //    private var jumpJdUrl: String? = null
+    //    private var jdTintDialog: JDTintDialog? = null
 
     override fun getContentViewLayoutID() = R.layout.activity_drawcash
 
@@ -306,7 +305,8 @@ class DrawcashActivity : BaseActivity(),
                 data.fL_VEDIO,
                 data.coraL_VEDIO,
                 data.csjfulL_VEDIO,
-                data.kS_VEDIO
+                data.kS_VEDIO,
+                data.rtA_VEDIO
         )
         LogUtil.d(TAG, "提现权重值：csjWeight:${data.csJ_VEDIO}    " +
                 "ylhWeight:${data.ylH_VEDIO}    " +
@@ -314,6 +314,7 @@ class DrawcashActivity : BaseActivity(),
                 "csjFullWeight:${data.csjfulL_VEDIO}    " +
                 "shWeight:${data.coraL_VEDIO}    " +
                 "flWeight:${data.fL_VEDIO}    " +
+                "rtaWeight:${data.rtA_VEDIO}    " +
                 "ksWeight:${data.kS_VEDIO}"
         )
         // 广告视频数
@@ -324,6 +325,7 @@ class DrawcashActivity : BaseActivity(),
         AppConfig.shVideoAdCount = 10
         AppConfig.csjFullVideoAdCount = 10
         AppConfig.ksVideoAdCount = 10
+        AppConfig.rtaVideoAdCount = 10
     }
 
     /**

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

@@ -20,7 +20,7 @@ import java.util.*
 class GuideActivity : BaseActivity() {
 
     private val animatorSet by lazy { AnimatorSet() }
-    private var mImageViews = ArrayList<ImageView>()
+    private var mImageViews = ArrayList<View>()
     private val guideImgs = intArrayOf(R.mipmap.bg_guide1, R.mipmap.bg_guide2, R.mipmap.bg_guide3, R.mipmap.bg_guide4)
 
     override fun getContentViewLayoutID() = R.layout.activity_guide

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

@@ -100,7 +100,7 @@ class KylVideoActivity : BaseActivity(), View.OnClickListener, KylVideoView {
             PRDownloader.cancel(downloadId)
         }
         videoAdingManager.setVideoAdingListener(null)
-        videoAdingManager.onDestory()
+        videoAdingManager.onDestroy()
         kylVideoPresenter.detachView()
     }
 

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

@@ -96,7 +96,7 @@ class MainActivity : BaseActivity(), MainView, View.OnClickListener {
 
         TTPreLoadCarrierExpressManager.getInstance().onDestroy()
         VideoAdingManager.getInstance(this).setVideoAdingListener(null)
-        VideoAdingManager.getInstance(this).onDestory()
+        VideoAdingManager.getInstance(this).onDestroy()
     }
 
     public override fun onSaveInstanceState(outState: Bundle) {

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

@@ -74,7 +74,7 @@ class WrapperActivity : BaseActivity(), View.OnClickListener {
             }
         }
 
-        if (!currentFragment!!.isAdded) {
+        if (!currentFragment.isAdded) {
             // 提交事务
             supportFragmentManager.beginTransaction()
                     .add(R.id.flWrapper, currentFragment).commitAllowingStateLoss()

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/adapter/GvMyAdapter.java

@@ -3,7 +3,6 @@ package com.mints.goodmoney.ui.adapter;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.content.Context;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -18,7 +17,6 @@ import com.mints.goodmoney.common.Constant;
 import com.mints.goodmoney.manager.BxmManager;
 import com.mints.goodmoney.manager.UserManager;
 import com.mints.goodmoney.mvp.model.BannerBean;
-import com.mints.goodmoney.utils.ForegroundOrBackground;
 import com.mints.library.utils.GlideUtils;
 
 import java.util.List;
@@ -32,28 +30,35 @@ import java.util.List;
 public class GvMyAdapter extends BaseAdapter {
 
     private List<BannerBean.ListBean> orders;
-    private Context context;
     private Activity activity;
 
-    public GvMyAdapter(Context context, Activity activity, List<BannerBean.ListBean> orders) {
+    private int mCurrentIndex;
+    private int mPageSize;
+
+    public GvMyAdapter(Activity activity, List<BannerBean.ListBean> orders, int currentIndex, int pageSize) {
         this.orders = orders;
-        this.context = context;
         this.activity = activity;
+        this.mCurrentIndex = currentIndex;
+        this.mPageSize = pageSize;
     }
 
     @Override
     public int getCount() {
-        return orders == null ? 0 : orders.size();
+//        return orders == null ? 0 : orders.size();
+        return orders.size() > (mCurrentIndex + 1) * mPageSize ? mPageSize : (orders.size() - mCurrentIndex * mPageSize);
+
     }
 
     @Override
     public Object getItem(int position) {
-        return orders.get(position);
+//        return orders.get(position);
+        return orders.get(position + mCurrentIndex * mPageSize);
     }
 
     @Override
     public long getItemId(int position) {
-        return position;
+//        return position;
+        return position + mCurrentIndex * mPageSize;
     }
 
     @SuppressLint("WrongViewCast")
@@ -63,7 +68,7 @@ public class GvMyAdapter extends BaseAdapter {
         ViewHolder viewHolder;
 
         if (convertView == null) {
-            LayoutInflater inflater = LayoutInflater.from(context);
+            LayoutInflater inflater = LayoutInflater.from(activity);
             convertView = inflater.inflate(R.layout.item_list_my, null);
             viewHolder = new ViewHolder();
 
@@ -75,9 +80,15 @@ public class GvMyAdapter extends BaseAdapter {
         } else {
             viewHolder = (ViewHolder) convertView.getTag();
         }
-        BannerBean.ListBean data = orders.get(position);
+
+        /**
+         * 在给View绑定显示的数据时，计算正确的position = position + curIndex * pageSize
+         */
+        int pos = position + mCurrentIndex * mPageSize;
+
+        BannerBean.ListBean data = orders.get(pos);
         if (data != null) {
-            GlideUtils.loadImageView(context, data.getImgUrl(), viewHolder.ic_my_icon);
+            GlideUtils.loadImageView(activity, data.getImgUrl(), viewHolder.ic_my_icon);
             viewHolder.tv_my_title.setText(data.getTitle());
 
             if (TextUtils.equals(data.getToUrl(), Constant.HOT_ACTIVITY_BXM) && UserManager.getInstance().userIsLogin()) {

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/adapter/TaskAdapter.kt

@@ -9,6 +9,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.mints.goodmoney.BuildConfig
+import com.mints.goodmoney.MintsApplication
 import com.mints.goodmoney.R
 import com.mints.goodmoney.mvp.model.TzTaskBean
 import com.mints.goodmoney.ui.adapter.listener.OnItemChildClickListener
@@ -39,8 +40,8 @@ class TaskAdapter(val dataList: List<TzTaskBean>, val context: Context) : Recycl
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         if (viewType == HOLDER_TYPE_SH_CPD) {
             // AdContainer 可能引起内存泄漏
-            val weakReference = WeakReference<Context>(context)
-            val view = LayoutInflater.from(weakReference.get()).inflate(R.layout.item_task_recy, parent, false)
+//            val weakReference = WeakReference<Context>(context)
+            val view = LayoutInflater.from(MintsApplication.getContext()).inflate(R.layout.item_task_recy, parent, false)
             return SHViewHolder(view)
         }
 

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/adapter/ViewPagerAdapter.java

 package com.mints.goodmoney.ui.adapter;
 
 import androidx.viewpager.widget.PagerAdapter;
+
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -15,16 +16,16 @@ import java.util.List;
  */
 public class ViewPagerAdapter extends PagerAdapter {
 
-    private List<ImageView> mImageViews;
+    private List<View> mViews;
 
-    public ViewPagerAdapter(List<ImageView> mImageViews) {
-        this.mImageViews = mImageViews;
+    public ViewPagerAdapter(List<View> views) {
+        this.mViews = views;
     }
 
     //设置viewpager条目的个数
     @Override
     public int getCount() {
-        return mImageViews.size();
+        return mViews.size();
     }
 
     //判断Viewpager的页面的view对象是否和instantiateItem返回的object一致
@@ -36,8 +37,8 @@ public class ViewPagerAdapter extends PagerAdapter {
     //添加viewpager条目的方法
     @Override
     public Object instantiateItem(ViewGroup container, int position) {
-        ImageView imageView = mImageViews.get(position);
-        //将imageview添加给viewpager
+        View imageView = mViews.get(position);
+        //将view添加给viewpager
         container.addView(imageView);
         return imageView;
     }

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

@@ -261,7 +261,6 @@ class MainFragment : BaseFragment(), HomeView, View.OnClickListener {
     }
 
 
-
     override fun getHomeVedioMsgSuc(data: MainVideoMsgBean) {
         if (activity == null || requireActivity().isFinishing) {
             return
@@ -577,7 +576,8 @@ class MainFragment : BaseFragment(), HomeView, View.OnClickListener {
                 data.vedioRules.fL_VEDIO.rate,
                 data.vedioRules.corAl_VIDEO.rate,
                 data.vedioRules.csjfulL_VEDIO.rate,
-                data.vedioRules.kS_VEDIO.rate
+                data.vedioRules.kS_VEDIO.rate,
+                data.vedioRules.rtA_VEDIO.rate
         )
         LogUtil.d(TAG, "首页权重值：csjWeight:${data.vedioRules.csJ_VEDIO.rate}    " +
                 "ylhWeight:${data.vedioRules.ylH_VEDIO.rate}    " +
@@ -585,6 +585,7 @@ class MainFragment : BaseFragment(), HomeView, View.OnClickListener {
                 "csjFullWeight:${data.vedioRules.csjfulL_VEDIO.rate}    " +
                 "shWeight:${data.vedioRules.corAl_VIDEO.rate}    " +
                 "flWeight:${data.vedioRules.fL_VEDIO.rate}    " +
+                "rtaWeight:${data.vedioRules.rtA_VEDIO.rate}    " +
                 "ksWeight:${data.vedioRules.kS_VEDIO.rate}"
         )
         // 广告视频数
@@ -595,18 +596,20 @@ class MainFragment : BaseFragment(), HomeView, View.OnClickListener {
         AppConfig.csjFullVideoAdCount = data.vedioRules.csjfulL_VEDIO.surplus
         AppConfig.shVideoAdCount = data.vedioRules.corAl_VIDEO.surplus
         AppConfig.ksVideoAdCount = data.vedioRules.kS_VEDIO.surplus
+        AppConfig.rtaVideoAdCount = data.vedioRules.rtA_VEDIO.surplus
         LogUtil.d(TAG, "首页视频数：csjCount:${AppConfig.csjVideoAdCount}    " +
                 "ylhCount:${AppConfig.ylhAdCount}    " +
                 "sdhzCount:${AppConfig.wnVideoAdCount}    " +
                 "csjFullCount:${AppConfig.csjFullVideoAdCount}    " +
                 "shCount:${AppConfig.shVideoAdCount}    " +
-                "flCount:${AppConfig.flVideoAdCount}" +
+                "flCount:${AppConfig.flVideoAdCount}    " +
+                "ratCount:${AppConfig.rtaVideoAdCount}    " +
                 "ksCount:${AppConfig.ksVideoAdCount}"
         )
     }
 
     private fun initExpress(flowAdRules: FlowAdRulesBean) {
-        PreLoadExpressManager.init(flowAdRules.csj,flowAdRules.ylh,flowAdRules.ks)
+        PreLoadExpressManager.init(flowAdRules.csj, flowAdRules.ylh, flowAdRules.ks)
     }
 
     /**

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

@@ -81,7 +81,7 @@ class TaskCpdFragment : BaseFragment(), TaskView,
     @Volatile
     private var shLoadCountTime = 0 // 珊瑚 加载广告次数
 
-    //    @Volatile
+    @Volatile
     private var cpdLoadCountTime = 0 // CPD 加载广告次数
 
     override fun initViewsAndEvents() {
@@ -205,23 +205,23 @@ class TaskCpdFragment : BaseFragment(), TaskView,
         }
     }
 
+//    private fun loadCPDDataCycle() {
+//        // 循环拉取圣于地CPD广告拉取
+//        for (i in cpdLoadCountTime until cpdMax) {
+//            loadCPDData()
+//        }
+//    }
+
+//    private fun loadCPDData() {
+//        LogUtil.d(TAG, "syd loadCPDData")
+//        taskPresenter.getCpdDetail(outNetIp)
+//    }
+
     private fun loadCPDDataList() {
         // 圣于地CPD广告拉取
-        for (i in cpdLoadCountTime until cpdMax) {
-            loadCPDData()
-        }
+        taskPresenter.getCpdListDetail(outNetIp, cpdMax)
     }
 
-    private fun loadCPDData() {
-        LogUtil.d(TAG, "syd loadCPDData")
-        taskPresenter.getCpdDetail(outNetIp)
-    }
-
-//    private fun loadCPDDataList() {
-//        // 圣于地CPD广告拉取
-//        taskPresenter.getCpdListDetail(outNetIp, cpdMax)
-//    }
-
     override fun getCpdModelSuc(dataBean: CpdModelBean.DataBean) {
 
         for (material in dataBean.materials) {
@@ -244,10 +244,6 @@ class TaskCpdFragment : BaseFragment(), TaskView,
         // 圣于地广告 循环完成后去重
         if (cpdLoadCountTime++ >= cpdMax - 1) {
 
-            for (tzTaskBean in mFakeTaskList) {
-                LogUtil.d("AA -> " + tzTaskBean.title)
-            }
-
             getCpdRepeatPkg()
 
             if (shMax == 0 || shLoadCountTime >= shMax) {

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/WrapViewPager.java

+package com.mints.goodmoney.ui.widgets;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+
+import androidx.viewpager.widget.ViewPager;
+
+public class WrapViewPager extends ViewPager {
+
+    public WrapViewPager(Context context) {
+        super(context);
+    }
+
+    public WrapViewPager(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int height = 0;
+        for (int i = 0; i < getChildCount(); i++) {
+            View child = getChildAt(i);
+            child.measure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
+            int h = child.getMeasuredHeight();
+            if (h > height)
+                height = h;
+        }
+        heightMeasureSpec = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY);
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+    }
+}

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/dialog/DrawcashVideoDialog.kt

@@ -50,7 +50,7 @@ class DrawcashVideoDialog(activity: Activity) :
 
     fun onDestory(){
         videoAdingManager?.setVideoAdingListener(null)
-        videoAdingManager?.onDestory()
+        videoAdingManager?.onDestroy()
 
         activity = null
     }

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

@@ -10,7 +10,6 @@ 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.SplashKsADActivity;
 
 import java.lang.ref.WeakReference;
 
@@ -20,6 +19,8 @@ import java.lang.ref.WeakReference;
  */
 public class ForegroundOrBackground implements Application.ActivityLifecycleCallbacks {
 
+    public static final String TAG = ForegroundOrBackground.class.getSimpleName();
+
     private long leaveTime = 0;//应用切后台时间
 
     private static ForegroundOrBackground instance;
@@ -31,7 +32,7 @@ public class ForegroundOrBackground implements Application.ActivityLifecycleCall
     private VersionUpdatePresenter vup;
     private WeakReference<Activity> reference;
     private Intent ylhIntent;
-//    private Intent ksIntent;
+    //    private Intent ksIntent;
     private Intent csjIntent;
 
     public static ForegroundOrBackground init(Application application) {

GoodMoney/app/src/main/res/layout/fragment_main_dh.xml

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white"

GoodMoney/app/src/main/res/layout/fragment_main_my.xml

@@ -26,11 +26,6 @@
             android:layout_height="wrap_content"
             android:overScrollMode="never">
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
             <LinearLayout
                 android:id="@+id/llMyRoot"
                 android:layout_width="match_parent"
@@ -45,8 +40,9 @@
                     android:id="@+id/fl_my_banner"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                        android:layout_marginStart="10dp"
-                        android:layout_marginEnd="10dp"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginEnd="12dp"
+                    android:background="@drawable/shape_bg_award"
                     android:visibility="gone" />
 
                 <include layout="@layout/item_divider_gray" />
@@ -56,7 +52,6 @@
                 <include layout="@layout/item_divider_gray" />
 
                 <include layout="@layout/view_title" />
-                </LinearLayout>
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recy_my"

GoodMoney/app/src/main/res/layout/item_fragment_main_my_clock.xml

@@ -4,8 +4,8 @@
     android:id="@+id/ll_my_sign"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginStart="6dp"
-    android:layout_marginEnd="6dp"
+    android:layout_marginStart="10dp"
+    android:layout_marginEnd="10dp"
     android:background="@mipmap/bg_sign">
 
     <ImageView

GoodMoney/app/src/main/res/layout/item_fragment_main_my_promotions.xml

 <?xml version="1.0" encoding="utf-8"?>
-<com.mints.goodmoney.ui.widgets.ExpandableGridView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/item_promotions_egv"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:attrs="http://schemas.android.com/tools">
+
+    <com.mints.goodmoney.ui.widgets.WrapViewPager
+        android:id="@+id/vp_grid"
         android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <com.rd.PageIndicatorView
+        android:id="@+id/piv_grid"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-    android:visibility="gone"
-    android:layout_marginTop="2dp"
-    android:layout_marginBottom="16dp"
-    android:columnWidth="85dp"
-    android:divider="@null"
-    android:dividerHeight="10dp"
-    android:listSelector="@color/color_0000"
-    android:numColumns="4"
-    android:scrollbars="none"
-    android:stretchMode="spacingWidthUniform" />
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="5dp"
+        app:piv_count="2"
+        app:piv_dynamicCount="false"
+        app:piv_selectedColor="@color/color_FF9837"
+        app:piv_unselectedColor="@color/color_20000000"
+        app:piv_viewPager="@id/vp_grid"
+        attrs:piv_padding="0dp"
+        attrs:piv_radius="2dp" />
\ No newline at end of file
+</merge>

GoodMoney/app/src/main/res/layout/item_fragment_main_my_promotions_gv.xml

+<?xml version="1.0" encoding="utf-8"?>
+<com.mints.goodmoney.ui.widgets.ExpandableGridView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/item_promotions_egv"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="2dp"
+    android:layout_marginBottom="16dp"
+    android:columnWidth="85dp"
+    android:divider="@null"
+    android:dividerHeight="10dp"
+    android:listSelector="@color/color_0000"
+    android:numColumns="4"
+    android:scrollbars="none"
+    android:stretchMode="spacingWidthUniform" />
+

GoodMoney/app/src/main/res/layout/item_fragment_main_my_task.xml

@@ -39,7 +39,7 @@
         android:layout_width="260dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="5dp"
-        android:textColor="@color/color_ccc"
+        android:textColor="@color/color_AAA"
         android:textSize="15sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/item_task_title" />