1.0.9发版

highgold/app/build.gradle

@@ -256,23 +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: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.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'

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

@@ -10,7 +10,7 @@ import com.mints.highgold.ui.activitys.CsVedioActivity
  * 创神视频
  */
 class ChuangshenVedioAdManager private constructor(activity: Activity) {
-    private var chuangshenVedioAdListener: ChuangshenVedioAdListener? = null
+    private lateinit var chuangshenVedioAdListener: ChuangshenVedioAdListener
     var activity: Activity? = null
 
     companion object {
@@ -45,7 +45,7 @@ class ChuangshenVedioAdManager private constructor(activity: Activity) {
         readyGo(CsVedioActivity::class.java, bundle)
     }
 
-    fun setChuangshenVedioAdListener(chuangshenVedioAdListener: ChuangshenVedioAdListener?) {
+    fun setChuangshenVedioAdListener(chuangshenVedioAdListener: ChuangshenVedioAdListener) {
         this.chuangshenVedioAdListener = chuangshenVedioAdListener
     }
 

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

@@ -118,10 +118,10 @@ public class VedioAdingManager {
      */
     private String getNextAdType() {
         String nextAdType = "";
-        if (AppConfig.csjVedioAdCount > 0) {
-            nextAdType = Constant.CSJ_VEDIO_AD;
-        } else if (AppConfig.ylhAdCount > 0) {
+        if (AppConfig.ylhAdCount > 0) {
             nextAdType = Constant.YLH_VEDIO_AD;
+        } else if (AppConfig.csjVedioAdCount > 0) {
+            nextAdType = Constant.CSJ_VEDIO_AD;
         } else if (AppConfig.mintegralAdCount > 0) {
             nextAdType = Constant.MINTEGRAL_VEDIO_AD;
         } else if (AppConfig.shanhuAdCount > 0) {
@@ -159,16 +159,16 @@ public class VedioAdingManager {
         int weight = 0;
 
         // 若没有视频完成数，不加入权重计算范围内
-        if (AppConfig.csjVedioAdCount > 0) {
-            weightList.add(new WeightBean(csjVedioWeight, Constant.CSJ_VEDIO_AD));
-            weight = weight + csjVedioWeight;
-            LogUtil.d(TAG, "权重值：csjVedioWeight:" + csjVedioWeight);
-        }
         if (AppConfig.ylhAdCount > 0) {
             weightList.add(new WeightBean(ylhWeight, Constant.YLH_VEDIO_AD));
             weight = weight + ylhWeight;
             LogUtil.d(TAG, "权重值：ylhWeight:" + ylhWeight);
         }
+        if (AppConfig.csjVedioAdCount > 0) {
+            weightList.add(new WeightBean(csjVedioWeight, Constant.CSJ_VEDIO_AD));
+            weight = weight + csjVedioWeight;
+            LogUtil.d(TAG, "权重值：csjVedioWeight:" + csjVedioWeight);
+        }
         if (AppConfig.mintegralAdCount > 0) {
             weightList.add(new WeightBean(mintegralWeight, Constant.MINTEGRAL_VEDIO_AD));
             weight = weight + mintegralWeight;
@@ -197,9 +197,6 @@ public class VedioAdingManager {
         // 权重随机
         if (weightList != null && weightList.size() > 0 && weight > 0) {
 
-//            for (WeightBean weightBean : weightList) {
-//                weight += weightBean.getWeight();
-//            }
             LogUtil.d(TAG, "1、权重总值：" + weight);
             Random r = new Random();
             int randomWeight = r.nextInt(weight) + 1;
@@ -529,7 +526,7 @@ public class VedioAdingManager {
                 if (chuangshenVedioAdManager == null) {
                     if (activity == null) {
                         if (vedioAdingListener != null) {
-                            vedioAdingListener.vedioAdingListenerError(Constant.SHANHU_VEDIO_AD);
+                            vedioAdingListener.vedioAdingListenerError(Constant.CHUANGSHEN_VEDIO_AD);
                         }
                         return;
                     }

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

@@ -24,7 +24,7 @@ class CsVedioActivity : BaseActivity()
 
     private val TAG = CsVedioActivity::class.java.simpleName
 
-    private var csVedioPresenter: CsVedioPresenter? = null
+    private lateinit var csVedioPresenter: CsVedioPresenter
 
     private var vedioCoin: String? = null
     private var vedioDownloadCoin: String? = null
@@ -45,11 +45,12 @@ class CsVedioActivity : BaseActivity()
             tryCarrier = it.getString(Constant.TRY_CARRIER)
             extraId = it.getString(Constant.MAIN_EXTRA_ID)
         }
-
     }
 
     override fun initViewsAndEvents() {
+        if(!::csVedioPresenter.isInitialized){
             csVedioPresenter = CsVedioPresenter()
+        }
         csVedioPresenter?.attachView(this)
 
         loadVedio();
@@ -74,7 +75,6 @@ class CsVedioActivity : BaseActivity()
         if (isLoadError) super.onBackPressed()
     }
 
-
     private fun loadVedio() {
         csAdVideoView?.setAdListener(object : VideoCallback() {
             override fun onAdShow() {
@@ -87,12 +87,12 @@ class CsVedioActivity : BaseActivity()
                     return
                 }
 
+                cmtVedioParam()
+
                 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,
@@ -169,7 +169,7 @@ class CsVedioActivity : BaseActivity()
      */
     private fun cmtVedioParam() {
         val vo = HashMap<String, Any>()
-        vo["adsource"] = Constant.AD_SOURCE_HYTECH
+        vo["adsource"] = Constant.AD_SOURCE_CHUANGSHEN
         vo["carrierType"] = tryCarrier!!
         vo["adtype"] = Constant.ADTYPE_VEDIO
         vo["status"] = Constant.TASK_STATUS
@@ -196,7 +196,7 @@ class CsVedioActivity : BaseActivity()
                 val vo = HashMap<String, Any>()
                 vo["status"] = Constant.TASK_STATUS
                 vo["adtype"] = Constant.ADTYPE_DOWNLOAD
-                vo["adsource"] = Constant.AD_SOURCE_HYTECH
+                vo["adsource"] = Constant.AD_SOURCE_CHUANGSHEN
                 vo["carrierType"] = tryCarrier!!
                 csVedioPresenter?.reportDownloadTask(tryCarrier, vo)
             }

highgold/app/src/main/java/com/mints/library/base/TransitionActivity.java

@@ -6,10 +6,6 @@ import android.support.v7.app.AppCompatActivity;
 import com.mints.highgold.R;
 
 
-/**
- * @author assen
- * @date 2019/7/4
- */
 public abstract class TransitionActivity extends AppCompatActivity {
 
     @Override