添加高额 提现gromore权重

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

@@ -272,6 +272,13 @@ public class VideoAdingManager {
             LogUtil.d(TAG, "高额任务 -> 权重值：ksVideoWeight:" + AppConfig.ksHighVideoAdCount);
         }
 
+        // gromore
+        if (AppConfig.groHighVideoAdCount > 0) {
+            weightList.add(new WeightBean(AppConfig.groHighVideoAdCount, Constant.GROMORE_VEDIO_AD));
+            weight = weight + AppConfig.groHighVideoAdCount;
+            LogUtil.d(TAG, "高额任务 -> 权重值：groVideoWeight:" + AppConfig.groHighVideoAdCount);
+        }
+
         // 权重随机
         if (weightList != null && weightList.size() > 0 && weight > 0) {
             LogUtil.d(TAG, "高额任务 -> 1、权重总值：" + weight);

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

@@ -124,6 +124,11 @@ public class AppConfig {
      */
     public static int ksHighVideoAdCount = 0;
 
+    /**
+     * 高额任务和超级翻倍 groVideo 剩余广告播放数
+     */
+    public static int groHighVideoAdCount = 0;
+
     /**
      * 高额试玩任务标识
      */

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

@@ -149,6 +149,7 @@ public class UserTaskMsgBean implements Serializable {
         private int YLH;
         private int KS;
         private int CSJ;
+        private int GROMORE;
 
         public int getYLH() {
             return YLH;
@@ -161,5 +162,9 @@ public class UserTaskMsgBean implements Serializable {
         public int getCSJ() {
             return CSJ;
         }
+
+        public int getGROMORE() {
+            return GROMORE;
+        }
     }
 }

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

@@ -5,6 +5,7 @@ import android.util.Log;
 import android.view.KeyEvent;
 import android.widget.FrameLayout;
 
+import com.bytedance.msdk.adapter.gdt.GdtNetworkRequestInfo;
 import com.bytedance.msdk.adapter.pangle.PangleNetworkRequestInfo;
 import com.bytedance.msdk.api.AdError;
 import com.bytedance.msdk.api.AdSlot;
@@ -21,6 +22,7 @@ import com.mints.goodmoney.manager.CsjGroMoreManager;
 import com.mints.goodmoney.manager.TrackManager;
 import com.mints.goodmoney.manager.TtCsjAdManager;
 import com.mints.goodmoney.manager.UserManager;
+import com.mints.goodmoney.manager.YlhAdManager;
 import com.mints.goodmoney.ui.activitys.base.BaseActivity;
 import com.mints.goodmoney.utils.LogUtil;
 import com.mints.library.utils.CommonUtils;
@@ -93,9 +95,9 @@ public class SplashGroMoreActivity extends BaseActivity {
         //自定义兜底方案 选择使用
         TTNetworkRequestInfo ttNetworkRequestInfo;
         //穿山甲兜底
-        ttNetworkRequestInfo = new PangleNetworkRequestInfo(TtCsjAdManager.TT_AD_APPID, "887483103");
+//        ttNetworkRequestInfo = new PangleNetworkRequestInfo(TtCsjAdManager.TT_AD_APPID, "887483103");
         //gdt兜底
-//        ttNetworkRequestInfo = new GdtNetworkRequestInfo("1101152570", "8863364436303842593");
+        ttNetworkRequestInfo = new GdtNetworkRequestInfo(YlhAdManager.YLH_AD_APPID, "2001697222975737");
         //ks兜底
 //        ttNetworkRequestInfo = new KsNetworkRequestInfo("90009", "4000000042");
         //百度兜底

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

@@ -230,6 +230,14 @@ class MainFragment : BaseFragment(), HomeView, View.OnClickListener {
             AppConfig.wzReadCoin = userMsgBean!!.shareNews.readCoin
         }
 
+        // 高额任务及超级翻倍次数
+        if (data.highRatePlan != null) {
+            AppConfig.csjHighVideoAdCount = data.highRatePlan.csj
+            AppConfig.ylhHighVideoAdCount = data.highRatePlan.ylh
+            AppConfig.ksHighVideoAdCount = data.highRatePlan.ks
+            AppConfig.groHighVideoAdCount = data.highRatePlan.gromore
+        }
+
         // 保存Ip,用于穿山甲回调校验
         ps.put(Constant.CSJ_VEDIO_APPIP, data.ip)
         AppConfig.app_black_name = data.userRiskApps.userRiskAppName

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

@@ -337,6 +337,7 @@ class MyFragment : BaseFragment(),
             AppConfig.csjHighVideoAdCount = data.highRatePlan.csj
             AppConfig.ylhHighVideoAdCount = data.highRatePlan.ylh
             AppConfig.ksHighVideoAdCount = data.highRatePlan.ks
+            AppConfig.groHighVideoAdCount = data.highRatePlan.gromore
         }
 
         if (data.shareNews != null) {

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

@@ -108,30 +108,30 @@ public class ForegroundOrBackground implements Application.ActivityLifecycleCall
             // 60秒后打开应用 显示开屏广告
             if (System.currentTimeMillis() - leaveTime >= 60000) {
 
-                if (AppConfig.groMoreVideoAdCount > 0) {
+//                if (AppConfig.groMoreVideoAdCount > 0) {
                     if (groIntent == null) {
                         groIntent = new Intent(activity, SplashGroMoreActivity.class);
                     }
                     activity.startActivity(groIntent);
-                } else {
-                    if (isYlhSplash) {
-                        isYlhSplash = false;
-
-                        if (ylhIntent == null) {
-                            // 优量汇广告
-                            ylhIntent = new Intent(activity, SplashADActivity.class);
-                        }
-                        activity.startActivity(ylhIntent);
-                    } else {
-                        isYlhSplash = true;
-
-                        if (csjIntent == null) {
-                            // 快手广告
-                            csjIntent = new Intent(activity, SplashCsjADActivity.class);
-                        }
-                        activity.startActivity(csjIntent);
-                    }
-                }
+//                } else {
+//                    if (isYlhSplash) {
+//                        isYlhSplash = false;
+//
+//                        if (ylhIntent == null) {
+//                            // 优量汇广告
+//                            ylhIntent = new Intent(activity, SplashADActivity.class);
+//                        }
+//                        activity.startActivity(ylhIntent);
+//                    } else {
+//                        isYlhSplash = true;
+//
+//                        if (csjIntent == null) {
+//                            // 快手广告
+//                            csjIntent = new Intent(activity, SplashCsjADActivity.class);
+//                        }
+//                        activity.startActivity(csjIntent);
+//                    }
+//                }
             }
         }
         count++;