From f985ae2dbd4ed45e9c9d9b0bccbcbc6b5b1198b0 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 8 May 2025 18:24:46 +0800
Subject: [PATCH] =?UTF-8?q?[8.0.0]=20[fea]=20[musice=20=E3=80=81=E8=B7=9D?=
 =?UTF-8?q?=E7=A6=BB=E7=BB=88=E7=82=B9500m=E6=8F=90=E7=A4=BA=E3=80=81?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B6=88=E6=81=AF=E7=9B=92=E5=AD=90]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/ui/TaxiPassengerBaseFragment.kt |   2 +-
 .../ui/music/playing/MusicPlayingViewModel.kt |   4 +-
 .../src/main/res/layout/taxi_p_evaluate.xml   | 136 +++++++++---------
 .../res/layout/taxt_u_p_base_fragment.xml     |  10 --
 4 files changed, 75 insertions(+), 77 deletions(-)

diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt
index cf6e37f301..fdef7bb120 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt
@@ -311,7 +311,7 @@ class TaxiPassengerBaseFragment :
     override fun setEvaluateView(){
         val automaticExploration = AIMessage.EvaluateData(System.currentTimeMillis().toString(),"",true)
         AIMessageManager.post(automaticExploration)
-        RxUtils.createSubscribe {
+        RxUtils.createSubscribe(6_000) {
             AIMessageManager.clearData()
         }
     }
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/playing/MusicPlayingViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/playing/MusicPlayingViewModel.kt
index 1f8ebc93f5..fb242a7d00 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/playing/MusicPlayingViewModel.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/playing/MusicPlayingViewModel.kt
@@ -50,7 +50,9 @@ class MusicPlayingViewModel : ViewModel(), MusicModel.MusicDataListener {
 
     override fun checkChangeListener(musicData: MusicData) {
         CallerLogger.d(TAG, "showData:setMusicData:${musicData}")
-        this.viewCallback?.setViewData(musicData)
+        BizLoopManager.runInMainThread{
+            this.viewCallback?.setViewData(musicData)
+        }
     }
 
     override fun updatePlayCurrent(currentPlay: Long, duration: Long, second: MusicData) {
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_evaluate.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_evaluate.xml
index df647cb839..21ef5d93de 100644
--- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_evaluate.xml
+++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_evaluate.xml
@@ -1,80 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.mogo.och.common.module.wigets.OCHBorderShadowLayout 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="wrap_content"
-    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+    android:layout_width="@dimen/dp_799"
+    android:layout_height="@dimen/dp_400"
+    app:blurRadius="@dimen/dp_26"
+    app:shadowColor="#26666666"
+    app:shadowRadius="@dimen/dp_20"
+    app:xOffset="0dp"
+    app:yOffset="0dp">
 
-
-
-    <com.mogo.eagle.core.widget.RoundCanClickConstraintLayout
-        android:id="@+id/rcccl_con"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_349"
-        android:background="#8CF5FAFF"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:roundLayoutRadius="24dp">
+        android:layout_height="wrap_content">
 
-        <TextView
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_56"
-            android:layout_marginTop="@dimen/dp_51"
-            android:layout_marginEnd="@dimen/dp_51"
-            android:text="行程即将结束，小智很想知道你的体验如何呢？"
-            android:textColor="@color/taxi_cp_131415"
-            android:textSize="@dimen/dp_32"
-            app:layout_constraintEnd_toEndOf="parent"
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/rcccl_con"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_349"
+            android:background="#8CF5FAFF"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_56"
+                android:layout_marginTop="@dimen/dp_51"
+                android:layout_marginEnd="@dimen/dp_51"
+                android:text="行程即将结束，小智很想知道你的体验如何呢？"
+                android:textColor="@color/taxi_cp_131415"
+                android:textSize="@dimen/dp_32"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/tv_low_evaluate"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/dp_120"
+                android:layout_marginBottom="@dimen/dp_40"
+                android:text="有待提升"
+                android:textColor="@color/taxi_cp_303C52"
+                android:textSize="@dimen/dp_26"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+
+            <ImageView
+                android:id="@+id/iv_evaluate_low"
+                android:layout_width="@dimen/dp_120"
+                android:layout_height="@dimen/dp_120"
+                android:layout_marginBottom="-14dp"
+                android:src="@drawable/taxi_p_evaluate_low"
+                app:layout_constraintBottom_toTopOf="@+id/tv_low_evaluate"
+                app:layout_constraintEnd_toEndOf="@+id/tv_low_evaluate"
+                app:layout_constraintStart_toStartOf="@+id/tv_low_evaluate" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <ImageView
+            android:id="@+id/iv_evaluate_great"
+            android:layout_width="@dimen/dp_320"
+            android:layout_height="@dimen/dp_400"
+            android:layout_marginStart="@dimen/dp_51"
+            android:layout_marginBottom="@dimen/dp_20"
+            android:src="@drawable/arrive_dest_great_000"
+            app:layout_constraintBottom_toBottomOf="@+id/rcccl_con"
+            app:layout_constraintStart_toStartOf="parent" />
 
         <TextView
-            android:id="@+id/tv_low_evaluate"
+            android:id="@+id/tv_great_evaluate"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_99"
             android:layout_marginBottom="@dimen/dp_40"
-            android:text="有待提升"
+            android:text="新奇有趣"
             android:textColor="@color/taxi_cp_303C52"
             android:textSize="@dimen/dp_26"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+            app:layout_constraintEnd_toEndOf="@+id/iv_evaluate_great"
+            app:layout_constraintStart_toStartOf="@+id/iv_evaluate_great" />
 
-
-        <ImageView
-            android:id="@+id/iv_evaluate_low"
-            android:layout_width="@dimen/dp_120"
-            android:layout_height="@dimen/dp_120"
-            android:layout_marginBottom="@dimen/dp_1"
-            android:src="@drawable/taxi_p_evaluate_low"
-            app:layout_constraintBottom_toTopOf="@+id/tv_low_evaluate"
-            app:layout_constraintEnd_toEndOf="@+id/tv_low_evaluate"
-            app:layout_constraintStart_toStartOf="@+id/tv_low_evaluate" />
-
-    </com.mogo.eagle.core.widget.RoundCanClickConstraintLayout>
-
-    <ImageView
-        android:id="@+id/iv_evaluate_great"
-        android:layout_width="@dimen/dp_320"
-        android:layout_height="@dimen/dp_400"
-        android:layout_marginBottom="@dimen/dp_33"
-        android:layout_marginStart="@dimen/dp_30"
-        android:src="@drawable/arrive_dest_great_000"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintBottom_toBottomOf="@+id/rcccl_con" />
-
-    <TextView
-        android:id="@+id/tv_great_evaluate"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dp_40"
-        android:text="新奇有趣"
-        android:textColor="@color/taxi_cp_303C52"
-        android:textSize="@dimen/dp_26"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@+id/iv_evaluate_great"
-        app:layout_constraintStart_toStartOf="@+id/iv_evaluate_great" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</com.mogo.och.common.module.wigets.OCHBorderShadowLayout>
\ No newline at end of file
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
index d02a152852..b1207b6258 100644
--- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
+++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
@@ -192,16 +192,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
-    <!--气泡态消息盒子-->
-    <com.mogo.eagle.core.function.hmi.ui.msgbox.PassengerMsgBoxBubbleView
-        android:id="@+id/pmbb_info"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/dp_50"
-        app:layout_constraintBottom_toTopOf="@id/bottom"
-        android:layout_marginBottom="-80dp"
-        app:layout_constraintEnd_toEndOf="parent" />
-
     <com.mogo.eagle.core.function.hmi.ui.widget.GreenWaveView
         android:layout_width="@dimen/dp_580"
         android:layout_height="@dimen/dp_156"