代码优化

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/common/Constant.kt

@@ -14,6 +14,7 @@ object Constant {
     const val LOAN_PERMISSION_FLAG = "loan_permission_flag"
     const val FIRST_SPLASH = "first_splash"
     const val IS_FIRST_AGREE_BTN = "is_first_agree_btn"
+    const val IS_FIRST_VIP_BTN = "is_first_agree_btn"
     const val TAG_NAME = "SUN"
     const val MINTS_APP_NAME = "河狸短视频"
     const val MINTS_PKG_NAME = "com.mints.wisdomclean"

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

@@ -20,6 +20,7 @@ import com.mints.wisdomclean.ui.widgets.PowerDialog
 import com.mints.wisdomclean.ui.widgets.PowerDialog2
 import com.mints.wisdomclean.ui.widgets.countdowntimer.CountDownTimerSupport
 import com.mints.wisdomclean.ui.widgets.countdowntimer.OnCountDownTimerListener
+import com.mints.wisdomclean.utils.AppPreferencesManager
 import com.mints.wisdomclean.utils.AppPreferencesManager.get
 import com.mints.wisdomclean.utils.LogUtil
 import java.util.*
@@ -143,7 +144,10 @@ class SplashActivity : BaseActivity() {
      */
     private fun goToMainActivity() {
 //        if (UserManager.getInstance().newFlag && !UserManager.getInstance().vipFlag) {
-        if (!UserManager.getInstance().vipFlag) {
+
+        val vipEnter = AppPreferencesManager.get().getBoolean(Constant.IS_FIRST_VIP_BTN, false)
+
+        if (!UserManager.getInstance().vipFlag && !vipEnter) {
             // 匹配用户 且 不是vip
             val bundle = Bundle()
             bundle.putBoolean(VipActivity.IS_GUIDE, true)

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

@@ -96,7 +96,9 @@ class SplashAdActivity : BaseActivity() {
      */
     private fun goToMainActivity() {
 //        if (UserManager.getInstance().newFlag&&!UserManager.getInstance().vipFlag) {
-        if (!UserManager.getInstance().vipFlag) {
+        val vipEnter = AppPreferencesManager.get().getBoolean(Constant.IS_FIRST_VIP_BTN, false)
+
+        if (!UserManager.getInstance().vipFlag && !vipEnter) {
             // 匹配用户 且 不是vip
             val bundle = Bundle()
             bundle.putBoolean(VipActivity.IS_GUIDE, true)

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

@@ -32,6 +32,7 @@ import com.mints.wisdomclean.ui.activitys.base.BaseActivity
 import com.mints.wisdomclean.ui.adapter.VipAdapter
 import com.mints.wisdomclean.ui.widgets.*
 import com.mints.library.utils.nodoubleclick.AntiShake
+import com.mints.wisdomclean.utils.AppPreferencesManager
 import kotlinx.android.synthetic.main.activity_vip.*
 import kotlinx.android.synthetic.main.header_layout.*
 
@@ -77,6 +78,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, VipAdapter.On
 
     override fun initViewsAndEvents() {
         vipPresenter.attachView(this)
+        AppPreferencesManager.get().put(Constant.IS_FIRST_VIP_BTN, true)
         if (!TextUtils.isEmpty(UserManager.getInstance().userID)) {
             vipPresenter.getVipProducts(isAliPayInstalled())
         } else {

video/app/src/main/java/com/mints/wisdomclean/ui/adapter/FollowAdapter.kt

@@ -9,6 +9,7 @@ import com.chad.library.adapter.base.viewholder.BaseViewHolder
 import com.mints.library.utils.GlideUtils
 import com.mints.wisdomclean.R
 import com.mints.wisdomclean.mvp.model.VedioBean
+import kotlinx.android.synthetic.main.fragment_main.*
 
 /**
  *  @author Assen
@@ -27,7 +28,7 @@ class FollowAdapter(var activity: Activity) :
         }
         holder.getView<View>(R.id.fm_mask).visibility = if (showEdit) View.VISIBLE else View.GONE
         holder.getView<TextView>(R.id.title_tv).text = item.title
-        holder.getView<TextView>(R.id.info_tv).text = item.vedioDesc
+        holder.getView<TextView>(R.id.info_tv).text =  "观看至第${item.seeIndex}集"
         holder.getView<TextView>(R.id.complete_tv).text =
             if (item.completeStatus == 0) "已完结" else "更新中"
         GlideUtils.loadImageViewNoAnim2(context, item.coverImage, holder.getView(R.id.image_iv))

video/app/src/main/java/com/mints/wisdomclean/ui/fragment/MainFragment.kt

@@ -43,7 +43,9 @@ import kotlin.concurrent.schedule
  */
 class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnRefreshListener {
 
-    private var mSelectTabIndex = -1
+    companion object{
+        var mSelectTabIndex = -1
+    }
     private val tabsData = mutableListOf<HotStyleTypesBean>()
     private val bannerList = mutableListOf<BannerBean>()
     private val topList = mutableListOf<VedioBean>()

video/app/src/main/java/com/mints/wisdomclean/ui/fragment/MovieFragment.kt

 package com.mints.wisdomclean.ui.fragment
 
 import android.os.Bundle
+import android.os.Handler
 import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.GridLayoutManager
@@ -59,19 +60,9 @@ class MovieFragment : LazyLoadBaseFragment(), PicContentView, OnLoadMoreListener
 
         initView()
         initListener()
-
         onRefresh()
     }
 
-    override fun onHiddenChanged(hidden: Boolean) {
-        if (hidden) { // 不在最前端界面显示
-            onPause()
-        } else { // 重新显示到最前端中
-            onResume()
-        }
-        super.onHiddenChanged(hidden)
-    }
-
     override fun onDestroy() {
         super.onDestroy()
         picContentPresenter.detachView()

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

@@ -18,6 +18,7 @@ import com.mints.wisdomclean.MintsApplication
 import com.mints.wisdomclean.R
 import com.mints.wisdomclean.ad.AdManager
 import com.mints.wisdomclean.ad.AdStatusListener
+import com.mints.wisdomclean.ad.NoPreAdManager
 import com.mints.wisdomclean.common.Constant
 import com.mints.wisdomclean.manager.LocalVedioManager
 import com.mints.wisdomclean.mvp.model.IndexList
@@ -133,8 +134,7 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
         drama = outerDrama
         drama?.let {
             LogUtil.d("BBBBB -> " + mVedioBean!!.seeIndex)
-//            it.index = mVedioBean!!.seeIndex
-            it.index = 5
+            it.index = mVedioBean!!.seeIndex
             mInitUnlockIndex = mVedioBean!!.unlockIndex
             mUnlockIndexMap[it.id] = mInitUnlockIndex
             title_tv.text = it.title
@@ -370,15 +370,51 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
 
             dpWidget?.let { widget ->
                 unlockBtn?.setOnClickListener {
-                    AdManager.instance.showAd(
-                        this@DramaApiDetailActivity,
-                        "",
+
+                    AdManager.instance.showAd(this@DramaApiDetailActivity, "",
                         object : AdStatusListener {
+                            var canFail = false
                             override fun adSuccess() {
-
+                                canFail = true
                             }
 
                             override fun adFail() {
+                                if (canFail) return
+
+                                NoPreAdManager.loadVideoAd(
+                                    this@DramaApiDetailActivity,
+                                    "", object : AdStatusListener {
+                                        override fun adFail() {
+                                            showToast("广告太火爆了，请稍候再试")
+                                        }
+
+                                        override fun adSuccess() {
+                                        }
+
+                                        override fun adClose(vo: HashMap<String, Any>?) {
+                                            vo?.let {
+                                                if (isThirdId) {
+                                                    it["thirdId"] = "" + mVedioBean!!.thirdId
+                                                } else {
+                                                    it["vedioId"] = "" + mVedioBean!!.vedioId
+                                                }
+                                                videoPresenter.unlock(it)
+                                            }
+
+
+                                            // 更新解锁集数
+                                            for (i in 0 until lockSet) {
+                                                val hasUnlockList: MutableList<Int> =
+                                                    mHasUnlockIndexMap[drama.id] ?: mutableListOf()
+                                                hasUnlockList.add(widget.currentDramaIndex + lockSet)
+                                                mHasUnlockIndexMap[drama.id] = hasUnlockList
+                                            }
+                                            mUnlockIndexMap[drama.id] = mUnlockIndexMap[drama.id]!! + lockSet
+
+                                            blockView?.visibility = View.GONE
+                                            callback?.onDramaRewardArrived() // 解锁当前集
+                                        }
+                                    })
                             }
 
                             override fun adClose(vo: HashMap<String, Any>?) {
@@ -404,10 +440,7 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
                                 blockView?.visibility = View.GONE
                                 callback?.onDramaRewardArrived() // 解锁当前集
                             }
-
                         })
-
-
                 }
 
             }

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

@@ -2,16 +2,14 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingTop="68dp"
-    android:background="@color/white">
+    android:paddingTop="68dp">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_follow"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:background="@color/full_transparent"
+        android:overScrollMode="never" />
 
 </FrameLayout>
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="240dp">
+    android:layout_width="wrap_content"
+    android:layout_marginBottom="10dp"
+    android:layout_marginLeft="3dp"
+    android:layout_marginRight="3dp"
+    android:layout_height="wrap_content">
 
     <ImageView
         android:id="@+id/image_iv"
-        android:layout_width="106dp"
-        android:layout_height="180dp"
+        android:layout_width="110dp"
+        android:layout_height="150dp"
         android:scaleType="fitXY"
         android:src="@mipmap/ic_launcher_main"
         app:layout_constraintEnd_toEndOf="parent"
@@ -52,8 +55,8 @@
 
     <FrameLayout
         android:id="@+id/fm_mask"
-        android:layout_width="106dp"
-        android:layout_height="240dp"
+        android:layout_width="110dp"
+        android:layout_height="wrap_content"
         android:background="@drawable/shape_half_trans2"
         app:layout_constraintEnd_toEndOf="@id/image_iv"
         app:layout_constraintStart_toStartOf="@id/image_iv"
@@ -68,7 +71,7 @@
             android:button="@null"
             android:drawableEnd="@drawable/selector_cb"
             android:paddingEnd="6dp"
-            android:paddingBottom="196dp" />
+            android:paddingBottom="190dp" />
 
     </FrameLayout>