Merge branch 'dev_heliduanshipinxiariban_0725' of...

Merge branch 'dev_heliduanshipinxiariban_0725' of http://gitlab.mints-id.com/android/android_vedio into dev_heliduanshipinxiariban_0725

video/app/src/main/java/com/mints/helivideo/ad/draw/DrawExpressManager.kt

@@ -109,8 +109,8 @@ class DrawExpressManager {
              *  2:如果是信息流模板广告，宽度设置为希望的宽度，高度设置为0(0为高度选择自适应参数)
              */
             .setImageAcceptedSize(
-                UIUtils.getScreenWidth(activity),
-                UIUtils.getScreenHeight(activity)
+                UIUtils.getScreenWidth(MintsApplication.getContext()),
+                UIUtils.getScreenHeight(MintsApplication.getContext())
             )
             .setMediationAdSlot(
                 MediationAdSlot.Builder()

video/app/src/main/java/com/mints/helivideo/ad/splash/SplashManager.kt

@@ -10,6 +10,7 @@ import com.bytedance.sdk.openadsdk.mediation.MediationConstant
 import com.bytedance.sdk.openadsdk.mediation.ad.MediationAdSlot
 import com.bytedance.sdk.openadsdk.mediation.ad.MediationSplashRequestInfo
 import com.mints.helivideo.BuildConfig
+import com.mints.helivideo.MintsApplication
 import com.mints.helivideo.ad.AdStatusListener
 import com.mints.helivideo.utils.GromorePrintUtil
 import com.mints.helivideo.utils.LogUtil
@@ -51,8 +52,8 @@ object SplashManager {
         val adslot = AdSlot.Builder()
             .setCodeId(BuildConfig.GROMORE_SPLASH_CODE)
             .setImageAcceptedSize(
-                UIUtils.getScreenWidth(activity),
-                UIUtils.getScreenHeight(activity)
+                UIUtils.getScreenWidth(MintsApplication.getContext()),
+                UIUtils.getScreenHeight(MintsApplication.getContext())
             )
             .setMediationAdSlot(
                 MediationAdSlot.Builder()

video/app/src/main/java/com/mints/helivideo/video/TxVideoActivity.kt

@@ -2,8 +2,6 @@ package com.mints.helivideo.video
 
 import android.app.Dialog
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
 import android.view.View
 import com.google.gson.Gson
 import com.mints.helivideo.R
@@ -27,7 +25,6 @@ import com.mints.helivideo.ui.widgets.DialogListener
 import com.mints.helivideo.ui.widgets.VideoEpisodeDialog
 import com.mints.helivideo.ui.widgets.VipCountDialog
 import com.mints.helivideo.utils.AppPreferencesManager
-import com.mints.helivideo.utils.LogUtil
 import com.mints.helivideo.utils.SpanUtils
 import com.mints.helivideo.video.tx.VideoModel
 import com.mints.helivideo.video.tx.adapter.TxVideoAdapter

video/app/src/main/java/com/mints/helivideo/video/tx/SuperShortVideoView.java

@@ -41,7 +41,7 @@ public class SuperShortVideoView extends RelativeLayout {
 
     private int mCurrentPosition = 0;
 
-    private List<VideoMultiItemEntity> mList;
+    private List<VideoMultiItemEntity> mList = new ArrayList<>();
 
     public SuperShortVideoView(Context context) {
         this(context, null);