From 9800077f0853aec39cdc01beff9f50fbb02e6ac0 Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.com>
Date: Tue, 18 Apr 2023 16:55:11 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=8Cdev=5Fopt=5F2.15.0=E3=80=8D=201?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E5=A4=8D=E4=B9=98=E5=AE=A2=E5=B1=8Fpnc?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=A2=AB=E7=9B=B4=E6=92=AD=E9=81=AE=E6=8C=A1?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/bus_p_base_fragment.xml   | 65 ++++++++++---------
 .../hmi/ui/widget/DriverMonitorView.kt        | 41 ++++++------
 2 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
index 88e7cb8ee6..0aa768d8c5 100644
--- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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="match_parent"
     android:layout_height="match_parent">
 
@@ -8,9 +9,9 @@
         android:id="@+id/mapBizView"
         android:layout_width="@dimen/dp_1860"
         android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugViewTrigger
         android:layout_width="@dimen/dp_400"
@@ -33,28 +34,20 @@
         android:id="@+id/bus_p_autopilot_iv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
         android:layout_marginLeft="@dimen/bus_p_curent_station_panel_margin"
         android:layout_marginTop="@dimen/dp_112"
         android:scaleType="fitXY"
-        android:visibility="gone"
-        android:layout_gravity="center_horizontal"
         android:src="@drawable/bus_p_un_auto_nor"
+        android:visibility="gone"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <!--浓雾预警动画-->
     <com.mogo.eagle.core.function.hmi.ui.widget.V2XFogEventView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent" />
 
-    <!--pnc行为决策-->
-    <com.mogo.eagle.core.function.hmi.ui.vehicle.PncActionsView
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/dp_100"
-        android:layout_marginBottom="@dimen/dp_110"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
 
     <com.mogo.eagle.core.function.hmi.ui.widget.RomaPassengerView
         android:id="@+id/ivMoGoLogo"
@@ -63,10 +56,10 @@
         android:layout_marginRight="@dimen/dp_751"
         android:layout_marginBottom="@dimen/dp_59"
         android:background="@drawable/roma_bus_p_bg_selector"
-        app:roma_close="@drawable/roma_bus_p_bg_selector"
-        app:roma_open="@drawable/iv_roma_bus_passenger_press_bg"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toRightOf="parent" />
+        app:layout_constraintRight_toRightOf="parent"
+        app:roma_close="@drawable/roma_bus_p_bg_selector"
+        app:roma_open="@drawable/iv_roma_bus_passenger_press_bg" />
 
     <com.mogo.och.common.module.wigets.OCHBorderShadowLayout
         android:id="@+id/arrive_station_shadow"
@@ -117,14 +110,15 @@
                 android:textStyle="bold"
                 app:layout_constraintLeft_toLeftOf="@+id/bus_p_cur_station_title"
                 app:layout_constraintTop_toBottomOf="@+id/bus_p_cur_station_title" />
+
             <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="@dimen/dp_20"
                 android:layout_height="@dimen/dp_27"
-                app:layout_constraintTop_toTopOf="@+id/bus_p_cur_station_name"
+                android:layout_marginRight="@dimen/dp_10"
+                android:src="@drawable/station_arrow"
                 app:layout_constraintBottom_toBottomOf="@+id/bus_p_cur_station_name"
                 app:layout_constraintRight_toLeftOf="@+id/bus_p_cur_station_name"
-                android:layout_marginRight="@dimen/dp_10"
-                android:src="@drawable/station_arrow">
+                app:layout_constraintTop_toTopOf="@+id/bus_p_cur_station_name">
 
             </androidx.appcompat.widget.AppCompatImageView>
 
@@ -143,21 +137,20 @@
 
             <androidx.core.widget.ContentLoadingProgressBar
                 android:id="@+id/bus_progress_bar"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/dp_10"
-                android:progress="0"
-                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
                 android:layout_marginLeft="@dimen/dp_12"
                 android:layout_marginRight="@dimen/dp_15"
-                app:layout_constraintRight_toRightOf="parent"
-                android:progressDrawable="@drawable/bus_progress_bar_bg" />
+                android:progress="0"
+                android:progressDrawable="@drawable/bus_progress_bar_bg"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </com.mogo.och.common.module.wigets.OCHBorderShadowLayout>
 
-
     <com.mogo.och.common.module.wigets.OCHBorderShadowLayout
         android:id="@+id/liveShadow"
         android:layout_width="wrap_content"
@@ -171,7 +164,8 @@
         app:shadowColor="@color/bus_p_panel_edge_shadow"
         app:shadowRadius="@dimen/dp_30"
         app:xOffset="0dp"
-        app:yOffset="0dp">
+        app:yOffset="0dp"
+        tools:visibility="visible">
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="wrap_content"
@@ -203,10 +197,17 @@
     <com.mogo.eagle.core.function.hmi.ui.msgbox.BusPassengerMsgBoxBubbleView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintRight_toLeftOf="@+id/bus_p_route_panel"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginRight="@dimen/dp_40"
         android:layout_marginTop="@dimen/dp_100"
-        />
+        android:layout_marginRight="@dimen/dp_40"
+        app:layout_constraintRight_toLeftOf="@+id/bus_p_route_panel"
+        app:layout_constraintTop_toTopOf="parent" />
 
+    <!--pnc行为决策-->
+    <com.mogo.eagle.core.function.hmi.ui.vehicle.PncActionsView
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/dp_100"
+        android:layout_marginBottom="@dimen/dp_110"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/DriverMonitorView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/DriverMonitorView.kt
index 4864257121..3abb1c96db 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/DriverMonitorView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/DriverMonitorView.kt
@@ -110,26 +110,27 @@ class DriverMonitorView :
 
     fun showLive() {
         if (!isLived) {
-//            sopShowDriverMap[CallerTelematicManager.getServerToken()]?.let {
-//                Logger.d(
-//                    "${SceneConstant.M_HMI}$TAG",
-//                    "检查司机直播……isLived=$isLived  当前车上的司机端SN=${sopShowDriverMap[CallerTelematicManager.getServerToken()]}"
-//                )
-//                CallerLogger.d(
-//                    "${SceneConstant.M_HMI}$TAG",
-//                    "检查司机直播……isLived=$isLived  当前车上的司机端SN=${sopShowDriverMap[CallerTelematicManager.getServerToken()]}"
-//                )
-//                MoGoAiCloudTrafficLive.viewDesignativeVehicleLive(
-//                    it,
-//                    textureViewDriverMonitor,
-//                    carLiveCallBack
-//                )
-//            }
-            MoGoAiCloudTrafficLive.viewDesignativeVehicleLive(
-                "F803EB2046PZD00164",
-                textureViewDriverMonitor,
-                carLiveCallBack
-            )
+            sopShowDriverMap[CallerTelematicManager.getServerToken()]?.let {
+                Logger.d(
+                    "${SceneConstant.M_HMI}$TAG",
+                    "检查司机直播……isLived=$isLived  当前车上的司机端SN=${sopShowDriverMap[CallerTelematicManager.getServerToken()]}"
+                )
+                CallerLogger.d(
+                    "${SceneConstant.M_HMI}$TAG",
+                    "检查司机直播……isLived=$isLived  当前车上的司机端SN=${sopShowDriverMap[CallerTelematicManager.getServerToken()]}"
+                )
+                MoGoAiCloudTrafficLive.viewDesignativeVehicleLive(
+                    it,
+                    textureViewDriverMonitor,
+                    carLiveCallBack
+                )
+            }
+            // TODO 测试用的
+//            MoGoAiCloudTrafficLive.viewDesignativeVehicleLive(
+//                "F803EB2046PZD00164",
+//                textureViewDriverMonitor,
+//                carLiveCallBack
+//            )
         }
     }