Merge branch 'dev_robotaxi-d_240705_6.5.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robotaxi-d_240705_6.5.0

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt

@@ -14,6 +14,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.mogo.commons.voice.AIAssist
 import com.mogo.eagle.core.data.autopilot.AutopilotSummaryInfo
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.msgbox.MsgBoxBean
 import com.mogo.eagle.core.data.msgbox.MsgBoxType
 import com.mogo.eagle.core.data.msgbox.MsgCategory
@@ -21,6 +22,7 @@ import com.mogo.eagle.core.data.notice.AutoExplorationEntity
 import com.mogo.eagle.core.function.api.datacenter.msgbox.IMsgBoxListener
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxListenerManager
 import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 
 
@@ -125,8 +127,12 @@ class AutomaticExplorationView @JvmOverloads constructor(
                     }
                 }
                 if(allComplete){
-                    //语音播放
-                    AIAssist.getInstance(context).speakTTSVoice("道路畅通一切正常蘑菇型车助手将持续守候您的出行")
+                    //停止左上角扫描动画
+                    rotationAnim?.cancel()
+                    //语音播放，只在司机端播放
+                    if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
+                        AIAssist.getInstance(context).speakTTSVoice("道路畅通一切正常蘑菇型车助手将持续守候您的出行")
+                    }
                     //5秒后关闭弹窗
                     val hideViewTimer =object: CountDownTimer(EXPLORATION_HIDE_TIME,EXPLORATION_HIDE_TIME){
                         override fun onTick(millisUntilFinished: Long) {

core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary_p.xml

@@ -128,6 +128,7 @@
             android:textSize="@dimen/sp_94"
             android:textColor="@color/summary_service_num_p"
             app:layout_constraintHorizontal_chainStyle="packed"
+            android:fontFamily="@font/font_din"
             />
 
         <TextView
@@ -154,6 +155,7 @@
             android:textSize="@dimen/sp_94"
             android:textColor="@color/summary_service_num_p"
             app:layout_constraintHorizontal_chainStyle="packed"
+            android:fontFamily="@font/font_din"
             />
 
         <TextView
@@ -180,6 +182,7 @@
             android:textSize="@dimen/sp_94"
             android:textColor="@color/summary_service_num_p"
             app:layout_constraintHorizontal_chainStyle="packed"
+            android:fontFamily="@font/font_din"
             />
 
         <TextView
@@ -206,6 +209,7 @@
             android:textSize="@dimen/sp_94"
             android:textColor="@color/summary_service_num_p"
             app:layout_constraintHorizontal_chainStyle="packed"
+            android:fontFamily="@font/font_din"
             />
 
         <TextView
@@ -232,6 +236,7 @@
             android:textSize="@dimen/sp_94"
             android:textColor="@color/summary_service_num_p"
             app:layout_constraintHorizontal_chainStyle="packed"
+            android:fontFamily="@font/font_din"
             />
 
         <TextView
@@ -284,6 +289,7 @@
         android:textColor="@color/summary_danger_num_p"
         android:textSize="@dimen/sp_195"
         android:layout_marginTop="@dimen/dp_120"
+        android:fontFamily="@font/font_din"
         />
 
     <TextView
@@ -333,6 +339,7 @@
         android:textColor="@color/summary_danger_num_p"
         android:textSize="@dimen/sp_195"
         android:layout_marginTop="@dimen/dp_120"
+        android:fontFamily="@font/font_din"
         />
 
     <TextView

core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_auto_exploration_p.xml

@@ -21,7 +21,7 @@
         android:id="@+id/tvExplorationContent"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="@dimen/sp_20"
+        android:textSize="@dimen/sp_22"
         android:textColor="@color/auto_exploration_content_p"
         android:layout_marginStart="@dimen/dp_13"
         android:layout_gravity="center_vertical"

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_automatic_exploration_p.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/dp_580"
-    android:layout_height="@dimen/dp_520"
-    android:background="@drawable/bg_automatic_exploration"
+    android:layout_width="@dimen/dp_674"
+    android:layout_height="@dimen/dp_582"
+    android:background="@drawable/hmi_v2n_event_bg_passenger"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <ImageView
@@ -13,6 +13,8 @@
         app:layout_constraintLeft_toLeftOf="parent"
         android:src="@drawable/icon_scan"
         android:contentDescription="@string/exploration_scan"
+        android:layout_marginTop="@dimen/dp_68"
+        android:layout_marginStart="@dimen/dp_84"
         />
 
     <ImageView
@@ -47,6 +49,8 @@
         app:layout_constraintRight_toRightOf="parent"
         android:src="@drawable/icon_exploration_close"
         android:contentDescription="@string/exploration_close"
+        android:layout_marginTop="@dimen/dp_68"
+        android:layout_marginEnd="@dimen/dp_68"
         />
 
     <androidx.recyclerview.widget.RecyclerView