From 8d3edf15ede7a096e16f5061b6f2e4ea6871125b Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 30 Jun 2022 18:25:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=BE=E5=A4=A7=E6=9A=82=E5=81=9C=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E7=9A=84=E7=82=B9=E5=87=BB=E5=8C=BA=E5=9F=9F=E3=80=81?=
 =?UTF-8?q?=E5=85=A8=E5=B1=8F=E5=8F=96=E6=B6=88=E6=8B=96=E5=8A=A8=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3=20=E9=AB=98=E6=96=AF=E6=A8=A1=E7=B3=8A=E5=8F=98?=
 =?UTF-8?q?=E5=A4=A7+=E9=80=8F=E6=98=8E=E5=BA=A6=E9=99=8D=E5=88=B050%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/video/TaxiPassengerMogoConsultView.kt          |  2 +-
 .../och/taxi/passenger/widget/ConsultVideoPlayer.kt   |  1 +
 .../main/res/layout/taxi_p_arrived_mogo_consult.xml   |  2 +-
 .../src/main/res/layout/taxi_p_mogo_movies.xml        |  3 ++-
 .../src/main/res/layout/taxi_p_video_show.xml         | 11 +++++------
 5 files changed, 10 insertions(+), 9 deletions(-)

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 1f246e6c2c..135e5e77cc 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
@@ -145,7 +145,7 @@ class TaxiPassengerMogoConsultView :RelativeLayout {
             .load(taxiPassengerVideoPlay.imageUrl)
             .apply(
                 RequestOptions().transform(
-                    GlideBlurTransform(context, taxiPassengerVideoPlay.imageUrl, 85)
+                    GlideBlurTransform(context, taxiPassengerVideoPlay.imageUrl, 100)
                 )
             )
             .into(object : SimpleTarget<Bitmap?>() {
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 ec940b9dcf..ff39bc21ab 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
@@ -162,6 +162,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
             onVideoReset()
             setVideoAllCallBack(null)
         }
+        dismissProgressDialog()
         super.onDetachedFromWindow()
     }
 
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_mogo_consult.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_mogo_consult.xml
index 8cf23774da..6e24c51294 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_mogo_consult.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_mogo_consult.xml
@@ -9,7 +9,7 @@
     tools:ignore="MissingDefaultResource">
 
     <View
-        android:background="#B3000000"
+        android:background="#80000000"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_mogo_movies.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_mogo_movies.xml
index 9aa2b0c50e..2038ae83d3 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_mogo_movies.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_mogo_movies.xml
@@ -9,10 +9,11 @@
     tools:ignore="MissingDefaultResource">
 
     <View
-        android:background="#B3000000"
+        android:background="#80000000"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
+
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/aciv_title_icon"
         android:src="@drawable/taxi_p_mogo_movies_title_icon"
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 000cc366cc..e4fb69b7c6 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
@@ -77,9 +77,10 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/total"
             app:layout_constraintBottom_toBottomOf="@+id/total"
-            android:layout_marginStart="55px"
-            android:layout_width="@dimen/notice_play_height"
-            android:layout_height="@dimen/notice_play_height"
+            android:paddingStart="55px"
+            android:layout_width="140px"
+            android:paddingEnd="35px"
+            android:layout_height="match_parent"
             android:src="@drawable/notice_video_pause" />
 
         <TextView
@@ -89,7 +90,6 @@
             app:layout_constraintStart_toEndOf="@+id/start"
             app:layout_constraintTop_toTopOf="@+id/total"
             app:layout_constraintBottom_toBottomOf="@+id/total"
-            android:layout_marginStart="35px"
             android:gravity="bottom"
             android:text="02:23"
             android:textColor="@android:color/white"
@@ -115,10 +115,9 @@
             android:id="@+id/total"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/notice_time_bottom"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginTop="64px"
+            app:layout_constraintBottom_toBottomOf="parent"
             android:gravity="bottom"
             android:layout_marginEnd="55px"
             android:textSize="36px"