代码优化

video/app/src/main/java/com/duben/infinitefunjia/ui/activitys/VipForDialogActivity.kt

@@ -33,6 +33,7 @@ import com.duben.infinitefunjia.ui.widgets.countdowntimer.CountDownTimerSupport
 import com.duben.infinitefunjia.ui.widgets.countdowntimer.OnCountDownTimerListener
 import com.duben.infinitefunjia.utils.SpanUtils
 import com.duben.infinitefunjia.utils.ToastUtil
+import com.duben.infinitefunjia.video.tx.TxVideoActivity
 import com.duben.library.utils.nodoubleclick.AntiShake
 import com.jobo.alipay.AliPay
 import com.jobo.alipay.AlipayInfoImpl
@@ -354,6 +355,7 @@ class VipForDialogActivity : BaseActivity(), VipView, View.OnClickListener,
         when (v?.id) {
             R.id.ic_vip_quit -> {
                 UserManager.getInstance().vipFlag=true
+                TxVideoActivity.tempOnClickVedioFlag=false
                 finish()
             }
             R.id.ic_free_auto -> {
@@ -575,6 +577,7 @@ class VipForDialogActivity : BaseActivity(), VipView, View.OnClickListener,
                 when (v.id) {
                     R.id.iv_dialog_vip_quit -> {
                         finish()
+
 //                        payYesDialog!!.dismiss()
                     }
                     R.id.tv_dialog_vip_next -> {

video/app/src/main/java/com/duben/infinitefunjia/ui/fragment/MyFragment.kt

@@ -63,7 +63,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
             .append("在线客服\n")
             .setForegroundColor(resources.getColor(R.color.main_mints))
             .append("处理速度更快，")
-            .append("无需联系支付宝")
+            .append("无需联系微信或支付宝")
             .setForegroundColor(resources.getColor(R.color.main_mints))
             .create()
 

video/app/src/main/java/com/duben/infinitefunjia/video/tx/TxVideoActivity.kt

@@ -35,6 +35,10 @@ import kotlinx.android.synthetic.main.activity_tx_video.*
 class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
     VideoEpisodeAdapter.OnEpisodeClickListener, TxVideoAdapter.OnCustomChildClickListener {
 
+    companion object {
+        var tempOnClickVedioFlag = false
+    }
+
     private var mVipFlag = UserManager.getInstance().vipFlag
 
     var videos = ArrayList<VedioEpisodeBean>()
@@ -55,6 +59,7 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
     private var tempNumIndex = 0
 
     private var afterOpenVipVedioPosition = 0 //首次开通vip剧的坐标
+    private var afterOpenVipVedioFlag = false
 
     override fun getContentViewLayoutID() = R.layout.activity_tx_video
 
@@ -92,8 +97,7 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
             // 重置状态
             Handler(Looper.getMainLooper()).postDelayed({
                 isPlayNext = false
-                playIndex = afterOpenVipVedioPosition - 1
-                super_short_video_view.onItemClick(playIndex)
+                afterOpenVipVedioFlag = true
                 mVedioBean?.let { videoPresenter.getIndexList("" + it.vedioId) }
             }, 100)
 
@@ -139,11 +143,15 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
 
         super_short_video_view.setOnCustomChildClickListener(this)
         super_short_video_view.setOnPageChangeListener {
+            if (AntiShake.check(super_short_video_view?.id)) return@setOnPageChangeListener
 
             if (super_short_video_view.isAdPosition(it) || super_short_video_view.isLuckPosition(it)) {
                 if (!UserManager.getInstance().vipFlag) {
                     Handler(Looper.getMainLooper()).postDelayed({
-                        afterOpenVipVedioPosition = it
+                        if (!tempOnClickVedioFlag) {
+                            afterOpenVipVedioPosition = it
+                            println("mcg --> setOnPageChangeListener position=" + it)
+                        }
                         val bundle = Bundle()
                         bundle.putString(
                             VipForDialogActivity.VEDIO_ID,
@@ -232,7 +240,12 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
         videos.clear()
         videos.addAll(indexList.list)
 
-        super_short_video_view.loadData(mVedioBean, getAdapterData(), playIndex)
+        if (afterOpenVipVedioFlag) {
+            afterOpenVipVedioFlag = false
+            super_short_video_view.loadData(mVedioBean, getAdapterData(), afterOpenVipVedioPosition)
+        } else {
+            super_short_video_view.loadData(mVedioBean, getAdapterData(), playIndex)
+        }
     }
 
     override fun getIndexListFail() {
@@ -311,7 +324,9 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
         if (position >= mVedioBean!!.unlockIndex) {
             if (!UserManager.getInstance().vipFlag) {
                 Handler(Looper.getMainLooper()).postDelayed({
+                    tempOnClickVedioFlag = true
                     afterOpenVipVedioPosition = position
+                    println("mcg --> onEpisodeClick position=" + position)
                     val bundle = Bundle()
                     bundle.putString(
                         VipForDialogActivity.VEDIO_ID,