代码优化

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/DramaApiDetailActivity.kt

 package com.xinfu.helivideo.video
 
 import android.app.Dialog
-import android.content.Intent
 import android.os.Bundle
 import android.util.Log
-import android.view.KeyEvent
 import android.view.View
 import android.widget.Button
 import android.widget.ImageView
@@ -53,6 +51,8 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
 
     private val videoPresenter by lazy { VideoPresenter() }
 
+    private var mVipFlag = UserManager.getInstance().vipFlag
+
     private var dpWidget: IDPWidget? = null
     private var isInited = false
     private var drama: DPDrama? = null
@@ -192,7 +192,7 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
                 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)
             }
         }
 
@@ -228,6 +228,14 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
         super.onDestroy()
     }
 
+    override fun onResume() {
+        super.onResume()
+        if (mVipFlag != UserManager.getInstance().vipFlag && UserManager.getInstance().vipFlag) {
+            // 重置状态
+            resetData()
+        }
+    }
+
     override fun onPause() {
         super.onPause()
     }
@@ -655,9 +663,7 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
         view.setImageDrawable(lottieDrawable)
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        if (requestCode == Constant.VIP_REQUEST_CODE) {
+    private fun resetData() {
         if (UserManager.getInstance().vipFlag) {
             mVedioBean?.let {
 
@@ -697,7 +703,6 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
                 }
             }
         }
-        }
-    }
 
+    }
 }
\ No newline at end of file

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
@@ -35,6 +34,8 @@ import kotlinx.android.synthetic.main.activity_tx_video.*
 class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
     VideoEpisodeAdapter.OnEpisodeClickListener, TxVideoAdapter.OnCustomChildClickListener {
 
+    private var mVipFlag = UserManager.getInstance().vipFlag
+
     var videos = ArrayList<VedioEpisodeBean>()
 
     private var dialog: VideoEpisodeDialog? = null
@@ -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() {
@@ -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 -> {}
@@ -308,17 +316,4 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
     }
 
     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