代码优化

71752e8b · mengcuiguang2 · 6017830f · 71752e8b
Commit 71752e8b authored Jul 13, 2023 by mengcuiguang2
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

VideoActivity.kt ...rc/main/java/com/mints/wisdomclean/video/VideoActivity.kt +0 -5

No files found.
--- a/video/app/src/main/java/com/mints/wisdomclean/video/VideoActivity.kt
+++ b/video/app/src/main/java/com/mints/wisdomclean/video/VideoActivity.kt
@@ -374,12 +374,7 @@ class VideoActivity : BaseActivity(), View.OnClickListener, VideoView,
    private fun showVipCountDialog(position: Int) {
        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) {
->>>>>>> 28adc26b9eca95e7af32fac4947e11386e2e939f
            autoPlayVideo()
            return
        }