From a079ba23337201323575099729e907aeaa375cfd Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Mon, 31 Jul 2023 16:37:26 +0800
Subject: [PATCH] =?UTF-8?q?[3.4.0]=20[ui=E8=B0=83=E6=95=B4]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/widget/ConsultVideoPlayer.kt    | 24 ++++++----
 .../main/res/layout/list_video_item_light.xml | 46 ++++++++++++++-----
 .../res/layout/taxi_p_mogo_video_layout.xml   |  2 +-
 .../src/main/res/layout/taxi_p_video_show.xml |  2 +-
 4 files changed, 52 insertions(+), 22 deletions(-)

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 06e713a990..20cf8b4e41 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
@@ -115,6 +115,13 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
                 mProgressBar.maxHeight = 6
                 mProgressBar.minHeight = 6
             }
+
+            val layoutParams2 = fullscreenButton.layoutParams as ConstraintLayout.LayoutParams
+            layoutParams2.topMargin = AutoSizeUtils.dp2px(context,119f)
+            layoutParams2.rightMargin = AutoSizeUtils.dp2px(context,70f)
+            layoutParams2.height = AutoSizeUtils.dp2px(context,108f)
+            layoutParams2.width =  AutoSizeUtils.dp2px(context,108f)
+            fullscreenButton.layoutParams = layoutParams2
         }
 
     }
@@ -145,13 +152,13 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
 
     override fun onWindowFocusChanged(hasWindowFocus: Boolean) {
         super.onWindowFocusChanged(hasWindowFocus)
-        if(isIfCurrentIsFullscreen&&smalllPlayer!=null){
-            if(hasWindowFocus){//获取焦点
-                onVideoResume()
-            }else{
-                onVideoPause()
-            }
-        }
+//        if(isIfCurrentIsFullscreen&&smalllPlayer!=null){
+//            if(hasWindowFocus){//获取焦点
+//                onVideoResume()
+//            }else{
+//                onVideoPause()
+//            }
+//        }
     }
 
     override fun touchDoubleUp() {
@@ -424,13 +431,14 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
                     }
                 }
             }
+            // 点击视频不展示状态栏
+            gsyVideoPlayer.isHideKey = false
             gsyVideoPlayer.smalllPlayer = this
             frameLayout.setBackgroundColor(Color.BLACK)
             val lp = LayoutParams(width, height)
             frameLayout.addView(gsyVideoPlayer, lp)
             gsyVideoPlayer.statusBarView = StatusBarView(context)
             frameLayout.addView(gsyVideoPlayer.statusBarView)
-            ActivityUtils.getActivityByContext(context)
             FullVideoUtils.showOverlayView(context as Activity,frameLayout,R.style.och_window_anim_alpha)
             gsyVideoPlayer.visibility = INVISIBLE
             frameLayout.visibility = INVISIBLE
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_light.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_light.xml
index c4c17d3f8c..eaca7d4b4a 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_light.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_light.xml
@@ -1,18 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@drawable/bg_taxi_p_video_light_bg_shape"
-    android:layout_width="1620dp"
-    android:layout_height="940dp"
-    android:paddingTop="57dp"
-    android:paddingBottom="57dp"
-    android:paddingStart="61dp"
-    android:paddingEnd="61dp"
-    >
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="1754dp"
+    android:layout_height="1063dp">
+
+    <com.mogo.och.common.module.wigets.OCHBorderShadowLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        app:bgColor="#00000000"
+        app:blurRadius="@dimen/dp_36"
+        app:shadowColor="#80121526"
+        app:shadowRadius="@dimen/dp_54"
+        app:shadow_position="outer"
+        app:xOffset="0dp"
+        app:yOffset="0dp"/>
+
+    <View
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:background="@drawable/bg_taxi_p_video_light_bg_shape"
+        android:layout_width="1682dp"
+        android:layout_height="@dimen/dp_991" />
 
     <com.mogo.och.taxi.passenger.widget.ConsultVideoPlayer
         android:id="@+id/video_item_player"
         android:layout_gravity="center"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</FrameLayout>
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_width="1560dp"
+        android:layout_height="@dimen/dp_874" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_mogo_video_layout.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_mogo_video_layout.xml
index d9fa200208..f1e25dc000 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_mogo_video_layout.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_mogo_video_layout.xml
@@ -11,7 +11,7 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/infoVideoPlaylist"
         android:layout_width="match_parent"
-        android:layout_height="991dp"
+        android:layout_height="1063dp"
         android:orientation="horizontal"
         android:layout_marginTop="284dp"
         android:layout_marginStart="24dp"
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_video_show.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_video_show.xml
index e514c8bd11..2f0eea68e3 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_video_show.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_video_show.xml
@@ -45,7 +45,7 @@
             android:id="@+id/fullscreen"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_marginTop="@dimen/dp_42"
             android:layout_width="69dp"
             android:layout_height="69dp"
             android:layout_marginEnd="49dp"