Merge branch 'dev_wangzhuan_0906' of...

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

video/app/src/main/java/com/duben/dayplaylet/ui/widgets/CountDownVideoView.java

@@ -72,7 +72,7 @@ public class CountDownVideoView extends LinearLayout {
     public void reset() {
         isOver = false;
         cdCountVedioView.reset();
-        isPlaying = true;
+        isPlaying = false;
     }
 
     public void stop() {

video/app/src/main/java/com/duben/dayplaylet/video/csj/DramaApiDetailActivity.kt

@@ -204,6 +204,10 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
         videoPresenter.rdVedioMsg()
     }
 
+    private fun isLockIndex(): Boolean {
+        return mCurrentIndex > mInitUnlockIndex
+    }
+
     private var dramaListener: IDPDramaListener = object : IDPDramaListener() {
 
         override fun onDPSeekTo(position: Int, time: Long) {
@@ -224,6 +228,8 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
             }
             if (cdvv.isPlaying) {
                 cdvv.resume()
+            } else {
+                cdvv.start()
             }
         }
 
@@ -242,6 +248,8 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
 
             if (cdvv.isPlaying) {
                 cdvv.resume()
+            } else {
+                cdvv.start()
             }
         }
 
@@ -437,7 +445,9 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
             tv_tips.visibility = View.GONE
             triangle.visibility = View.GONE
             cdvv.setTime(data.surplusSeconds)
+            if (!isLockIndex()) {
                 cdvv.start()
+            }
             cdvv.setCountDownVideoListener(this)
             cl_red_box.setOnClickListener {
                 if (!cdvv.isOver) return@setOnClickListener