Skip to content

A
android_vedio
Commit 71752e8b authored by mengcuiguang2's avatar mengcuiguang2
Browse files
Options

代码优化

parent 6017830f
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 5 deletions
video/app/src/main/java/com/mints/wisdomclean/video/VideoActivity.kt
View file @ 71752e8b
...@@ -374,12 +374,7 @@ class VideoActivity : BaseActivity(), View.OnClickListener, VideoView, ...@@ -374,12 +374,7 @@ class VideoActivity : BaseActivity(), View.OnClickListener, VideoView,
private fun showVipCountDialog(position: Int) { private fun showVipCountDialog(position: Int) {
if (isFinishing) return if (isFinishing) return
<<<<<<< HEAD
// mVedioBean!!.tipMaxIndex=5
if (mVedioBean!!.tipMaxIndex == 0 || mVedioBean!!.tipMaxIndex - 1 < position) {
=======
if (position == 0 || mVedioBean!!.tipMaxIndex == 0 || mVedioBean!!.tipMaxIndex - 1 < position) { if (position == 0 || mVedioBean!!.tipMaxIndex == 0 || mVedioBean!!.tipMaxIndex - 1 < position) {
>>>>>>> 28adc26b9eca95e7af32fac4947e11386e2e939f
autoPlayVideo() autoPlayVideo()
return return
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment