添加ow 解决冲突

GoodMoney/app/build.gradle

@@ -349,6 +349,8 @@ dependencies {
     //愉悦赚
     implementation(name: 'mduisdk_v3.1.0.18_support_msa_1.0.23', ext: 'aar')
     implementation 'com.tencent.tbs.tbssdk:sdk:43903'
+    // OneWay
+    implementation(name: 'oneway-common-core-1.0.10', ext: 'aar')
 
 //    //芒果联盟
 //    implementation 'com.openppeace.mgmob:mgmob:1.3.5-alpha6'//MGMob

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

@@ -17,6 +17,7 @@ import com.mints.goodmoney.manager.KsManager;
 import com.mints.goodmoney.manager.LiebaoManager;
 import com.mints.goodmoney.manager.MhManager;
 import com.mints.goodmoney.manager.MiitHelper;
+import com.mints.goodmoney.manager.OwManager;
 import com.mints.goodmoney.manager.ReaderManager;
 import com.mints.goodmoney.manager.RsNewsManager;
 import com.mints.goodmoney.manager.TtCsjAdManager;
@@ -115,7 +116,7 @@ public class MintsApplication extends MultiDexApplication {
     private void thirdConfig() {
         // 友盟SDK预初始化函数
         // preInit预初始化函数耗时极少，不会影响App首次冷启动用户体验
-        UMConfigure.preInit(this,CommonUtils.getAppMetaData(MintsApplication.getContext(), "UMENG_KEY"), CommonUtils.getAppMetaData(MintsApplication.getContext(), "CHANNEL_NAME"));
+        UMConfigure.preInit(this, CommonUtils.getAppMetaData(MintsApplication.getContext(), "UMENG_KEY"), CommonUtils.getAppMetaData(MintsApplication.getContext(), "CHANNEL_NAME"));
 
         // 初始化toast
         initToast();
@@ -141,6 +142,9 @@ public class MintsApplication extends MultiDexApplication {
         // 枫岚广告
         MhManager.INSTANCE.initMn(this);
 
+        // OneWay
+        OwManager.INSTANCE.init(this);
+
         // 天卓珊瑚[INSTANCE是设置单例模式]
         TzManager.INSTANCE.initTz(this);
 

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

+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.VideoAdStatusListener
+import com.mints.goodmoney.common.AppConfig
+import com.mints.goodmoney.common.Constant
+import com.mints.goodmoney.manager.OwManager
+import com.mints.goodmoney.manager.TrackManager
+import mobi.oneway.export.Ad.OWRewardedAd
+import mobi.oneway.export.AdListener.OWRewardedAdListener
+import mobi.oneway.export.enums.OnewayAdCloseType
+import mobi.oneway.export.enums.OnewaySdkError
+
+private val TAG = OwVideoAdManager::class.java.simpleName
+
+/**
+ * OneWay广告视频
+ */
+class OwVideoAdManager private constructor() :
+        BaseVideoAd() {
+
+    private var videoAdStatusListener: VideoAdStatusListener? = null
+    private var owRewardedAd: OWRewardedAd? = null
+
+    private var isClickScreen: Boolean = true
+
+    companion object {
+        private var _inst: OwVideoAdManager? = null
+        fun getInstance(): OwVideoAdManager? {
+            return if (_inst != null) {
+                _inst
+            } else {
+                _inst = OwVideoAdManager()
+                _inst
+            }
+        }
+    }
+
+    override fun loadAd(activity: Activity, curCoin: Int, carrierType: String, extraId: String?) {
+        isClickScreen = true
+
+        //创建激励视频事件监听器
+        val owRewardedAdListener: OWRewardedAdListener = object : OWRewardedAdListener {
+            override fun onAdReady() {
+                owRewardedAd?.show(activity)
+            }
+
+            override fun onAdShow(tag: String) {
+                TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_OW, Constant.EVENT_TYPE_ZERO, "", "")
+            }
+
+            override fun onAdClick(tag: String) {
+                if (AppConfig.needReportClickAdEvent) {
+                    TrackManager.getInstance().reportClickAdEvent()
+                }
+
+                TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_OW, Constant.EVENT_TYPE_TWO, "", "")
+                if (isClickScreen) {
+                    // 防止重复
+                    TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_OW, Constant.EVENT_TYPE_FOUR, "", "")
+                    isClickScreen = false
+                }
+
+                videoAdStatusListener?.adDownload()
+            }
+
+            override fun onAdClose(tag: String, onewayVideoCloseType: OnewayAdCloseType) {
+                TrackManager.getInstance().reportAddCoinMsg(activity, getAdMapVO(carrierType, Constant.AD_SOURCE_OW, extraId, curCoin))
+
+                TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_OW, Constant.EVENT_TYPE_THREE, "", "")
+
+                videoAdStatusListener?.adSuccess()
+            }
+
+            override fun onAdFinish(s: String, onewayAdCloseType: OnewayAdCloseType, s1: String) {
+            }
+
+            override fun onSdkError(onewaySdkError: OnewaySdkError, msg: String) {
+                TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_OW, Constant.EVENT_TYPE_ONE, "999999","emun:"+onewaySdkError.name+"msg:"+ msg)
+
+                videoAdStatusListener?.adFail()
+            }
+        }
+
+        //创建激励视频对象
+        owRewardedAd = OWRewardedAd(activity, OwManager.REWARD_PID, owRewardedAdListener)
+
+        owRewardedAd?.loadAd()
+    }
+
+    fun setVideoAdStatusListener(videoAdStatusListener: VideoAdStatusListener?) {
+        this.videoAdStatusListener = videoAdStatusListener
+    }
+
+    override fun onDestroy() {
+        owRewardedAd?.destory()
+        owRewardedAd = null
+    }
+}
\ No newline at end of file

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

@@ -97,9 +97,14 @@ public class AppConfig {
      */
     public static int ksVideoAdCount = 0;
     /**
-     * rtaVideo 剩余广告播放数
+     * owVideo 剩余广告播放数
      */
-    public static int rtaVideoAdCount = 0;
+    public static int owVideoAdCount = 0;
+
+//    /**
+//     * rtaVideo 剩余广告播放数
+//     */
+//    public static int rtaVideoAdCount = 0;
     /**
      * gromore 剩余广告播放数
      */

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

@@ -156,6 +156,7 @@ object Constant {
     const val AD_SOURCE_SH = "CORAL" //珊瑚天卓
     const val AD_SOURCE_KS = "KS" //快手
     const val AD_SOURCE_RTA = "RTA" //RTA
+    const val AD_SOURCE_OW = "OW" //OneWay
 
     // 调用事件 0 成功 1失败 2点击 3-有效展示 4-去重
     const val EVENT_TYPE_ZERO = "0"
@@ -179,6 +180,7 @@ object Constant {
     const val KS_VEDIO_AD = "KS_VEDIO_AD"
     const val RTA_VEDIO_AD = "RTA_VEDIO_AD"
     const val GROMORE_VEDIO_AD = "GROMORE_VEDIO_AD"
+    const val OW_VEDIO_AD = "OW_VEDIO_AD"
 
     // 信息流广告类型
     const val CSJ_EXPRESS_AD = "CSJ_EXPRESS_AD"

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

+package com.mints.goodmoney.manager
+
+import android.app.Application
+import com.maplehaze.adsdk.MaplehazeSDK
+import mobi.oneway.export.Ad.OnewaySdk
+
+/**
+ * 描述：OneWay激励视频
+ * 作者：孟崔广
+ */
+object OwManager {
+
+    private const val PUBLISH_ID = ""
+
+    const val REWARD_PID = ""
+
+    /**
+     * 初始化
+     */
+    fun init(application: Application) {
+        OnewaySdk.configure(application, PUBLISH_ID)
+    }
+}
\ No newline at end of file

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

@@ -27,8 +27,8 @@ object UserWeight {
                 data.vedioRules.corAl_VIDEO.rate,
                 data.vedioRules.csjfulL_VEDIO.rate,
                 data.vedioRules.kS_VEDIO.rate,
-                data.vedioRules.rtA_VEDIO.rate,
-                data.vedioRules.gromorE_VEDIO.rate
+                data.vedioRules.gromorE_VEDIO.rate,
+                data.vedioRules.oW_VEDIO.rate
         )
         LogUtil.d(TAG, "首页权重值：csjWeight:${data.vedioRules.csJ_VEDIO.rate}    " +
                 "ylhWeight:${data.vedioRules.ylH_VEDIO.rate}    " +
@@ -36,8 +36,8 @@ object UserWeight {
                 "csjFullWeight:${data.vedioRules.csjfulL_VEDIO.rate}    " +
                 "shWeight:${data.vedioRules.corAl_VIDEO.rate}    " +
                 "flWeight:${data.vedioRules.fL_VEDIO.rate}    " +
-                "rtaWeight:${data.vedioRules.rtA_VEDIO.rate}    " +
                 "groMoreWeight:${data.vedioRules.gromorE_VEDIO.rate}     "+
+                "owWeight:${data.vedioRules.oW_VEDIO.rate}    " +
                 "ksWeight:${data.vedioRules.kS_VEDIO.rate}"
         )
         // 广告视频数
@@ -47,7 +47,7 @@ object UserWeight {
         AppConfig.flVideoAdCount = data.vedioRules.fL_VEDIO.surplus
         AppConfig.shVideoAdCount = data.vedioRules.corAl_VIDEO.surplus
         AppConfig.ksVideoAdCount = data.vedioRules.kS_VEDIO.surplus
-        AppConfig.rtaVideoAdCount = data.vedioRules.rtA_VEDIO.surplus
+        AppConfig.owVideoAdCount = data.vedioRules.oW_VEDIO.surplus
         AppConfig.csjFullVideoAdCount = data.vedioRules.csjfulL_VEDIO.surplus
         AppConfig.groMoreVideoAdCount = data.vedioRules.gromorE_VEDIO.surplus
         LogUtil.d(TAG, "首页视频数：csjCount:${AppConfig.csjVideoAdCount}    " +
@@ -56,8 +56,8 @@ object UserWeight {
                 "csjFullCount:${AppConfig.csjFullVideoAdCount}    " +
                 "shCount:${AppConfig.shVideoAdCount}    " +
                 "flCount:${AppConfig.flVideoAdCount}    " +
-                "rtaCount:${AppConfig.rtaVideoAdCount}    " +
                 "groMoreCount:${AppConfig.groMoreVideoAdCount}    " +
+                "owCount:${AppConfig.owVideoAdCount}    " +
                 "ksCount:${AppConfig.ksVideoAdCount}"
         )
     }

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

@@ -89,6 +89,7 @@ public class DrawcashBean implements Serializable {
         private int KS_VEDIO;
         private int RTA_VEDIO;
         private int GROMORE_VEDIO;
+        private int OW_VEDIO;
 
         public int getRTA_VEDIO() {
             return RTA_VEDIO;
@@ -129,6 +130,9 @@ public class DrawcashBean implements Serializable {
         public int getGROMORE_VEDIO() {
             return GROMORE_VEDIO;
         }
+        public int getOW_VEDIO() {
+            return OW_VEDIO;
+        }
     }
 
     public class CashOutMoneyArrBean implements Serializable {

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

@@ -13,6 +13,7 @@ public class VedioRulesBean implements Serializable {
     private KSVedioBean KS_VEDIO;
     private RTAVedioBean RTA_VEDIO;
     private GROMOREVedioBean GROMORE_VEDIO;
+    private OWVedioBean OW_VEDIO;
     private boolean flVideoFlag;
     private boolean vedioSleep;
 
@@ -163,6 +164,22 @@ public class VedioRulesBean implements Serializable {
     public GROMOREVedioBean getGROMORE_VEDIO() {
         return GROMORE_VEDIO;
     }
+    public OWVedioBean getOW_VEDIO() {
+        return OW_VEDIO;
+    }
+
+    public class OWVedioBean implements Serializable {
+        private int surplus;
+        private int rate;
+
+        public int getSurplus() {
+            return surplus;
+        }
+
+        public int getRate() {
+            return rate;
+        }
+    }
 
     public void setRTA_VEDIO(RTAVedioBean RTA_VEDIO) {
         this.RTA_VEDIO = RTA_VEDIO;

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

@@ -306,8 +306,8 @@ class DrawcashActivity : BaseActivity(),
                 data.coraL_VEDIO,
                 data.csjfulL_VEDIO,
                 data.kS_VEDIO,
-                data.rtA_VEDIO,
-                data.gromorE_VEDIO
+                data.gromorE_VEDIO,
+                data.oW_VEDIO
         )
         LogUtil.d(TAG, "提现权重值：csjWeight:${data.csJ_VEDIO}    " +
                 "ylhWeight:${data.ylH_VEDIO}    " +
@@ -315,8 +315,8 @@ class DrawcashActivity : BaseActivity(),
                 "csjFullWeight:${data.csjfulL_VEDIO}    " +
                 "shWeight:${data.coraL_VEDIO}    " +
                 "flWeight:${data.fL_VEDIO}    " +
-                "rtaWeight:${data.rtA_VEDIO}    " +
                 "groMoreWeight:${data.gromorE_VEDIO}    " +
+                "owWeight:${data.oW_VEDIO}    " +
                 "ksWeight:${data.kS_VEDIO}"
         )
         // 广告视频数