代码优化

video/.idea/compiler.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="15" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file

video/.idea/misc.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_15" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

video/app/src/main/java/com/mints/wisdomclean/mvp/presenters/VipPresenter.kt

@@ -41,7 +41,6 @@ class VipPresenter : BasePresenter<VipView>() {
                         val data: UserBean? = baseResponse.getData()
                         when (code) {
                             200 -> if (data != null) {
-
                                 UserManager.getInstance().saveUserInfo(data)
                                 saveTerminalInfo(isInstallAlipay)
                             }

video/app/src/main/java/com/mints/wisdomclean/ui/activitys/VipActivity.kt

@@ -50,6 +50,8 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, VipAdapter.On
         const val wxAppId = BuildConfig.WEIXIN_APP_PAY_ID
         const val WEIXIN_PAY = "WEIXIN_PAY"
         const val ALIPAY = "ALIPAY"
+        const val THIRD_ID = "THIRD_ID"
+        const val VEDIO_ID = "VEDIO_ID"
     }
 
     private var breathAnim: YoYo.YoYoString? = null
@@ -63,6 +65,8 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, VipAdapter.On
     private var isCheckAgreeFlag: Boolean = true
     private var isGuide: Boolean = false// 从启动页进入vip界面，返回时要回到首页
     private var payType = ALIPAY// 支付类型
+    private var vedioId = ""
+    private var thirdId = ""
 
 
     override fun getContentViewLayoutID() = R.layout.activity_vip
@@ -73,6 +77,8 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, VipAdapter.On
         super.getBundleExtras(extras)
         extras?.let {
             isGuide = it.getBoolean(IS_GUIDE, false)
+            thirdId = it.getString(THIRD_ID, "")
+            vedioId = it.getString(VEDIO_ID, "")
         }
     }
 

video/app/src/main/java/com/mints/wisdomclean/ui/widgets/VipCountDialog.kt

@@ -3,17 +3,19 @@ package com.mints.wisdomclean.ui.widgets
 import android.app.Activity
 import android.app.Dialog
 import android.content.Intent
+import android.os.Bundle
 import android.view.Gravity
 import android.view.KeyEvent
 import android.view.View
 import android.view.WindowManager
 import android.widget.TextView
 import com.mints.wisdomclean.R
+import com.mints.wisdomclean.mvp.model.VedioBean
 import com.mints.wisdomclean.ui.activitys.VipActivity
 import com.mints.wisdomclean.ui.widgets.countdowntimer.CountDownTimerSupport
 import com.mints.wisdomclean.ui.widgets.countdowntimer.OnCountDownTimerListener
 
-class VipCountDialog(activity: Activity) : Dialog(activity, R.style.dialog) {
+class VipCountDialog(activity: Activity, vedioBean: VedioBean) : Dialog(activity, R.style.dialog) {
 
     private val lp: WindowManager.LayoutParams
     var timer: CountDownTimerSupport? = null
@@ -51,7 +53,10 @@ class VipCountDialog(activity: Activity) : Dialog(activity, R.style.dialog) {
 
 
         fm.setOnClickListener {
-            activity.startActivity(Intent(activity, VipActivity::class.java))
+            val bundle= Bundle()
+            bundle.putString(VipActivity.VEDIO_ID,vedioBean.vedioId.toString())
+            bundle.putString(VipActivity.THIRD_ID,vedioBean.thirdId)
+            readyGo(activity, VipActivity::class.java,bundle)
             dismiss()
         }
     }
@@ -79,4 +84,11 @@ class VipCountDialog(activity: Activity) : Dialog(activity, R.style.dialog) {
     }
 
 
+    fun readyGo(activity: Activity,clazz: Class<*>?, bundle: Bundle?) {
+        val intent = Intent(activity, clazz)
+        if (null != bundle) {
+            intent.putExtras(bundle)
+        }
+        activity.startActivity(intent)
+    }
 }
\ No newline at end of file

video/app/src/main/java/com/mints/wisdomclean/video/DramaApiDetailActivity.kt

@@ -176,7 +176,10 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
                 finish()
             }
             vipBtn?.setOnClickListener {
-                readyGo(VipActivity::class.java)
+                val bundle= Bundle()
+                bundle.putString(VipActivity.VEDIO_ID,mVedioBean!!.vedioId.toString())
+                bundle.putString(VipActivity.THIRD_ID,mVedioBean!!.thirdId)
+                readyGo(VipActivity::class.java,bundle)
             }
         }
 
@@ -604,7 +607,7 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
 
     private fun showVipCountDialog(position: Int) {
         if (mVedioBean!!.tipMaxIndex == 0 || mVedioBean!!.tipMaxIndex - 1 < position) return
-        VipCountDialog(this)
+        VipCountDialog(this, mVedioBean!!)
             .setOnDialogDismiss(object : VipCountDialog.OnDialogDismiss {
                 override fun onDialogDismiss() {
 

video/app/src/main/java/com/mints/wisdomclean/video/VideoActivity.kt

 package com.mints.wisdomclean.video
 
 import android.app.Dialog
+import android.content.Intent
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
@@ -30,7 +31,6 @@ import com.mints.wisdomclean.ui.widgets.DialogListener
 import com.mints.wisdomclean.ui.widgets.VideoEpisodeDialog
 import com.mints.wisdomclean.ui.widgets.VipCountDialog
 import kotlinx.android.synthetic.main.activity_video.*
-import java.util.HashMap
 
 class VideoActivity : BaseActivity(), View.OnClickListener, VideoView,
     VideoEpisodeAdapter.OnEpisodeClickListener, VideoAdapter.OnCustomChildClickListener {
@@ -359,7 +359,10 @@ class VideoActivity : BaseActivity(), View.OnClickListener, VideoView,
             }
             R.id.vip -> {
                 // 开通VIP
-                readyGo(VipActivity::class.java)
+                val bundle= Bundle()
+                bundle.putString(VipActivity.VEDIO_ID,mVedioBean!!.vedioId.toString())
+                bundle.putString(VipActivity.THIRD_ID,mVedioBean!!.thirdId)
+                readyGo(VipActivity::class.java,bundle)
             }
             else -> {}
         }
@@ -372,7 +375,7 @@ class VideoActivity : BaseActivity(), View.OnClickListener, VideoView,
             autoPlayVideo()
             return
         }
-        VipCountDialog(this)
+        VipCountDialog(this, mVedioBean!!)
             .setOnDialogDismiss(object : VipCountDialog.OnDialogDismiss {
                 override fun onDialogDismiss() {
                     autoPlayVideo()

video/app/src/main/res/layout/activity_splash.xml

@@ -6,11 +6,11 @@
 
     <ImageView
         android:id="@+id/app_logo"
-        android:layout_width="80dp"
-        android:layout_height="80dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="140dp"
-        android:src="@mipmap/ic_launcher_main" />
+        android:src="@mipmap/ic_splash_pic" />
 
     <TextView
         android:layout_width="wrap_content"

video/app/src/main/res/layout/fragment_main.xml

@@ -166,7 +166,8 @@
             android:layout_margin="5dp" />
 
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
+            android:layout_weight="1"
             android:layout_height="wrap_content"
             android:layout_marginLeft="4dp"
             android:orientation="vertical">
@@ -203,7 +204,7 @@
         </LinearLayout>
 
         <RelativeLayout
-            android:layout_width="wrap_content"
+            android:layout_width="100dp"
             android:layout_height="match_parent">
 
             <ImageView

video/app/src/main/res/layout/item_block_view.xml

@@ -10,6 +10,11 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#99000000">
+
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -20,29 +25,31 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-            android:layout_marginBottom="10dp"
+                android:layout_marginBottom="30dp"
                 android:text="试看已结束"
                 android:textColor="@color/white"
                 android:textSize="16sp" />
 
             <Button
                 android:id="@+id/unlock"
-            android:layout_width="280dp"
-            android:layout_height="40dp"
-            android:layout_marginBottom="10dp"
-            android:background="@drawable/shape_red"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="20dp"
+                android:background="@mipmap/bg_detail_top"
                 android:text="看广告解锁1集"
                 android:textColor="@color/white" />
 
             <Button
                 android:id="@+id/vip"
-            android:layout_width="280dp"
-            android:layout_height="40dp"
-            android:background="@drawable/shape_green"
-            android:text="开通会员"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@mipmap/bg_detail_bottom"
                 android:textColor="@color/white" />
 
         </LinearLayout>
+    </FrameLayout>
+
+
 
     <ImageView
         android:id="@+id/leave"