代码优化

video/.idea/misc.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
+<<<<<<< HEAD
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+=======
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
+>>>>>>> 9867c328a2debc3a54d3299285d9192ec520c649
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

video/app/src/main/java/com/xinfu/helivideo/common/Constant.kt

@@ -35,11 +35,6 @@ object Constant {
     const val FRAGMENT_CLICK_TWO = 1
     const val FRAGMENT_CLICK_THREE = 2
 
-
-    const val VIP_REQUEST_CODE = 0x111
-
-
-
     // 协议地址
     var REGISTER_URL = "http://mints-web.mints-id.com/agreements/helivideo/yhxy.html"//注册协议
     var PRIVACY_URL = "http://mints-web.mints-id.com/agreements/helivideo/syzc.html"//隐私协议

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

 package com.xinfu.helivideo.video
 
 import android.app.Dialog
-import android.content.Intent
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
@@ -33,7 +32,9 @@ import com.xinfu.library.utils.nodoubleclick.AntiShake
 import kotlinx.android.synthetic.main.activity_tx_video.*
 
 class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
-        VideoEpisodeAdapter.OnEpisodeClickListener, TxVideoAdapter.OnCustomChildClickListener {
+    VideoEpisodeAdapter.OnEpisodeClickListener, TxVideoAdapter.OnCustomChildClickListener {
+
+    private var mVipFlag = UserManager.getInstance().vipFlag
 
     var videos = ArrayList<VedioEpisodeBean>()
 
@@ -75,6 +76,13 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
     override fun onResume() {
         super.onResume()
         super_short_video_view.resume()
+
+        if (mVipFlag != UserManager.getInstance().vipFlag && UserManager.getInstance().vipFlag) {
+            // 重置状态
+            isPlayNext = false
+            playIndex = super_short_video_view.currentPosition
+            mVedioBean?.let { videoPresenter.getIndexList("" + it.vedioId) }
+        }
     }
 
     override fun onPause() {
@@ -91,9 +99,9 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
 
     private fun initView() {
         episode_tv.text = String.format(
-                "共%d集  %s",
-                mVedioBean?.vedioTotal,
-                if (mVedioBean?.completeStatus == 0) "已完结" else "更新中"
+            "共%d集  %s",
+            mVedioBean?.vedioTotal,
+            if (mVedioBean?.completeStatus == 0) "已完结" else "更新中"
         )
 
         super_short_video_view.setOnCustomChildClickListener(this)
@@ -242,18 +250,18 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
                 // 看广告解锁
                 val carrierType = Constant.CARRIERTYPE_TX_VEDIO
                 AdManager.instance.showAd(this, carrierType,
-                        object : AdStatusListener {
-                            var canFail = false
-                            override fun adSuccess() {
-                                canFail = true
-                            }
-
-                            override fun adFail() {
-                                if (canFail) return
-
-                                NoPreAdManager.loadVideoAd(
-                                        this@TxVideoActivity,
-                                        carrierType, object : AdStatusListener {
+                    object : AdStatusListener {
+                        var canFail = false
+                        override fun adSuccess() {
+                            canFail = true
+                        }
+
+                        override fun adFail() {
+                            if (canFail) return
+
+                            NoPreAdManager.loadVideoAd(
+                                this@TxVideoActivity,
+                                carrierType, object : AdStatusListener {
                                     override fun adFail() {
                                         showToast("广告太火爆了，请稍候再试")
                                     }
@@ -268,16 +276,16 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
                                         }
                                     }
                                 })
-                            }
+                        }
 
-                            override fun adClose(vo: HashMap<String, Any>?) {
-                                vo?.let {
-                                    vo["vedioId"] = mVedioBean!!.vedioId
-                                    videoPresenter.unlock(vo)
-                                }
+                        override fun adClose(vo: HashMap<String, Any>?) {
+                            vo?.let {
+                                vo["vedioId"] = mVedioBean!!.vedioId
+                                videoPresenter.unlock(vo)
                             }
+                        }
 
-                        })
+                    })
             }
 
             R.id.vip -> {
@@ -285,7 +293,7 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
                 val bundle = Bundle()
                 bundle.putString(VipActivity.VEDIO_ID, mVedioBean!!.vedioId.toString())
                 bundle.putString(VipActivity.THIRD_ID, mVedioBean!!.thirdId)
-                readyGoForResult(VipActivity::class.java, Constant.VIP_REQUEST_CODE, bundle)
+                readyGo(VipActivity::class.java, bundle)
             }
 
             else -> {}
@@ -300,25 +308,12 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
         }
 
         VipCountDialog(this, mVedioBean!!, tipList)
-                .setOnDialogDismiss(object : VipCountDialog.OnDialogDismiss {
-                    override fun onDialogDismiss() {}
-                })
-                .show()
+            .setOnDialogDismiss(object : VipCountDialog.OnDialogDismiss {
+                override fun onDialogDismiss() {}
+            })
+            .show()
 
     }
 
     private fun getPosition() = super_short_video_view.currentPosition
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        if (requestCode == Constant.VIP_REQUEST_CODE) {
-            if (UserManager.getInstance().vipFlag) {
-                // 重置状态
-                isPlayNext = false
-                playIndex = super_short_video_view.currentPosition
-                mVedioBean?.let { videoPresenter.getIndexList("" + it.vedioId) }
-            }
-        }
-    }
-
 }
\ No newline at end of file