From 895002e48f72d49b3cc877da7440ac19a0e91bbf Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 1 Aug 2023 14:33:39 +0800
Subject: [PATCH] =?UTF-8?q?[bugfix]=20[=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/startautopilot/StartAutopilotView.kt   |  3 ---
 .../taxi/passenger/ui/video/InfoVideoView.kt  |  3 +++
 .../src/main/res/layout/taxi_p_bottom_bar.xml | 19 +++++++++++++++++--
 .../res/layout/taxi_p_mogo_video_layout.xml   |  2 +-
 .../main/res/layout/taxi_p_setting_view.xml   |  2 ++
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt
index 3f565b80c2..969d1b2568 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt
@@ -235,9 +235,6 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu
         starting_autopilot_view_close.onClick {
             closeAllAnimsAndView()
         }
-        v_xiaozhi_belt_info_bg.onClick {
-            handleStartAutopilotBtnStatus(true)
-        }
         taxiPXiaozhiBelt?.start()
     }
 
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt
index a94fe96e70..cb6bcc2ea9 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt
@@ -96,6 +96,9 @@ internal class InfoVideoView @JvmOverloads constructor(
 
     override fun onVisibilityChanged(changedView: View, visibility: Int) {
         super.onVisibilityChanged(changedView, visibility)
+        if(changedView!=this){
+            return
+        }
         val carouselLayoutManager = rvVideoPlaylist?.layoutManager as CarouselLayoutManager
         val (centerItemPosition: Int, player) = getPlayer(carouselLayoutManager)
         when (visibility) {
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_bottom_bar.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_bottom_bar.xml
index 160833677c..db389e16c1 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_bottom_bar.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_bottom_bar.xml
@@ -10,8 +10,8 @@
 
     <TextClock
         android:id="@+id/cl_order_time"
-        android:format12Hour="M月d日 HH:mm"
-        android:format24Hour="M月d日 HH:mm"
+        android:format12Hour="M月d日 "
+        android:format24Hour="M月d日 "
         android:gravity="center"
         android:fontFamily="@font/din"
         app:layout_constraintStart_toStartOf="parent"
@@ -23,6 +23,21 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"/>
 
+    <TextClock
+        android:id="@+id/cl_order_time_hhmm"
+        android:format12Hour="HH:mm"
+        android:format24Hour="HH:mm"
+        android:gravity="center"
+        android:fontFamily="@font/din"
+        app:layout_constraintStart_toEndOf="@+id/cl_order_time"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:textColor="@color/taxi_p_111D2F"
+        android:letterSpacing="0.1"
+        android:textSize="@dimen/dp_52"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"/>
+
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/actv_precisionmap_press"
         android:visibility="gone"
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 f1e25dc000..fd94d513d7 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
@@ -26,7 +26,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/infoVideoPlaylist"
-        android:layout_marginTop="67dp"
+        android:layout_marginTop="@dimen/dp_44"
         app:vpi_orientation="horizontal"
         app:vpi_slide_mode="scale"
         app:vpi_slider_checked_color="@color/taxi_p_traffic_light_red_color_up"
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_setting_view.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_setting_view.xml
index 94c9432ca1..5517d12462 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_setting_view.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_setting_view.xml
@@ -57,6 +57,7 @@
         android:layout_marginRight="@dimen/dp_113"
         android:gravity="right"
         android:textColor="@color/taxi_p_303C52"
+        android:fontFamily="@font/din"
         android:textSize="@dimen/dp_56"
         android:textStyle="bold"
         app:layout_constraintRight_toRightOf="parent"
@@ -114,6 +115,7 @@
         android:layout_marginRight="@dimen/dp_113"
         android:gravity="right"
         android:textSize="@dimen/dp_56"
+        android:fontFamily="@font/din"
         android:textStyle="bold"
         android:textColor="@color/taxi_p_303C52"
         app:layout_constraintRight_toRightOf="parent"