1.1.2发版

highgold/app/proguard-rules.pro

@@ -424,4 +424,14 @@
 
 
 
-
+    # ===================== 多盟 START ================
+     -keep class com.dm.sdk.ads.splash.**{
+        public <methods>;
+     }
+     -keep class com.dm.sdk.common.util.AdError{
+        public <methods>;
+     }
+     -keep class com.dm.sdk.ads.DMAdActivity{
+        public <methods>;
+     }
+    # ======================= 多盟 END ================

highgold/app/src/main/java/com/mints/highgold/ad/DomobVedioAdManager.kt

@@ -7,6 +7,7 @@ import com.dm.rvads.rewardvideo.RewardVideoAd
 import com.mints.highgold.MintsApplication
 import com.mints.highgold.common.Constant
 import com.mints.highgold.manager.DomobManager
+import com.mints.highgold.manager.TrackManager
 import com.mints.highgold.mvp.presenters.DomobVedioAdPresenter
 import com.mints.highgold.mvp.views.DomobVedioAdView
 import com.mints.highgold.utils.LogUtil
@@ -80,13 +81,13 @@ class DomobVedioAdManager private constructor(activity: Activity) :
     }
 
     override fun onADClick() {
-//        TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_DUOMENT, Constant.EVENT_TYPE_TWO, "", "")
-//
-//        if (isClickScreen) {
-//            // 防止重复
-//            TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_DUOMENT, Constant.EVENT_TYPE_FOUR, "", "")
-//            isClickScreen = false
-//        }
+        TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_DOMOB, Constant.EVENT_TYPE_TWO, "", "")
+
+        if (isClickScreen) {
+            // 防止重复
+            TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_DOMOB, Constant.EVENT_TYPE_FOUR, "", "")
+            isClickScreen = false
+        }
         if (domobVedioAdListener != null) {
             domobVedioAdListener?.domobVedioAdDownload()
         }
@@ -102,13 +103,13 @@ class DomobVedioAdManager private constructor(activity: Activity) :
     }
 
     override fun onADClose() {
-//        TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_DUOMENT, Constant.EVENT_TYPE_THREE, "", "")
+        TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_DOMOB, Constant.EVENT_TYPE_THREE, "", "")
 
         if (domobVedioAdListener != null) {
             domobVedioAdListener?.domobVedioAdSuccess()
         }
 
-//        domobVedioAdPresenter?.reportAddCoinMsg(activity, getAdMapVO())
+        domobVedioAdPresenter?.reportAddCoinMsg(activity, getAdMapVO())
 
         LogUtil.d(TAG, "onADClose")
     }
@@ -118,7 +119,7 @@ class DomobVedioAdManager private constructor(activity: Activity) :
     }
 
     override fun onError(error: AdError?) {
-//        TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_CHUANGSHEN, Constant.EVENT_TYPE_ONE, (error?.errorCode).toString(), error?.errorMsg)
+        TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_DOMOB, Constant.EVENT_TYPE_ONE, (error?.errorCode).toString(), error?.errorMsg)
 
         if (domobVedioAdListener != null) {
             domobVedioAdListener?.domobVedioAdFail()
@@ -129,7 +130,7 @@ class DomobVedioAdManager private constructor(activity: Activity) :
 
     override fun onADShow() {
         LogUtil.d(TAG, "onADShow")
-//        TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_DUOMENT, Constant.EVENT_TYPE_ZERO, "", "")
+        TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_DOMOB, Constant.EVENT_TYPE_ZERO, "", "")
     }
 
     fun setDomobVedioAdListener(domobVedioAdListener: DomobVedioAdListener?) {

highgold/app/src/main/java/com/mints/highgold/ad/VedioAdingManager.java

 package com.mints.highgold.ad;
 
 import android.app.Activity;
+import android.os.Build;
 import android.text.TextUtils;
 
 import com.mints.highgold.MintsApplication;
@@ -184,7 +185,7 @@ public class VedioAdingManager {
             weight = weight + ylhWeight;
             LogUtil.d(TAG, "权重值：ylhWeight:" + ylhWeight);
         }
-        if (AppConfig.duomentVedioAdCount > 0) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q && AppConfig.duomentVedioAdCount > 0) {
             weightList.add(new WeightBean(domobWeight, Constant.DUOMENT_VEDIO_AD));
             weight = weight + domobWeight;
             LogUtil.d(TAG, "权重值：domobWeight:" + domobWeight);
@@ -253,11 +254,18 @@ public class VedioAdingManager {
         int mintegralAdCount = AppConfig.mintegralAdCount;
         int shanhuAdCount = AppConfig.shanhuAdCount;
         int chuangshenVedioAdCount = AppConfig.chuangshenVedioAdCount;
-        int duomentVedioAdCount = AppConfig.duomentVedioAdCount;
+
+        // android10以下多盟判断可用视频数
+        boolean domobFlag = true;
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+            int duomentVedioAdCount = AppConfig.duomentVedioAdCount;
+            domobFlag = duomentVedioAdCount <= 0 ? true : false;
+        }
+
         if (csjFullAdCount <= 0 && ylhAdCount <= 0 &&
                 csjVedioAdCount <= 0 && hytechVedioAdCount <= 0 &&
                 mintegralAdCount <= 0 && shanhuAdCount <= 0 &&
-                chuangshenVedioAdCount <= 0 && duomentVedioAdCount <= 0) {
+                chuangshenVedioAdCount <= 0 && domobFlag) {
 //            showToast("今日视频已看完，请明天再来吧");
             return true;
         }

highgold/app/src/main/java/com/mints/highgold/ui/fragment/MainFragment.java

@@ -474,23 +474,23 @@ public class MainFragment extends BaseFragment
 
 
         //测试数据
-        data.setVedioplan_csj_vedio_rate(0);
-        data.setVedioplan_lyh_vedio_rate(0);
-        data.setVedioplan_csj_full_screen_video_rate(0);
-        data.setVedioplan_hytech_vedio_rate(0);
-        data.setVedioplan_mintegral_vedio_rate(0);
-        data.setVedioplan_coral_vedio_rate(0);
-        data.setVedioplan_domob_vedio_rate(10);
-        data.setVedioplan_chuangshen_vedio_rate(0);
-
-        data.setVedioplan_csj_vedio_surplus(0);
-        data.setVedioplan_lyh_vedio_surplus(0);
-        data.setVedioplan_csj_full_screen_video_surplus(0);
-        data.setVedioplan_hytech_vedio_surplus(0);
-        data.setVedioplan_mintegral_vedio_surplus(0);
-        data.setVedioplan_coral_vedio_surplus(0);
-        data.setVedioplan_domob_vedio_surplus(10);
-        data.setVedioplan_chuangshen_vedio_surplus(0);
+//        data.setVedioplan_csj_vedio_rate(0);
+//        data.setVedioplan_lyh_vedio_rate(0);
+//        data.setVedioplan_csj_full_screen_video_rate(0);
+//        data.setVedioplan_hytech_vedio_rate(0);
+//        data.setVedioplan_mintegral_vedio_rate(0);
+//        data.setVedioplan_coral_vedio_rate(0);
+//        data.setVedioplan_domob_vedio_rate(10);
+//        data.setVedioplan_chuangshen_vedio_rate(0);
+//
+//        data.setVedioplan_csj_vedio_surplus(0);
+//        data.setVedioplan_lyh_vedio_surplus(0);
+//        data.setVedioplan_csj_full_screen_video_surplus(0);
+//        data.setVedioplan_hytech_vedio_surplus(0);
+//        data.setVedioplan_mintegral_vedio_surplus(0);
+//        data.setVedioplan_coral_vedio_surplus(0);
+//        data.setVedioplan_domob_vedio_surplus(10);
+//        data.setVedioplan_chuangshen_vedio_surplus(0);
 
         // 设置随机广告权重
         if (vedioAdingManager != null) {