代码合并

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

@@ -17,6 +17,7 @@ import com.mints.goldspace.manager.KsManager
 import com.mints.goldspace.utils.LogUtil
 import java.util.*
 import com.mints.goldspace.R
+import com.mints.library.utils.json.JsonUtil
 
 /**
  * 快手预加载信息流

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

@@ -12,6 +12,7 @@ import com.mints.goldspace.common.Constant
 import com.mints.goldspace.manager.KsManager
 import com.mints.goldspace.manager.TrackManager
 import com.mints.goldspace.utils.LogUtil
+import com.mints.goldspace.utils.ToastUtil
 
 private val TAG = KsVideoAdManager::class.java.simpleName
 
@@ -46,7 +47,8 @@ class KsVideoAdManager private constructor() :
             override fun onError(p0: Int, p1: String?) {
                 videoAdStatusListener?.adFail()
                 TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_KS, Constant.EVENT_TYPE_ONE, p0.toString(), p1)
-
+                ToastUtil.showLong(activity,"快手 onError： code->${p0.toString()}  msg->${p1}")
+                LogUtil.d(p1)
             }
 
             override fun onRewardVideoAdLoad(p0: MutableList<KsRewardVideoAd>?) {
@@ -83,7 +85,7 @@ class KsVideoAdManager private constructor() :
 
                         override fun onVideoPlayError(p0: Int, p1: Int) {
 //                            ToastUtil.show(activity, "快手激励视频⼴告播放出错")
-
+//                            ToastUtil.showLong(activity,"快手 onVideoPlayError： code->${p0}  msg->${p1}")
                             TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_KS, Constant.EVENT_TYPE_ONE, (p0).toString(), (p1).toString())
 
                             videoAdStatusListener?.adFail()

app/src/main/java/com/mints/goldspace/ad/video/VideoAdingManager.java

@@ -213,10 +213,10 @@ public class VideoAdingManager {
             nextAdType = Constant.YLH_VEDIO_AD;
         } else if (AppConfig.csjFullVedioAdCount > 0) {
             nextAdType = Constant.CSJ_FULL_AD;
-        } else if (AppConfig.shVideoAdCount > 0) {
-            nextAdType = Constant.SH_VEDIO_AD;
         } else if (AppConfig.ksVideoAdCount > 0) {
             nextAdType = Constant.KS_VEDIO_AD;
+        } else if (AppConfig.shVideoAdCount > 0) {
+            nextAdType = Constant.SH_VEDIO_AD;
         } else {
             nextAdType = Constant.FL_VEDIO_AD;
         }
@@ -282,27 +282,27 @@ public class VideoAdingManager {
         if (AppConfig.csjFullVedioAdCount > 0) {
             weightList.add(new WeightBean(csjFullVideoWeight, Constant.CSJ_FULL_AD));
             weight = weight + csjFullVideoWeight;
-            LogUtil.d(TAG, "权重值：csjFullVedioWeight:" + csjFullVideoWeight);
+            LogUtil.d(TAG, "权重值：csjFullVideoWeight:" + csjFullVideoWeight);
         }
-        if (AppConfig.flVideoAdCount > 0) {
-            weightList.add(new WeightBean(flVideoWeight, Constant.FL_VEDIO_AD));
-            weight = weight + flVideoWeight;
-            LogUtil.d(TAG, "权重值：flVideoWeight:" + flVideoWeight);
-        }
-        if (AppConfig.wnVideoAdCount > 0) {
-            weightList.add(new WeightBean(wnWeight, Constant.SDHZ_VEDIO_AD));
-            weight = weight + wnWeight;
-            LogUtil.d(TAG, "权重值：sdhzWeight:" + wnWeight);
+        if (AppConfig.ksVideoAdCount > 0) {
+            weightList.add(new WeightBean(ksVideoWeight, Constant.KS_VEDIO_AD));
+            weight = weight + ksVideoWeight;
+            LogUtil.d(TAG, "权重值：ksWeight:" + ksVideoWeight);
         }
         if (AppConfig.shVideoAdCount > 0) {
             weightList.add(new WeightBean(shVideoWeight, Constant.SH_VEDIO_AD));
             weight = weight + shVideoWeight;
             LogUtil.d(TAG, "权重值：shWeight:" + shVideoWeight);
         }
-        if (AppConfig.ksVideoAdCount > 0) {
-            weightList.add(new WeightBean(ksVideoWeight, Constant.KS_VEDIO_AD));
-            weight = weight + ksVideoWeight;
-            LogUtil.d(TAG, "权重值：ksWeight:" + ksVideoWeight);
+        if (AppConfig.wnVideoAdCount > 0) {
+            weightList.add(new WeightBean(wnWeight, Constant.SDHZ_VEDIO_AD));
+            weight = weight + wnWeight;
+            LogUtil.d(TAG, "权重值：sdhzWeight:" + wnWeight);
+        }
+        if (AppConfig.flVideoAdCount > 0) {
+            weightList.add(new WeightBean(flVideoWeight, Constant.FL_VEDIO_AD));
+            weight = weight + flVideoWeight;
+            LogUtil.d(TAG, "权重值：flVideoWeight:" + flVideoWeight);
         }
 
         // 权重随机

app/src/main/java/com/mints/goldspace/manager/KsManager.kt

@@ -13,11 +13,7 @@ object KsManager {
 
     private const val KS_APP_ID = "551900003"
 
-    /* splash-postid */
-//    const val KS_AD_SPLASH_POSTID = 5519000005
-
     /*信息流*/
-//    val KS_AD_NATIVEEXPRESS_DRAW = 5519000008
     const val KS_AD_NATIVEEXPRESS_AWARD = 5519000010
 
     /* vedio-postid */

local.properties

@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Mon Mar 08 10:52:55 CST 2021
-sdk.dir=/Users/Hello/Library/Android/sdk
+#Mon Mar 08 19:40:55 CST 2021
+sdk.dir=/Users/mcg/Library/Android/sdk