Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local

OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_fragment.xml

@@ -157,6 +157,29 @@
         app:layout_constraintRight_toRightOf="parent"
         android:visibility="gone"/>
 
+    <!--红绿灯提醒-->
+    <com.mogo.eagle.core.function.hmi.ui.notice.traffic.TrafficLightPromptView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/dp_m_70"
+        app:layout_constraintBottom_toTopOf="@id/zv_msg_pop_bottom"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:promptUser="passenger_bus"
+        android:visibility="gone"
+        />
+
+    <!--融合红绿灯-->
+    <com.mogo.eagle.core.function.hmi.ui.widget.FusionTrafficLightView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/och_shadow_layout"
+        android:layout_marginTop="@dimen/dp_30"
+        app:fusionLightUser="passenger_bus"
+        android:visibility="gone"
+        />
+
     <TextView
         android:id="@+id/tv_bug_b2_p_version"
         app:layout_constraintBottom_toBottomOf="parent"

OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml

@@ -111,6 +111,7 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+
     <!--接管提示-->
     <com.mogo.eagle.core.function.hmi.ui.vehicle.TakeOverView
         android:layout_width="@dimen/hmi_take_over_request_width"

OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_fragment.xml

@@ -165,6 +165,7 @@
         app:layout_constraintBottom_toTopOf="@id/zv_msg_pop_bottom"
         app:layout_constraintEnd_toEndOf="parent"
         app:promptUser="passenger_bus"
+        android:visibility="gone"
         />
 
     <!--融合红绿灯-->
@@ -176,6 +177,7 @@
         app:layout_constraintTop_toBottomOf="@id/och_shadow_layout"
         android:layout_marginTop="@dimen/dp_30"
         app:fusionLightUser="passenger_bus"
+        android:visibility="gone"
         />
 
 

OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java

@@ -793,7 +793,7 @@ public class SweeperCloudTaskModel implements IMoGoSweeperFutianCloudTaskListene
 
     }
 
-    @Override·
+    @Override
     public void onAutoPilotInfo(long token, long timestamp, @Nullable SsmInfo.AutoPilotInfo autoPilotInfo) {
     }
 

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt

@@ -215,12 +215,12 @@ class CarInfoTabView @JvmOverloads constructor(
 
     private fun updateAdHdMapVersion() {
         if (AppConfigInfo.adHdMapVersion.isNotEmpty()) {
-            CallerLogger.i(SceneConstant.M_HMI + TAG, "updateAdHdMapVersion, adHdMapVersion:${AppConfigInfo.adHdMapVersion} , text:${tvADMapVersion.text}")
             UiThreadHandler.post {
+                CallerLogger.i(SceneConstant.M_HMI + TAG, "updateAdHdMapVersion, adHdMapVersion:${AppConfigInfo.adHdMapVersion} , text:${tvADMapVersion.text}")
                 if(tvADMapVersion.text.contains(AppConfigInfo.adHdMapVersion)){
                     return@post
                 }
-                tvADMapVersion.text = tvADMapVersion.text.toString() + AppConfigInfo.adHdMapVersion
+                tvADMapVersion.text = context.getString(R.string.tab_version_admap_info) + AppConfigInfo.adHdMapVersion
             }
         }
     }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/WorkOrderView.kt

@@ -361,6 +361,8 @@ class WorkOrderView @JvmOverloads constructor(
                 )
             )
             setAudio(false)
+            //重置工单问题类型
+            workOrderType = ""
         }
 
     }

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

@@ -10,12 +10,13 @@
 
     <com.mogo.eagle.core.function.hmi.ui.widget.ProportionChartView
         android:id="@+id/fusionTrafficLightProportion"
-        android:layout_width="@dimen/dp_113"
-        android:layout_height="@dimen/dp_113"
+        android:layout_width="@dimen/dp_124"
+        android:layout_height="@dimen/dp_124"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
+        app:ringWidth="@dimen/dp_5"
         />
 
     <ImageView
@@ -47,7 +48,7 @@
         android:layout_width="@dimen/dp_18"
         android:layout_height="@dimen/dp_18"
         app:layout_constraintCircle="@id/fusionTrafficLightState"
-        app:layout_constraintCircleRadius="@dimen/dp_46"
+        app:layout_constraintCircleRadius="@dimen/dp_44"
         android:src="@drawable/icon_light_green_pointer_p_bus"
         android:contentDescription="@string/fusion_traffic_light_pointer"
         tools:ignore="MissingConstraints"
@@ -64,7 +65,6 @@
         android:textColor="#063330"
         android:textSize="@dimen/sp_42"
         app:textType="DS_DIGIB_2"
-        android:text="10"
         />
 
 </androidx.constraintlayout.widget.ConstraintLayout>