From 40c5ece181317b77c560d20986bf10f78f8f4c53 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 23 Jun 2022 01:00:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BF=AE=E6=94=B9Activity?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9A=84=E4=BB=A3=E7=A0=81=20=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=86=85=E5=AD=98=E6=B3=84=E6=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/video/RecyclerVideoAdapter.java        |  5 +-
 .../ui/video/TaxiPassengerMogoConsultView.kt  |  2 -
 .../passenger/widget/ConsultVideoPlayer.kt    | 56 ++++++-------------
 3 files changed, 20 insertions(+), 43 deletions(-)

diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerVideoAdapter.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerVideoAdapter.java
index 33e5186b91..1cfb659a75 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerVideoAdapter.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerVideoAdapter.java
@@ -39,7 +39,9 @@ public class RecyclerVideoAdapter extends RecyclerView.Adapter<RecyclerItemVideo
     @Override
     public RecyclerItemVideoHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         View v = LayoutInflater.from(context).inflate(R.layout.list_video_item_normal, parent, false);
-        return new RecyclerItemVideoHolder(context, v);
+        RecyclerItemVideoHolder recyclerItemVideoHolder = new RecyclerItemVideoHolder(context, v);
+        recyclerItemVideoHolder.setIsRecyclable(false);
+        return recyclerItemVideoHolder;
     }
 
     @Override
@@ -47,6 +49,7 @@ public class RecyclerVideoAdapter extends RecyclerView.Adapter<RecyclerItemVideo
         final TaxiPassengerVideoPlay taxiPassengerVideoPlay = itemDataList.get(position);
 
         holder.gsyVideoOptionBuilder
+                .setEnlargeImageRes(R.drawable.taxi_p_change_full)
                 .setUrl(taxiPassengerVideoPlay.getUrl())
                 .setCacheWithPlay(true)
                 .setPlayTag(taxiPassengerVideoPlay.getImageUrl()+position)
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoConsultView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoConsultView.kt
index d38f23211e..5b2eeef1fc 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoConsultView.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoConsultView.kt
@@ -201,8 +201,6 @@ class TaxiPassengerMogoConsultView :RelativeLayout {
                 player.onVideoReset()
             }
         }
-        FullVideoUtils.dismissOverlayView()
-
     }
 
     companion object {
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt
index 2abfc617d0..82afc85927 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt
@@ -13,7 +13,6 @@ import com.mogo.eagle.core.utilcode.util.TimeTransformUtils
 import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider
 import com.mogo.och.taxi.passenger.R
 import com.mogo.och.taxi.passenger.ui.video.FullVideoUtils
-import com.shuyu.gsyvideoplayer.utils.CommonUtil
 import com.shuyu.gsyvideoplayer.utils.Debuger
 import com.shuyu.gsyvideoplayer.utils.GSYVideoType
 import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer
@@ -37,6 +36,8 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
     private lateinit var tvTitle: TextView
     private lateinit var layoutBottom: ConstraintLayout
 
+    private var fullVideoPlayer:ConsultVideoPlayer?=null
+
     constructor(context: Context?) : super(context)
     constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs)
     constructor(context: Context?, fullFlag: Boolean?) : super(context, fullFlag)
@@ -114,7 +115,14 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
         mFullPauseBitmap = null
         if(mIfCurrentIsFullscreen){
             FullVideoUtils.dismissOverlayView()
-            clearFullscreenLayout()
+            fullVideoPlayer?.let {
+                clearFullscreenLayout(it)
+            }
+            onVideoReset()
+            if (thumbImageView is ImageView) {
+                (thumbImageView as ImageView).setImageResource(R.drawable.taxi_p_video_holder)
+            }
+
         }
     }
 
@@ -172,7 +180,9 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
         super.onAutoCompletion()
         if(mIfCurrentIsFullscreen){
             FullVideoUtils.dismissOverlayView()
-            clearFullscreenLayout()
+            fullVideoPlayer?.let {
+                clearFullscreenLayout(it)
+            }
         }
     }
 
@@ -184,28 +194,6 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
         }
     }
 
-    /**
-     * 保存大小和状态
-     */
-    private fun saveLocationStatus(context: Context, statusBar: Boolean, actionBar: Boolean) {
-        getLocationOnScreen(mListItemRect)
-        if (context is Activity) {
-            val statusBarH = CommonUtil.getStatusBarHeight(context)
-            val actionBerH = CommonUtil.getActionBarHeight(context)
-            val isTranslucent =
-                (WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS and context.window.attributes.flags
-                        == WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
-            if (statusBar && !isTranslucent) {
-                mListItemRect[1] = mListItemRect[1] - statusBarH
-            }
-            if (actionBar) {
-                mListItemRect[1] = mListItemRect[1] - actionBerH
-            }
-        }
-        mListItemSize[0] = width
-        mListItemSize[1] = height
-    }
-
     private fun startWindowFullscreenOwn(context:Context, actionBar:Boolean, statusBar:Boolean){
         val gsyBaseVideoPlayer = startWindowFullscreen(context, actionBar, statusBar)
         gsyBaseVideoPlayer?.let {
@@ -241,20 +229,10 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
     }
 
     override fun startWindowFullscreen(context:Context, actionBar:Boolean, statusBar:Boolean):GSYBaseVideoPlayer?{
-        mSystemUiVisibility = (context as Activity).window.decorView.systemUiVisibility
-        CommonUtil.hideSupportActionBar(context, actionBar, statusBar)
-        if (mHideKey) {
-            CommonUtil.hideNavKey(context)
-        }
-        mActionBar = actionBar
-        mStatusBar = statusBar
-        mListItemRect = IntArray(2)
-        mListItemSize = IntArray(2)
 
         if (mTextureViewContainer.childCount > 0) {
             mTextureViewContainer.removeAllViews()
         }
-        saveLocationStatus(context, statusBar, actionBar)
         var hadNewConstructor = true
 
         //切换时关闭非全屏定时器
@@ -281,6 +259,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
                 )
                 gsyVideoPlayer = constructor.newInstance(mContext, true)
             }
+            this.fullVideoPlayer = gsyVideoPlayer
             gsyVideoPlayer.id = fullId
             gsyVideoPlayer.isIfCurrentIsFullscreen = true
             gsyVideoPlayer.setVideoAllCallBack(mVideoAllCallBack)
@@ -303,7 +282,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
                 width, height
             )
             frameLayout.addView(gsyVideoPlayer, lp)
-            FullVideoUtils.showOverlayView(context,frameLayout)
+            FullVideoUtils.showOverlayView(context as Activity,frameLayout)
             gsyVideoPlayer.visibility = INVISIBLE
             frameLayout.visibility = INVISIBLE
             resolveFullVideoShow(context, gsyVideoPlayer, frameLayout)
@@ -381,13 +360,10 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
             mVideoAllCallBack.onQuitFullscreen(mOriginUrl, mTitle, this)
         }
         mIfCurrentIsFullscreen = false
-        if (mHideKey) {
-            CommonUtil.showNavKey(mContext, mSystemUiVisibility)
-        }
-        CommonUtil.showSupportActionBar(mContext, mActionBar, mStatusBar)
         if (fullscreenButton != null) {
             fullscreenButton.setImageResource(enlargeImageRes)
         }
+        this.fullVideoPlayer = null
     }
 }