更新创神新包，更新一览新包

highgold/app/build.gradle

@@ -176,7 +176,8 @@ dependencies {
     // 权限
     implementation 'com.tbruyelle.rxpermissions:rxpermissions:0.9.3@aar'
     // 图片加载
-    implementation 'com.github.bumptech.glide:glide:4.8.0'
+    implementation 'com.github.bumptech.glide:glide:4.9.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
     // 65536
     implementation 'com.android.support:multidex:1.0.3'
     //下拉刷新
@@ -255,18 +256,23 @@ dependencies {
 //    implementation 'com.github.castorflex.verticalviewpager:library:19.0.1'
 //    implementation 'com.baidu.mobstat:mtj-sdk-circle:latest.integration'
     // 一览视频
-    implementation "com.yilan.sdk:ui:1.9.0.2"//修改为具体的sdk版本
-    implementation "com.yilan.sdk:ad:1.9.0.2"//修改为具体的sdk版本,支持广点通、百度广告
+//    implementation "com.yilan.sdk:ui:1.9.0.2"//修改为具体的sdk版本
+//    implementation "com.yilan.sdk:ad:1.9.0.2"//修改为具体的sdk版本,支持广点通、百度广告
+    implementation ("com.yilan.sdk:ui:2.0.0.0"){
+        exclude group: 'com.yilan.sdk', module: 'toutiao'
+        exclude group: 'com.yilan.sdk', module: 'gdt'
+    }
+    implementation "com.yilan.sdk:ad:2.0.0.0"//修改为具体的sdk版本,支持广点通、百度广告
     implementation('com.aliyun.ams:alicloud-android-httpdns:1.2.3@aar') {
         transitive true
     }
     //支持ijkplayer进行播放，建议添加
     implementation 'tv.danmaku.ijk.media:ijkplayer-java:0.8.8'
     implementation 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.8.8'
-    implementation 'tv.danmaku.ijk.media:ijkplayer-armv5:0.8.8'
-    implementation 'tv.danmaku.ijk.media:ijkplayer-arm64:0.8.8'
-    implementation 'tv.danmaku.ijk.media:ijkplayer-x86:0.8.8'
-    implementation 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.8.8'
+//    implementation 'tv.danmaku.ijk.media:ijkplayer-armv5:0.8.8'
+//    implementation 'tv.danmaku.ijk.media:ijkplayer-arm64:0.8.8'
+//    implementation 'tv.danmaku.ijk.media:ijkplayer-x86:0.8.8'
+//    implementation 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.8.8'
     // Mintegral 广告
     implementation 'com.mintegral.msdk:videojs:10.2.41'
     implementation 'com.mintegral.msdk:mtgjscommon:10.2.41'
@@ -294,7 +300,7 @@ dependencies {
     implementation(name: 'discovery-2.0.12', ext: 'aar')
     implementation(name: 'shanhuAD-1.0.14', ext: 'aar')
     // 创神广告
-    implementation(name: 'ad_library_v2.0', ext: 'aar')
+    implementation(name: 'ad_support_library_v2.1.4', ext: 'aar')
 
 
     testImplementation 'junit:junit:4.12'

highgold/app/src/main/AndroidManifest.xml

@@ -253,11 +253,13 @@
         <activity
             android:name="com.qq.e.ads.LandscapeADActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
-            android:screenOrientation="landscape" /> <!-- 今⽇日头条sdk需添加 -->
+            android:screenOrientation="landscape" />
+        <!-- 一览 今⽇日头条sdk需添加 -->
         <provider
             android:name="com.bytedance.sdk.openadsdk.multipro.TTMultiProvider"
             android:authorities="${applicationId}.TTMultiProvider"
-            android:exported="false" /> <!-- Mintegral广告 -->
+            android:exported="false" />
+        <!-- Mintegral广告 -->
         <activity
             android:name="com.mintegral.msdk.activity.MTGCommonActivity"
             android:configChanges="keyboard|orientation"

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

@@ -12,15 +12,28 @@ import com.mints.highgold.ui.activitys.CsVedioActivity
 class ChuangshenVedioAdManager private constructor(activity: Activity) {
     private var chuangshenVedioAdListener: ChuangshenVedioAdListener? = null
     var activity: Activity? = null
-    private fun init(activity: Activity) {
-        this.activity = activity
+
+    companion object {
+        private var _inst: ChuangshenVedioAdManager? = null
+        fun getInstance(activity: Activity): ChuangshenVedioAdManager? {
+            return if (_inst != null) {
+                _inst
+            } else {
+                _inst = ChuangshenVedioAdManager(activity)
+                _inst
+            }
+        }
     }
 
-    fun loadChuangshenAd(downloadCoin: Int, curCoin: Int, carrierType: String?, extraId: String?) {
-        if (activity == null) {
-            return
+    init {
+        init(activity)
     }
 
+    private fun init(activity: Activity) {
+        this.activity = activity
+    }
+
+    fun loadChuangshenAd(downloadCoin: Int = 0, curCoin: Int = 0, carrierType: String?, extraId: String?) {
         chuangshenVedioAdListener?.chuangshenVedioAdSuccess()
 
         val bundle = Bundle()
@@ -28,7 +41,7 @@ class ChuangshenVedioAdManager private constructor(activity: Activity) {
         bundle.putString(Constant.TRY_TASK_H5DOWNLOADCOIN, downloadCoin.toString())
         bundle.putString(Constant.TRY_CARRIER, carrierType)
         bundle.putString(Constant.MAIN_EXTRA_ID, extraId)
-        readyGo(CsVedioActivity::class.java,bundle)
+        readyGo(CsVedioActivity::class.java, bundle)
     }
 
     fun setChuangshenVedioAdListener(chuangshenVedioAdListener: ChuangshenVedioAdListener?) {
@@ -39,22 +52,6 @@ class ChuangshenVedioAdManager private constructor(activity: Activity) {
         fun chuangshenVedioAdSuccess()
     }
 
-    companion object {
-        private var _inst: ChuangshenVedioAdManager? = null
-        fun getInstance(activity: Activity): ChuangshenVedioAdManager? {
-            return if (_inst != null) {
-                _inst
-            } else {
-                _inst = ChuangshenVedioAdManager(activity)
-                _inst
-            }
-        }
-    }
-
-    init {
-        init(activity)
-    }
-
     fun readyGo(clazz: Class<*>?, bundle: Bundle) {
         val intent = Intent(activity, clazz)
         intent.putExtras(bundle)

highgold/app/src/main/java/com/mints/highgold/mvp/presenters/CsVedioPresenter.kt

@@ -43,7 +43,7 @@ class CsVedioPresenter : BasePresenter<CsVedioView>() {
     /**
      * 下载接口
      */
-    fun reportDownloadTask(tryCarrier: String?, vo: java.util.HashMap<String?, Any?>?) {
+    fun reportDownloadTask(tryCarrier: String?, vo: HashMap<String, Any>) {
         val observable: Observable<BaseResponse<Any>>
         observable = if (TextUtils.equals(tryCarrier, Constant.CARRIER_DAILY_DOWNLOAD) || TextUtils.equals(tryCarrier, Constant.CARRIER_DAILY_VIDEO)) {
             // 每日任务

highgold/app/src/main/java/com/mints/highgold/ui/activitys/AwardActivity.java

@@ -452,7 +452,7 @@ public class AwardActivity extends BaseActivity implements AwardView {
      * @param adType
      */
     private void vedioAdingSuccess(String adType) {
-        if (TextUtils.equals(adType, Constant.LY_VEDIO_AD) || TextUtils.equals(adType, Constant.HYTECH_VEDIO_AD)) {
+        if (TextUtils.equals(adType, Constant.CHUANGSHEN_VEDIO_AD) || TextUtils.equals(adType, Constant.HYTECH_VEDIO_AD)) {
             if (!isFinishing()) {
                 finish();
             }

highgold/app/src/main/java/com/mints/highgold/ui/activitys/CsVedioActivity.kt

@@ -3,6 +3,7 @@ package com.mints.highgold.ui.activitys
 import android.os.Bundle
 import com.mints.highgold.R
 import com.mints.highgold.common.Constant
+import com.mints.highgold.manager.TrackManager
 import com.mints.highgold.mvp.presenters.CsVedioPresenter
 import com.mints.highgold.mvp.views.CsVedioView
 import com.mints.highgold.ui.activitys.base.BaseActivity
@@ -10,6 +11,7 @@ import com.mints.highgold.utils.LogUtil
 import com.toukeads.ads.annotation.AdRequestType
 import com.toukeads.ads.listener.out.VideoCallback
 import kotlinx.android.synthetic.main.activity_cs_vedio.*
+import java.util.*
 
 /**
  * 描述：创神视频
@@ -29,34 +31,129 @@ class CsVedioActivity : BaseActivity()
     private var tryCarrier: String? = null
     private var extraId: String? = null
 
+    private var isClickScreen: Boolean = true
+    private var isLoadError: Boolean = false //视频加载异常
+
     override fun getContentViewLayoutID() = R.layout.activity_cs_vedio
 
     override fun isApplyKitKatTranslucency() = false
 
     override fun getBundleExtras(extras: Bundle?) {
-        vedioCoin = extras!!.getString(Constant.TRY_VEDIO_COIN)
-        vedioDownloadCoin = extras.getString(Constant.TRY_TASK_H5DOWNLOADCOIN)
-        tryCarrier = extras.getString(Constant.TRY_CARRIER)
-        extraId = extras.getString(Constant.MAIN_EXTRA_ID)
+//        vedioCoin = extras!!.getString(Constant.TRY_VEDIO_COIN)
+//        vedioDownloadCoin = extras.getString(Constant.TRY_TASK_H5DOWNLOADCOIN)
+//        tryCarrier = extras.getString(Constant.TRY_CARRIER)
+//        extraId = extras.getString(Constant.MAIN_EXTRA_ID)
+
+        extras?.let {
+            vedioCoin = it.getString(Constant.TRY_VEDIO_COIN)
+            vedioDownloadCoin = it.getString(Constant.TRY_TASK_H5DOWNLOADCOIN)
+            tryCarrier = it.getString(Constant.TRY_CARRIER)
+            extraId = it.getString(Constant.MAIN_EXTRA_ID)
 
             LogUtil.d(TAG, "vedioCoin=${vedioCoin} vedioDownloadCoin=${vedioDownloadCoin} tryCarrier=${tryCarrier} extraId=${extraId} ")
         }
 
+    }
+
     override fun initViewsAndEvents() {
         csVedioPresenter = CsVedioPresenter()
         csVedioPresenter?.attachView(this)
 
+        loadVedio();
+    }
+
+    override fun onResume() {
+        super.onResume()
+        csAdVideoView?.videoRePlay()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        csAdVideoView?.videoPause()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        csVedioPresenter?.detachView()
+    }
+
+    override fun onBackPressed() {
+        if (isLoadError) super.onBackPressed()
+    }
+
+    override fun reportDownloadTask() {
+    }
+
+    private fun loadVedio() {
         csAdVideoView?.setAdListener(object : VideoCallback() {
             override fun onAdShow() {
+                TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_CHUANGSHEN, Constant.EVENT_TYPE_ZERO, "", "")
             }
 
             override fun onAdClosed() {
+                if (isLoadError) {
+                    finish()
+                    return
+                }
+
+                TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_CHUANGSHEN, Constant.EVENT_TYPE_THREE, "", "")
+                val bundle = Bundle()
+                if (isClickScreen) {
+                    //无下载奖励
+                    cmtVedioParam()
+
+                    when (tryCarrier) {
+                        Constant.CARRIER_HOMEWATER_BUBBLE,
+                        Constant.CARRIER_REDENVELOPE_DOUBLE,
+                        Constant.CARRIER_REDENVELOPE,
+                        Constant.CARRIER_ONLINE_INCOME_DOUBLE -> {
+                            bundle.putInt(Constant.MAIN_CUR_COIN, Integer.valueOf(vedioCoin!!))
+                            bundle.putString(Constant.MAIN_CARRIET_TURN, Constant.CARRIER_VERSUS_HEALTH)
+                        }
+                        else -> {
+                            bundle.putInt(Constant.MAIN_CUR_COIN, Integer.valueOf(vedioCoin!!))
+                            bundle.putInt(Constant.MAIN_EXTRA_COIN, Integer.valueOf(vedioDownloadCoin!!))
+                            bundle.putString(Constant.MAIN_CARRIET_TURN, Constant.CARRIER_DAILY_DOWNLOAD)
+                        }
+                    }
+                } else {
+                    //有下载奖励
+                    cmtVedioDownloadParam()
+
+                    when (tryCarrier) {
+                        Constant.CARRIER_HOMEWATER_BUBBLE,
+                        Constant.CARRIER_REDENVELOPE_DOUBLE,
+                        Constant.CARRIER_REDENVELOPE,
+                        Constant.CARRIER_ONLINE_INCOME_DOUBLE -> {
+                            bundle.putInt(Constant.MAIN_CUR_COIN, Integer.valueOf(vedioCoin!!))
+                            bundle.putString(Constant.MAIN_CARRIET_TURN, Constant.CARRIER_VERSUS_HEALTH)
+                        }
+                        else -> {
+                            val cash = Integer.valueOf(vedioCoin!!) + Integer.valueOf(vedioDownloadCoin!!)
+                            bundle.putInt(Constant.MAIN_CUR_COIN, cash)
+                            bundle.putString(Constant.MAIN_CARRIET_TURN, Constant.CARRIER_DAILY_DOWNLOAD_DOWNLOAD)
+                        }
+                    }
+                }
+                bundle.putInt(Constant.MAIN_CUR_FLAG, Constant.MAIN_CUR_ONE)
+                readyGo(AwardActivity::class.java, bundle)
+
+                finish()
             }
 
             override fun onAdClicked() {
+                TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_CHUANGSHEN, Constant.EVENT_TYPE_TWO, "", "")
+
+                if (isClickScreen) {
+                    // 防止重复
+                    TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_CHUANGSHEN, Constant.EVENT_TYPE_FOUR, "", "")
+                    isClickScreen = false
+                }
             }
 
             override fun onAdFailed(msg: String) {
+                isLoadError = true
+                TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_CHUANGSHEN, Constant.EVENT_TYPE_ONE, "999999", msg)
             }
 
             override fun onAdLoadOver() {
@@ -74,25 +171,42 @@ class CsVedioActivity : BaseActivity()
         csAdVideoView?.loadAd(AdRequestType.VIDEO_AD_CPM)
     }
 
-    override fun onResume() {
-        super.onResume()
-        csAdVideoView?.videoRePlay()
+    /**
+     * 提交视频参数
+     */
+    private fun cmtVedioParam() {
+        val vo = HashMap<String, Any>()
+        vo["adsource"] = Constant.AD_SOURCE_HYTECH
+        vo["carrierType"] = tryCarrier!!
+        vo["adtype"] = Constant.ADTYPE_VEDIO
+        vo["status"] = Constant.TASK_STATUS
+        when (tryCarrier) {
+            Constant.CARRIER_HOMEWATER_BUBBLE -> vo["waterCoin"] = vedioCoin!!
+            Constant.CARRIER_REDENVELOPE_DOUBLE, Constant.CARRIER_REDENVELOPE -> vo["numKey"] = extraId!!
+            Constant.CARRIER_ONLINE_INCOME_DOUBLE -> vo["online_income"] = vedioCoin!!
         }
-
-    override fun onPause() {
-        super.onPause()
-        csAdVideoView?.videoPause()
+        csVedioPresenter?.reportAddCoinMsg(tryCarrier!!, vo)
     }
 
-    override fun onDestroy() {
-        super.onDestroy()
-        csVedioPresenter?.detachView()
-    }
+    /**
+     * 提交下载参数
+     */
+    private fun cmtVedioDownloadParam() {
+        when (tryCarrier) {
+            Constant.CARRIER_HOMEWATER_BUBBLE,
+            Constant.CARRIER_REDENVELOPE_DOUBLE,
+            Constant.CARRIER_REDENVELOPE,
+            Constant.CARRIER_ONLINE_INCOME_DOUBLE -> {
 
-    override fun onBackPressed() {
-//        super.onBackPressed()
             }
-
-    override fun reportDownloadTask() {
+            else -> {
+                val vo = HashMap<String, Any>()
+                vo["status"] = Constant.TASK_STATUS
+                vo["adtype"] = Constant.ADTYPE_DOWNLOAD
+                vo["adsource"] = Constant.AD_SOURCE_HYTECH
+                vo["carrierType"] = tryCarrier!!
+                csVedioPresenter?.reportDownloadTask(tryCarrier, vo)
+            }
+        }
     }
 }

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

@@ -359,8 +359,8 @@ public class MainFragment extends BaseFragment
         Bundle bundle;
         switch (view.getId()) {
             case R.id.tv_fragment_main_whatgold:// 如何赚金币
-                readyGo(WhatGoldActivity.class);
-//                ChuangshenVedioAdManager.Companion.getInstance(getActivity()).loadChuangshenAd(10,20,"main","abc");
+//                readyGo(WhatGoldActivity.class);
+                ChuangshenVedioAdManager.Companion.getInstance(getActivity()).loadChuangshenAd(10,20,"main","abc");
                 break;
             case R.id.rl_fragment_main_redbox:// 红包
                 readyGo(RedboxActivity.class);

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

@@ -164,6 +164,7 @@ public class YilanVedioFragment extends BaseFragment
         curAdVedioType = com.mints.highgold.common.Constant.CSJ_VEDIO_AD;
 
         ylCsjAdEntity = entity;
+        LogUtil.d(TAG, "onVideoLoad  entity:" + entity);
     }
 
     /**