代码优化

video/.idea/compiler.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="15" />
   </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_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_15" 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/ui/activitys/base/BaseActivity.java

@@ -20,6 +20,7 @@ import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 
+import com.gyf.barlibrary.ImmersionBar;
 import com.mints.wisdomclean.MintsApplication;
 import com.mints.wisdomclean.R;
 import com.mints.wisdomclean.common.Constant;
@@ -67,6 +68,10 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Base
         registerExitApp();
     }
 
+    public void statusBarDark(boolean isDark) {
+        ImmersionBar.with(this).statusBarDarkFont(isDark, 0.5f).init();
+    }
+
     @Override
     public MintsApplication getBaseApplication() {
         return (MintsApplication) getApplication();

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

@@ -186,6 +186,7 @@ class RecommendFragment : BaseFragment(), View.OnClickListener {
 
     private fun changeBottomTabColor(showBlack: Boolean) {
         (requireActivity() as MainActivity).showBlack(showBlack)
+        (requireActivity() as MainActivity).statusBarDark(!showBlack)
     }
 
     fun showEditView(show: Boolean) {
@@ -213,6 +214,8 @@ class RecommendFragment : BaseFragment(), View.OnClickListener {
 
     override fun onHiddenChanged(hidden: Boolean) {
         super.onHiddenChanged(hidden)
+        if (mSelectTabIndex == 0) return
+
         fragments[1].onHiddenChanged(hidden)
         // 传递生命周期
         if (hidden) {

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

@@ -9,6 +9,7 @@ import android.widget.Toast
 import cn.jzvd.Jzvd
 import cn.jzvd.JzvdStd
 import com.mints.wisdomclean.R
+import com.mints.wisdomclean.utils.UIUtils
 
 /**
  *  author : ChenWenJie
@@ -27,7 +28,7 @@ class JzvdStdTikTok : JzvdStd {
 
     override fun init(context: Context?) {
         super.init(context)
-        bottomContainer.visibility = View.GONE
+        bottomContainer.visibility = View.VISIBLE
         currentTimeTextView.visibility = View.GONE
         totalTimeTextView.visibility = View.GONE //当前时间
         fullscreenButton.visibility = View.GONE //放大按钮
@@ -36,6 +37,18 @@ class JzvdStdTikTok : JzvdStd {
         loadingProgressBar.visibility = View.GONE //加载loaing
         bottomProgressBar.visibility = View.VISIBLE //最底部的进度
         posterImageView.scaleType = ImageView.ScaleType.FIT_CENTER
+
+        val layoutParams = bottomProgressBar.layoutParams
+        layoutParams.height = UIUtils.dip2px(context, 5f)
+        bottomProgressBar.layoutParams = layoutParams
+        val layoutParams2 = progressBar.layoutParams
+        layoutParams.height = UIUtils.dip2px(context, 5f)
+        progressBar.layoutParams = layoutParams2
+
+        val layoutParams3 = startButton.layoutParams
+        layoutParams3.width = UIUtils.dip2px(context, 100f)
+        layoutParams3.height = UIUtils.dip2px(context, 100f)
+        startButton.layoutParams = layoutParams3
     }
 
     override fun setUp(

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

@@ -86,6 +86,9 @@ class RecommendVideoAdapter(var activity: Activity) :
         //JZUtils.clearSavedProgress(activity, path)
         jzvdStdTikTok.setUp(path, "", JzvdStd.SCREEN_NORMAL)
 
+        // 设置全屏拉伸
+        Jzvd.setVideoImageDisplayType(Jzvd.VIDEO_IMAGE_DISPLAY_TYPE_FILL_PARENT)
+
         jzvdStdTikTok.setOnVideoCompletion(onVideoCompletion)
     }
 

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

@@ -34,7 +34,7 @@ class RecyViewLayoutManager : LinearLayoutManager {
             }
 
             override fun onChildViewAttachedToWindow(view: View) {
-                if (mOnRecycleViewListener != null && getChildCount() === 1) {
+                if (mOnRecycleViewListener != null && childCount === 1) {
                     mOnRecycleViewListener!!.onInitComplete()
                 }
             }

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
@@ -59,6 +58,7 @@ class VideoActivity : BaseActivity(), View.OnClickListener, VideoView,
         } else {
             mVedioBean!!.seeIndex - 1
         }
+        if (playIndex > mVedioBean!!.vedioTotal) playIndex = 0
         mCurrentPosition = playIndex
 
         initView()
@@ -117,12 +117,10 @@ class VideoActivity : BaseActivity(), View.OnClickListener, VideoView,
         })
         recyViewLayoutManager.setOnViewPagerListener(object : OnRecyViewListener {
             override fun onInitComplete() {
-                dialog?.setCurrentIndex(mCurrentPosition)
                 //初始化 自动播放
-                if (mCurrentPosition != mVedioBean!!.seeIndex) {
+                dialog?.setCurrentIndex(mCurrentPosition)
                 showVipCountDialog(mCurrentPosition)
             }
-            }
 
             override fun onPageRelease(isNext: Boolean, position: Int) {
                 //滑动时，释放上一个
@@ -235,6 +233,7 @@ class VideoActivity : BaseActivity(), View.OnClickListener, VideoView,
         } else {
             mVedioBean!!.seeIndex - 1
         }
+        if (playIndex > mVedioBean!!.vedioTotal) playIndex = 0
 
         mVedioBean = indexList.vedioMsg
         indexBean = indexList
@@ -268,7 +267,6 @@ class VideoActivity : BaseActivity(), View.OnClickListener, VideoView,
         dialog?.changeLockStatus(videos.size)
         videos.addAll(indexList.list)
         adapter.setNewInstance(getAdapterData())
-//        adapter.notifyDataSetChanged()
     }
 
     override fun unlockFail() {
@@ -285,7 +283,6 @@ class VideoActivity : BaseActivity(), View.OnClickListener, VideoView,
         recy.scrollToPosition(position)
         Handler(Looper.getMainLooper()).postDelayed({
             showVipCountDialog(mCurrentPosition)
-//            autoPlayVideo()
         }, 300)
     }
 
@@ -362,10 +359,10 @@ class VideoActivity : BaseActivity(), View.OnClickListener, VideoView,
             }
             R.id.vip -> {
                 // 开通VIP
-                val bundle= Bundle()
-                bundle.putString(VipActivity.VEDIO_ID,mVedioBean!!.vedioId.toString())
-                bundle.putString(VipActivity.THIRD_ID,mVedioBean!!.thirdId)
-                readyGo(VipActivity::class.java,bundle)
+                val bundle = Bundle()
+                bundle.putString(VipActivity.VEDIO_ID, mVedioBean!!.vedioId.toString())
+                bundle.putString(VipActivity.THIRD_ID, mVedioBean!!.thirdId)
+                readyGo(VipActivity::class.java, bundle)
             }
             else -> {}
         }
@@ -378,6 +375,7 @@ class VideoActivity : BaseActivity(), View.OnClickListener, VideoView,
             autoPlayVideo()
             return
         }
+
         VipCountDialog(this, mVedioBean!!)
             .setOnDialogDismiss(object : VipCountDialog.OnDialogDismiss {
                 override fun onDialogDismiss() {
@@ -385,6 +383,7 @@ class VideoActivity : BaseActivity(), View.OnClickListener, VideoView,
                 }
             })
             .show()
+
     }
 
 }
\ No newline at end of file

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

@@ -115,6 +115,9 @@ class VideoAdapter(private var vedioBean: VedioBean) :
         //JZUtils.clearSavedProgress(activity, path)
         jzvdStdTikTok.setUp(path, "", JzvdStd.SCREEN_NORMAL)
 
+        // 设置全屏拉伸
+        Jzvd.setVideoImageDisplayType(Jzvd.VIDEO_IMAGE_DISPLAY_TYPE_FILL_PARENT)
+
         jzvdStdTikTok.setOnVideoCompletion(onVideoCompletion)
     }
 

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

@@ -56,7 +56,7 @@
             android:id="@+id/ll_bottom"
             android:layout_width="match_parent"
             android:layout_height="40dp"
-            android:layout_marginBottom="2dp"
+            android:layout_marginBottom="5dp"
             android:background="@color/half_transparent"
             android:gravity="center_vertical"
             android:orientation="horizontal"