代码优化

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

@@ -17,6 +17,7 @@ import com.lzf.easyfloat.EasyFloat
 import com.lzf.easyfloat.anim.AppFloatDefaultAnimator
 import com.lzf.easyfloat.anim.DefaultAnimator
 import com.lzf.easyfloat.enums.SidePattern
+import com.mints.wisdomclean.MintsApplication
 import com.mints.wisdomclean.R
 import com.mints.wisdomclean.ad.AdManager
 import com.mints.wisdomclean.common.AppConfig
@@ -58,6 +59,8 @@ class MainActivity : BaseActivity(), View.OnClickListener {
     }
 
     override fun initViewsAndEvents() {
+        DPHolderManager.initDpSdk(MintsApplication.getContext());
+
         audioManager = getSystemService(Context.AUDIO_SERVICE) as AudioManager
 
         contentLayout = findViewById(R.id.content_layout)
@@ -89,7 +92,6 @@ class MainActivity : BaseActivity(), View.OnClickListener {
         initEditView()
 
         // 初始化短剧SDK
-        DPHolderManager.initDpSdk(context);
 //        initEasyFloat()
     }
 

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

-package com.mints.wisdomclean.ui.adapter
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.recyclerview.widget.RecyclerView
-import com.mints.library.utils.GlideUtils
-import com.mints.wisdomclean.R
-import com.mints.wisdomclean.mvp.model.VedioBean
-import com.mints.wisdomclean.ui.adapter.base.OnItemClickListener
-
-
-class HotStyleAdapter(val context: Context, val dataList: ArrayList<VedioBean>) :
-    RecyclerView.Adapter<HotStyleAdapter.ViewHolder>() {
-
-    lateinit var mOnItemClickListener: OnItemClickListener
-
-    inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        val ivVedioItem: ImageView = view.findViewById(R.id.ivVedioItem)
-        val tvVedioItemCount: TextView = view.findViewById(R.id.tvVedioItemCount)
-        val tvVedioItemTitle: TextView = view.findViewById(R.id.tvVedioItemTitle)
-        val tvVedioItemText: TextView = view.findViewById(R.id.tvVedioItemText)
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val view = LayoutInflater.from(context).inflate(R.layout.item_hot_style, parent, false)
-        return ViewHolder(view)
-    }
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-
-        val topBean = dataList?.get(position)
-        if (topBean != null) {
-            holder.tvVedioItemCount.text =
-                "${if (topBean.completeStatus == 0) "已完结" else "更新至${topBean.vedioTotal}集"}"
-            holder.tvVedioItemTitle.text = "${topBean.title}"
-            holder.tvVedioItemText.text = "${topBean.vedioDesc}"
-            GlideUtils.loadImageViewGifForFitCenter(
-                context,
-                topBean.coverImage,
-                holder.ivVedioItem
-            )
-        }
-
-        holder.itemView.setOnClickListener {
-            mOnItemClickListener.onItemClick(holder.itemView, position)
-        }
-
-        holder.itemView.setTag(position)
-    }
-
-    override fun getItemCount(): Int = dataList.size
-
-    fun setOnItemClickListener(listener: OnItemClickListener) {
-        mOnItemClickListener = listener
-    }
-}
\ No newline at end of file

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

+package com.mints.wisdomclean.ui.adapter
+
+import com.chad.library.adapter.base.BaseQuickAdapter
+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
+
+class NewHotStyleAdapter : BaseQuickAdapter<VedioBean, BaseViewHolder>(R.layout.item_hot_style) {
+    override fun convert(holder: BaseViewHolder, item: VedioBean) {
+        holder.setText(
+            R.id.tvVedioItemCount,
+            "${if (item.completeStatus == 0) "已完结" else "更新至${item.vedioTotal}集"}"
+        )
+        holder.setText(
+            R.id.tvVedioItemTitle,
+            "${item.title}"
+        )
+        holder.setText(
+            R.id.tvVedioItemText,
+            "${item.vedioDesc}"
+        )
+        GlideUtils.loadImageViewGifForFitCenter(
+            context,
+            item.coverImage,
+            holder.getView(R.id.ivVedioItem)
+        )
+
+    }
+
+}
\ No newline at end of file

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

 package com.mints.wisdomclean.ui.fragment
 
 import android.os.Bundle
-import android.view.View
+import android.view.LayoutInflater
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.GridLayoutManager
 import com.mints.wisdomclean.R
@@ -10,8 +10,7 @@ import com.mints.wisdomclean.manager.LocalVedioManager
 import com.mints.wisdomclean.mvp.model.*
 import com.mints.wisdomclean.mvp.presenters.PicContentPresenter
 import com.mints.wisdomclean.mvp.views.PicContentView
-import com.mints.wisdomclean.ui.adapter.HotStyleAdapter
-import com.mints.wisdomclean.ui.adapter.base.OnItemClickListener
+import com.mints.wisdomclean.ui.adapter.NewHotStyleAdapter
 import com.mints.wisdomclean.ui.fragment.base.LazyLoadBaseFragment
 import com.scwang.smartrefresh.layout.api.RefreshLayout
 import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener
@@ -41,8 +40,7 @@ class MovieFragment : LazyLoadBaseFragment(), PicContentView, OnLoadMoreListener
 
     private var hotPage = 1 // 分页
     private val hotList: ArrayList<VedioBean> = arrayListOf()
-    private lateinit var hotStyleAdapter: HotStyleAdapter
-    private var mCurrentPosition = 0
+    private lateinit var hotStyleAdapter: NewHotStyleAdapter
 
     override fun getContentViewLayoutID() = R.layout.fragment_movie
 
@@ -97,7 +95,7 @@ class MovieFragment : LazyLoadBaseFragment(), PicContentView, OnLoadMoreListener
                 } else {
                     srlMainPage.finishLoadMore()
                 }
-                hotStyleAdapter.notifyItemChanged(data.list.size)
+                hotStyleAdapter.notifyItemChanged(data.list.size + 1)
             }
         }
     }
@@ -108,18 +106,20 @@ class MovieFragment : LazyLoadBaseFragment(), PicContentView, OnLoadMoreListener
     private fun initView() {
         val gridLayoutManager = GridLayoutManager(context, 3)
         rv_pic_list.layoutManager = gridLayoutManager
-        hotStyleAdapter = HotStyleAdapter(requireContext(), hotList)
+        hotStyleAdapter = NewHotStyleAdapter()
         rv_pic_list.adapter = hotStyleAdapter
-        hotStyleAdapter.setOnItemClickListener(object : OnItemClickListener {
-            override fun onItemClick(view: View?, position: Int) {
-                if (hotList.size > 0) {
-                    LocalVedioManager.startVedioDetailActivityForType(
-                        requireActivity(),
-                        hotList.get(position)
-                    )
-                }
+        val emptyView =
+            LayoutInflater.from(requireContext()).inflate(R.layout.item_empty_data, null)
+        hotStyleAdapter.setEmptyView(emptyView)
+        hotStyleAdapter.setNewInstance(hotList)
+        hotStyleAdapter.setOnItemClickListener { adapter, view, position ->
+            if (hotList.size > 0) {
+                LocalVedioManager.startVedioDetailActivityForType(
+                    requireActivity(),
+                    hotList[position]
+                )
             }
-        })
+        }
     }
 
     private fun initListener() {

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

@@ -58,6 +58,7 @@ class WatchVideoFragment : BaseFragment(), RecommendView {
         adapter.setOnItemChildClickListener { adapter, view, position ->
             when (view.id) {
                 R.id.ll_bottom -> {
+                    Jzvd.goOnPlayOnPause()
                     videos[position].seeIndex++
                     LocalVedioManager.startVedioDetailActivityForType(
                         requireActivity(),
@@ -81,8 +82,8 @@ class WatchVideoFragment : BaseFragment(), RecommendView {
         }
         adapter.setOnVideoCompletion(object : JzvdStdTikTok.OnVideoCompletion {
             override fun onVideoCompletion() {
-                showToast("即将为您播放下一集")
-
+//                showToast("即将为您播放下一集")
+                Jzvd.goOnPlayOnPause()
                 videos[mCurrentPosition].seeIndex++
                 LocalVedioManager.startVedioDetailActivityForType(
                     requireActivity(),

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

@@ -32,6 +32,8 @@ 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.drama_activity_api_detail.*
+import kotlinx.android.synthetic.main.drama_activity_api_detail.episode_tv
+import kotlinx.android.synthetic.main.drama_activity_api_detail.fm_bottom
 import org.json.JSONObject
 
 /**
@@ -438,6 +440,7 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
                                     hasUnlockList.add(widget.currentDramaIndex + i)
                                     mHasUnlockIndexMap[drama.id] = hasUnlockList
                                 }
+                                mInitUnlockIndex = mUnlockIndexMap[drama.id]!! + lockSet
                                 mUnlockIndexMap[drama.id] = mUnlockIndexMap[drama.id]!! + lockSet
 
                                 blockView?.visibility = View.GONE
@@ -509,7 +512,13 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
 
     override fun onEpisodeClick(position: Int) {
         dialog?.dismiss()
-        if (position > mInitUnlockIndex) return
+        if (position > mInitUnlockIndex) {
+            dpWidget?.let { widget ->
+                lastIndex = mInitUnlockIndex + 1
+                widget.currentDramaIndex = mInitUnlockIndex + 1
+            }
+            return
+        }
         dpWidget?.let { widget ->
             widget.currentDramaIndex = position + 1
         }

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

@@ -274,6 +274,8 @@ class VideoActivity : BaseActivity(), View.OnClickListener, VideoView,
     override fun onEpisodeClick(position: Int) {
         dialog?.dismiss()
         if (position >= mVedioBean!!.unlockIndex) {
+            mCurrentPosition = mVedioBean!!.unlockIndex
+            recy.scrollToPosition(mCurrentPosition)
             return
         }
         mCurrentPosition = position

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

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:text="暂无数据"
+        android:textColor="@color/black"
+        android:textSize="18sp" />
+</RelativeLayout>
\ No newline at end of file