diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_normal.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_normal.png
index ee0e88287f..859e4950b1 100644
Binary files a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_normal.png and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_normal.png differ
diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_press.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_press.png
index 1e0a96b046..bdc4276303 100644
Binary files a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_press.png and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_press.png differ
diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_2.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_2.png
index 2ad2bbc3f8..be354f9b64 100644
Binary files a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_2.png and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_2.png differ
diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_3.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_3.png
index ed9cff148b..a1b3eb1041 100644
Binary files a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_3.png and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_3.png differ
diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_4.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_4.png
index ca8f4969c8..01f5efeae8 100644
Binary files a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_4.png and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_4.png differ
diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_select_line_bg.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_select_line_bg.png
new file mode 100644
index 0000000000..a70fafb8c1
Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_select_line_bg.png differ
diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_bottom_corner.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_bottom_corner.xml
index a779ceb4e3..0ea8182fc7 100644
--- a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_bottom_corner.xml
+++ b/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_bottom_corner.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:bottomRightRadius="@dimen/dp_36" />
+    <corners android:bottomRightRadius="@dimen/dp_26" />
     <gradient
         android:angle="-90"
         android:endColor="@color/bus_p_m1_d7e5f5"
diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_shape_line_switch_left.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_shape_line_switch_left.xml
index 39e2db4eb9..483cbfe367 100644
--- a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_shape_line_switch_left.xml
+++ b/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_shape_line_switch_left.xml
@@ -2,10 +2,10 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners
-        android:bottomLeftRadius="@dimen/dp_36"
-        android:topLeftRadius="@dimen/dp_36" />
-    <gradient
-        android:centerColor="@color/bus_p_m1_91EFF6FF"
-        android:endColor="@color/bus_p_m1_91EFF6FF"
-        android:startColor="@color/bus_p_m1_91EFF6FF" />
+        android:bottomLeftRadius="@dimen/dp_26"
+        android:topLeftRadius="@dimen/dp_26" />
+<!--    <gradient-->
+<!--        android:centerColor="@color/bus_p_m1_91EFF6FF"-->
+<!--        android:endColor="@color/bus_p_m1_91EFF6FF"-->
+<!--        android:startColor="@color/bus_p_m1_91EFF6FF" />-->
 </shape>
\ No newline at end of file
diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_bottom_go.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_bottom_go.xml
index c72c5c29c3..e7fc539809 100644
--- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_bottom_go.xml
+++ b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_bottom_go.xml
@@ -27,6 +27,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         android:textSize="@dimen/dp_48"
         android:textColor="@android:color/white"
+        android:layout_marginEnd="@dimen/dp_7"
         android:text="出发"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml
index 792d811673..c1cfd127c5 100644
--- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml
+++ b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml
@@ -221,6 +221,7 @@
         android:src="@drawable/charter_p_video"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/viewBusPM1MsgBoxButton"
+        android:layout_marginTop="-20dp"
         android:layout_width="@dimen/dp_147"
         android:layout_height="@dimen/dp_149"/>
 
diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml
index a24a4b8b59..1e4824f86c 100644
--- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml
+++ b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml
@@ -11,7 +11,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginStart="@dimen/dp_286"
-        android:background="@drawable/bus_p_function_setting_soft_b_shape"
+        android:background="@drawable/charter_p_select_line_bg"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintDimensionRatio="936:500"
         app:layout_constraintStart_toStartOf="parent"
@@ -56,7 +56,8 @@
                     android:id="@+id/rv_site_list"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:paddingTop="@dimen/dp_20" />
+                    android:layout_marginTop="@dimen/dp_26"
+                    />
                 
                 <View
                     app:layout_constraintBottom_toBottomOf="parent"
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt
index bcb249d2bc..4c7f883a82 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt
@@ -37,7 +37,9 @@ class FuncBizProvider : IMoGoFuncBizProvider {
         dispatchAutoPilotManager.init(context)
         cronTaskManager.startCronTask()
         OverviewDb.getDb(context)
-        MogoTrafficLightManager.INSTANCE.initServer(context)
+        if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
+            MogoTrafficLightManager.INSTANCE.initServer(context)
+        }
         VipCarManager.INSTANCE.initServer(context)
         if(!(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)
             && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode))){
diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt
index 0850c92c85..d0816a306d 100644
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt
@@ -270,10 +270,15 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
                     if (alertContent.isEmpty() || ttsContent.isEmpty()) {
                         return
                     }
-                    //大于10m，才提示rsi
-                    if (Math.round(rsiWarningData.warningMsgList[0].distance) > 10) {
+                    //大于10m，才提示rsi,超速不限制
+                    if (appId == "1") {
                         saveObuToDcData(appId, alertContent, ttsContent)
                         showWarning(appId, alertContent, ttsContent, direction)
+                    } else {
+                        if (Math.round(rsiWarningData.warningMsgList[0].distance) > 10) {
+                            saveObuToDcData(appId, alertContent, ttsContent)
+                            showWarning(appId, alertContent, ttsContent, direction)
+                        }
                     }
                 }
 
diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt
index 3c71ca57c5..147b6573e8 100644
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt
@@ -557,10 +557,15 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
                                 if (alertContent.isEmpty() || ttsContent.isEmpty()) {
                                     return
                                 }
-                                //大于10m，才提示rsi
-                                if (Math.round(data.warningMsgList[0].distance) > 10) {
+                                //大于10m，才提示rsi。超速不限制
+                                if (appId == "1") {
                                     saveObuData(appId, alertContent, ttsContent)
                                     showWarning(appId, alertContent, ttsContent, direction)
+                                } else {
+                                    if (Math.round(data.warningMsgList[0].distance) > 10) {
+                                        saveObuData(appId, alertContent, ttsContent)
+                                        showWarning(appId, alertContent, ttsContent, direction)
+                                    }
                                 }
 
                                 // 更新数据
diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt
index 953c4be308..1e5ce23be9 100644
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt
@@ -76,6 +76,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
      * @param trafficLights 感知红绿灯
      */
     override fun onAutopilotPerceptionTrafficLight(trafficLights: TrafficLightOuterClass.TrafficLights?) {
+        CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "onAutopilotPerceptionTrafficLight ---- hasObuLightStatus = $hasObuLightStatus ----hasAiLightStatus = $hasAiLightStatus ")
         if (!hasObuLightStatus) {
             if (!hasAiLightStatus) {
                 trafficLights?.let { it ->
@@ -159,7 +160,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
      * 是否重置红绿灯数据,需要确保，在obu的红绿灯显示的时候，不执行。否则会闪屏
      */
     override fun resetTrafficLight(isReset: Boolean) {
-        CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "resetTrafficLight ------> isReset = $isReset ")
+        CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "resetTrafficLight ------> isReset = $isReset ---hasObuLightStatus = $hasObuLightStatus")
         if (!hasObuLightStatus) {
             if(isReset){
                 hide()
@@ -168,7 +169,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
     }
 
     private fun hide(){
-        CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "hide() -------> ")
+        CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "hide() ---------> ")
         CallerTrafficLightListenerManager.disableTrafficLight()
         if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
             CallerTelematicManager.sendMsgToAllClients(TelematicConstant.HIDE_TRAFFIC_LIGHT, "0".toByteArray())
@@ -184,11 +185,10 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
         lightSource: DataSourceType
     ) {
         super.onTrafficLightPlusSource(light, remain, lightSource)
-//        CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "onTrafficLightPlusSource ----- light = $light ---remain = $remain ---lightSource = $lightSource")
         if (lightSource == DataSourceType.OBU) {
             hasObuLightStatus = true
         }
-
+        CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "onTrafficLightPlusSource ----- light = $light ---remain = $remain ---lightSource = $lightSource ---hasObuLightStatus = $hasObuLightStatus ---hasAiLightStatus = $hasAiLightStatus")
         CallerTrafficLightListenerManager.showTrafficLight(light, lightSource)
         if (remain == -1) {
             CallerTrafficLightListenerManager.disableTrafficLightCountDown()
@@ -217,6 +217,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
 
     private fun updateTrafficLight(trafficLightResult: TrafficLightResult) {
         val currentTrafficLight = trafficLightResult.currentRoadTrafficLight()
+        CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "updateTrafficLight ----- currentTrafficLight = $currentTrafficLight")
         currentTrafficLight?.let {
             val remain = if (it.remain > 99) {
                 99