diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiRoutingBean.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiRoutingBean.kt
index 658afd4800..68d6a2c50e 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiRoutingBean.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiRoutingBean.kt
@@ -40,6 +40,7 @@ data class RoutingSite(
         temp.gcjLat = gcjLat
         temp.gcjLon = gcjLon
         temp.pointType = pointType
+        temp.isLeaving = true
         return temp
     }
 }
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt
index 34f1fc6804..1b17a56554 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt
@@ -199,7 +199,7 @@ class FaultReasonView @JvmOverloads constructor(
                 tvFaultType.setCompoundDrawables(null, null, iconUp, null)
                 //展示列表
                 rvFaultList.visibility = View.VISIBLE
-                (rvFaultList.layoutParams as ConstraintLayout.LayoutParams).topToBottom =
+                (rvFaultList.layoutParams as LayoutParams).topToBottom =
                     R.id.tvFaultType
                 source = 1
                 if (typeList.isNullOrEmpty()) {
@@ -223,6 +223,11 @@ class FaultReasonView @JvmOverloads constructor(
                 ToastUtils.showShort("请先选择故障类型")
                 return@setOnClickListener
             }
+            if(!hasLevel3){
+                ToastUtils.showShort("后台未配置故障原因")
+                return@setOnClickListener
+            }
+
             if (faultReasonSelectStatus) {
                 //关闭
                 faultReasonSelectStatus = false
@@ -235,7 +240,7 @@ class FaultReasonView @JvmOverloads constructor(
                 tvFaultReason.setCompoundDrawables(null, null, iconUp, null)
                 //展示列表
                 rvFaultList.visibility = View.VISIBLE
-                (rvFaultList.layoutParams as ConstraintLayout.LayoutParams).topToBottom =
+                (rvFaultList.layoutParams as LayoutParams).topToBottom =
                     R.id.tvFaultReason
             }
         }
@@ -540,6 +545,8 @@ class FaultReasonView @JvmOverloads constructor(
     override fun onVisibilityAggregated(isVisible: Boolean) {
         super.onVisibilityAggregated(isVisible)
         if(visibility == View.VISIBLE){
+            //获取一级分类
+            CallerDevaToolsManager.getCategories(BadCaseConfig.tenantId, 1, 0, type, 0)
             //弹窗展示时间
             tvFaultTime.text =
                 millis2String(System.currentTimeMillis(), TimeUtils.getHourMinSecondFormat())
@@ -547,9 +554,11 @@ class FaultReasonView @JvmOverloads constructor(
             workOrderOccurrenceTime = System.currentTimeMillis()
             tvOccurrenceTime.text = millis2String(workOrderOccurrenceTime, TimeUtils.getHourMinFormat())
             //关闭故障类型选择
+            tvFaultType.text = ""
             faultTypeSelectStatus = false
             tvFaultType.setCompoundDrawables(null, null, iconDown, null)
             //关闭故障原因选择
+            tvFaultReason.text = ""
             faultReasonSelectStatus = false
             tvFaultReason.setCompoundDrawables(null, null, iconDown, null)
             //隐藏列表
@@ -564,6 +573,13 @@ class FaultReasonView @JvmOverloads constructor(
                 )
             )
             setAudio(false)
+            level1Id = 0 //一级分类ID
+            level2Id = 0 //二级分类ID
+            level3Id = 0 //三级分类ID
+            level1Name = ""
+            level2Name = ""
+            level3Name = ""
+            reportNote = "" //上报描述
         }
     }
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_fusion_traffic_light_p_bus.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_fusion_traffic_light_p_bus.xml
index 2037dead22..23c3fe2edb 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_fusion_traffic_light_p_bus.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_fusion_traffic_light_p_bus.xml
@@ -19,6 +19,17 @@
         app:ringWidth="@dimen/dp_5"
         />
 
+    <ImageView
+        android:id="@+id/fusionTrafficLightPointer"
+        android:layout_width="@dimen/dp_18"
+        android:layout_height="@dimen/dp_18"
+        app:layout_constraintCircle="@id/fusionTrafficLightState"
+        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"
+        />
+
     <ImageView
         android:id="@+id/fusionTrafficLightState"
         android:layout_width="@dimen/dp_110"
@@ -43,17 +54,6 @@
         android:contentDescription="@string/fusion_traffic_light_scale"
         />
 
-    <ImageView
-        android:id="@+id/fusionTrafficLightPointer"
-        android:layout_width="@dimen/dp_18"
-        android:layout_height="@dimen/dp_18"
-        app:layout_constraintCircle="@id/fusionTrafficLightState"
-        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"
-        />
-
     <com.mogo.eagle.core.function.hmi.ui.widget.TypefaceTextView
         android:id="@+id/fusionTrafficLightNum"
         android:layout_width="wrap_content"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_traffic_light_prompt_p_bus.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_traffic_light_prompt_p_bus.xml
index 85cc51afd0..0c82e7e8d7 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_traffic_light_prompt_p_bus.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_traffic_light_prompt_p_bus.xml
@@ -29,28 +29,34 @@
         android:textStyle="bold"
         />
 
-    <com.mogo.eagle.core.function.hmi.ui.widget.TypefaceTextView
-        android:id="@+id/tvTrafficNum"
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="@id/tvPromptContent"
         app:layout_constraintLeft_toRightOf="@id/tvPromptContent"
-        android:textSize="@dimen/sp_90"
-        android:layout_marginStart="@dimen/dp_19"
-        app:textType="DS_DIGIB_2"
-        android:layout_marginBottom="@dimen/dp_m_10"
-        />
+        app:layout_constraintRight_toRightOf="parent"
+        android:layout_marginEnd="@dimen/dp_25"
+        >
 
-    <com.mogo.eagle.core.function.hmi.ui.widget.TypefaceTextView
-        android:id="@+id/tvTrafficNumDecimal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="@id/tvPromptContent"
-        app:layout_constraintLeft_toRightOf="@id/tvTrafficNum"
-        android:layout_marginStart="@dimen/dp_2"
-        android:textSize="@dimen/sp_50"
-        app:textType="DS_DIGIB_2"
-        android:layout_marginBottom="@dimen/dp_m_2"
-        />
+        <com.mogo.eagle.core.function.hmi.ui.widget.TypefaceTextView
+            android:id="@+id/tvTrafficNum"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="@dimen/sp_90"
+            app:textType="DS_DIGIB_2"
+            android:layout_marginBottom="@dimen/dp_m_10"
+            />
+
+        <com.mogo.eagle.core.function.hmi.ui.widget.TypefaceTextView
+            android:id="@+id/tvTrafficNumDecimal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_2"
+            android:textSize="@dimen/sp_50"
+            app:textType="DS_DIGIB_2"
+            android:layout_marginBottom="@dimen/dp_m_2"
+            />
+
+    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file