diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
index 523a6fc82d..fd30dd553b 100644
--- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
@@ -8,7 +8,7 @@
         android:id="@+id/steering_wheel"
         android:layout_width="@dimen/dp_300"
         android:layout_height="@dimen/dp_300"
-        android:layout_marginLeft="@dimen/dp_90"
+        android:layout_marginLeft="@dimen/dp_50"
         android:layout_marginTop="@dimen/dp_112"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -20,24 +20,29 @@
         android:layout_marginLeft="@dimen/bus_p_curent_station_panel_margin"
         android:layout_marginTop="@dimen/dp_112"
         android:scaleType="fitXY"
-        android:visibility="invisible"
+        android:visibility="gone"
         android:layout_gravity="center_horizontal"
         android:src="@drawable/bus_p_un_auto_nor"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"/>
 
-    <androidx.cardview.widget.CardView
+    <com.mogo.och.common.module.wigets.OCHBorderShadowLayout
         android:id="@+id/iv_bg"
         android:layout_width="@dimen/bus_p_curent_station_panel_width"
         android:layout_height="@dimen/bus_p_curent_station_panel_height"
-        android:layout_marginLeft="@dimen/bus_p_curent_station_panel_margin"
+        android:layout_marginLeft="@dimen/bus_p_curent_station_panel_margin_left"
         android:layout_marginBottom="@dimen/bus_p_curent_station_panel_margin"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
-        android:alpha="0.99"
-        app:cardElevation="@dimen/dp_5"
-        app:cardBackgroundColor="@color/bus_p_panel_cur_station_panel_color"
-        app:cardCornerRadius="20px"/>
+        app:bgColor="@color/bus_p_panel_cur_station_panel_color"
+        app:blurRadius="@dimen/dp_12"
+        app:shadowRadius="@dimen/dp_20"
+        app:shadowColor="@color/bus_p_panel_edge_shadow"
+        app:xOffset="0px"
+        app:yOffset="0px">
+
+    </com.mogo.och.common.module.wigets.OCHBorderShadowLayout>
+
     <TextView
         android:id="@+id/bus_p_cur_station_title"
         android:layout_width="wrap_content"
diff --git a/OCH/mogo-och-bus-passenger/src/main/res/values-sw320dp/dimens.xml b/OCH/mogo-och-bus-passenger/src/main/res/values-sw320dp/dimens.xml
index d79687928f..e1eebd7bcb 100644
--- a/OCH/mogo-och-bus-passenger/src/main/res/values-sw320dp/dimens.xml
+++ b/OCH/mogo-och-bus-passenger/src/main/res/values-sw320dp/dimens.xml
@@ -50,6 +50,7 @@
     <dimen name="bus_p_curent_station_panel_width">638px</dimen>
     <dimen name="bus_p_curent_station_panel_height">316px</dimen>
     <dimen name="bus_p_curent_station_panel_margin">50px</dimen>
+    <dimen name="bus_p_curent_station_panel_margin_left">38px</dimen>
     <dimen name="bus_p_curent_station_txt_size">44px</dimen>
     <dimen name="bus_p_curent_station_txt_size1">55px</dimen>
     <dimen name="bus_p_curent_station_tip_size1">40px</dimen>
diff --git a/OCH/mogo-och-bus-passenger/src/main/res/values/colors.xml b/OCH/mogo-och-bus-passenger/src/main/res/values/colors.xml
index 06035c5d4b..8e63faf83d 100644
--- a/OCH/mogo-och-bus-passenger/src/main/res/values/colors.xml
+++ b/OCH/mogo-och-bus-passenger/src/main/res/values/colors.xml
@@ -26,4 +26,5 @@
  <color name="bus_p_panel_cur_station_panel_color">#E6E9EFFC</color>
  <color name="bus_p_route_view_left_edge_shadow">#33394C63</color>
  <color name="bus_p_traffic_txt_color">#2D3E5F</color>
+ <color name="bus_p_panel_edge_shadow">#33394C63</color>
 </resources>
\ No newline at end of file
diff --git a/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml b/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml
index 6ad2fdc16a..c32aec9eff 100644
--- a/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml
+++ b/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml
@@ -50,7 +50,8 @@
 
     <dimen name="bus_p_curent_station_panel_width">638px</dimen>
     <dimen name="bus_p_curent_station_panel_height">316px</dimen>
-    <dimen name="bus_p_curent_station_panel_margin">50px</dimen>
+    <dimen name="bus_p_curent_station_panel_margin">38px</dimen>
+    <dimen name="bus_p_curent_station_panel_margin_left">38px</dimen>
     <dimen name="bus_p_curent_station_txt_size">44px</dimen>
     <dimen name="bus_p_curent_station_txt_size1">55px</dimen>
     <dimen name="bus_p_curent_station_tip_size1">40px</dimen>
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java
index 88512fac87..fddda077d6 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java
@@ -81,10 +81,10 @@ public class SteeringWheelView extends ConstraintLayout {
         steeringCircularV.setProgress((int) (180 * 100) / 360, 1000);
         if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) {
             steeringCircularVAlpha = findViewById(R.id.steering_circular_alpha);
-            steeringCircularVAlpha.setBackWidth(12);
-            steeringCircularVAlpha.setBlurMaskFilter(BlurMaskFilter.Blur.NORMAL, 12);
+            steeringCircularVAlpha.setBackWidth(8);
             steeringCircularVAlpha.setBackColor(R.color.hmi_clear_00);
-            steeringCircularVAlpha.setProgColor(R.color.hmi_light_blue_alpha);
+            steeringCircularVAlpha.setProgColor(R.color.hmi_light_blue_alpha_00, R.color.hmi_light_blue_alpha_ff);
+            steeringCircularVAlpha.setBlurMaskFilter(BlurMaskFilter.Blur.NORMAL, 12);
             steeringCircularVAlpha.setProgress((int) (180 * 100) / 360, 1000);
         }
     }
@@ -185,7 +185,12 @@ public class SteeringWheelView extends ConstraintLayout {
                         Log.d(TAG, "onAutopilotSteeringData error");
                     }
                     animationWithSteeringData(steering);
-                    steeringCircularV.setProgress((int) (-steering * 100) / 360, 1000);
+                    if (steeringCircularV != null) {
+                        steeringCircularV.setProgress((int) (-steering * 100) / 360, 1000);
+                    }
+                    if (steeringCircularVAlpha != null) {
+                        steeringCircularVAlpha.setProgress((int) (-steering * 100) / 360, 1000);
+                    }
                 }
             });
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt
index 8aff937915..6408ce2e05 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt
@@ -58,7 +58,7 @@ class VersionNameView @JvmOverloads constructor(
         UiThreadHandler.post {
             tvMapVersionName?.let {
                 if (!dockerVersion.isNullOrEmpty()) {
-                    it.text = "MAP:${dockerVersion}"
+                    it.text = " ; MAP:${dockerVersion}"
                 }
             }
         }
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml
index 258956925c..7e523648ba 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml
@@ -25,7 +25,7 @@
         android:layout_marginTop="@dimen/dp_50"
         android:layout_marginRight="-10px"
         android:gravity="right"
-        android:text="-18°"
+        android:text="180°"
         android:textColor="#415479"
         android:textSize="@dimen/dp_26"
         android:visibility="invisible"
@@ -39,7 +39,7 @@
         android:layout_marginLeft="-10px"
         android:layout_marginTop="@dimen/dp_50"
         android:gravity="left"
-        android:text="18°"
+        android:text="180°"
         android:textColor="#415479"
         android:textSize="@dimen/dp_26"
         app:layout_constraintLeft_toRightOf="@+id/autopilot_iv"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml
index 2166c95c20..b61a1e2afc 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml
@@ -24,7 +24,7 @@
         android:layout_marginTop="@dimen/dp_130"
         android:layout_marginRight="-10px"
         android:gravity="right"
-        android:text="-18°"
+        android:text="180°"
         android:textColor="#FFFFFFFF"
         android:textSize="@dimen/dp_37"
         android:visibility="invisible"
@@ -38,7 +38,7 @@
         android:layout_marginLeft="-10px"
         android:layout_marginTop="@dimen/dp_130"
         android:gravity="left"
-        android:text="18°"
+        android:text="180°"
         android:textColor="#FFFFFFFF"
         android:textSize="@dimen/dp_37"
         app:layout_constraintLeft_toRightOf="@+id/autopilot_iv"
@@ -90,6 +90,6 @@
         android:layout_marginTop="@dimen/dp_30"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/steering_circular" />
+        app:layout_constraintTop_toBottomOf="@+id/steering_circular_alpha" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_version_name.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_version_name.xml
index d281975a87..1a3e0229dc 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_version_name.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_version_name.xml
@@ -2,14 +2,14 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="horizontal">
 
     <TextView
         android:id="@+id/tvAppVersionName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="14sp"
-        android:textColor="#9EFFFFFF"
+        android:textColor="#FFBEC6EF"
         />
 
     <TextView
@@ -17,7 +17,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="14sp"
-        android:textColor="#9EFFFFFF"
+        android:textColor="#FFBEC6EF"
         />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
index 85d44ba7f9..f055c0f405 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
@@ -55,8 +55,9 @@
     <color name="hmi_traffic_light_yellow_color_up">#FFFFE198</color>
     <color name="hmi_traffic_light_yellow_color_down">#FFFF9B00</color>
     <color name="hmi_light_blue">#45D3FF</color>
-    <color name="hmi_dark_blue">#1B5BFF</color>
+    <color name="hmi_dark_blue">#3261B6</color>
     <color name="hmi_light_back_bg">#1EBBCFF6</color>
-    <color name="hmi_light_blue_alpha">#6C79C4</color>
-    <color name="hmi_clear_00">#0045D3FF</color>
+    <color name="hmi_light_blue_alpha_00">#D945D3FF</color>
+    <color name="hmi_light_blue_alpha_ff">#D93261B6</color>
+    <color name="hmi_clear_00">#00FFFFFF</color>
 </resources>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt
index ae399ce8ad..2adcd9609a 100644
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.location.Location
 import android.os.Handler
 import android.os.Looper
+import android.util.Log
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X
 import com.mogo.eagle.core.data.trafficlight.RoadIDResult
 import com.mogo.eagle.core.data.trafficlight.TrafficLightDetail
@@ -39,6 +40,7 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 {
     private var trafficLightResult: TrafficLightResult? = null
 
     private var inRange: Boolean = false
+    private var firstLoopCrossRoad: Boolean = true //开启循环请求路口
 
     private var mThreadHandler: Handler? = null
 
@@ -48,11 +50,12 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 {
             .registerCenterApi.registerCarLocationChangedListener(TAG, this)
         mThreadHandler =
             TrafficLightThreadHandler(Looper.getMainLooper(), {
-                //查询路口时，如果红绿灯显示，则隐藏掉
-//                if (TrafficLightHMIManager.INSTANCE.isWarningTrafficLightShow()) {
-//                    TrafficLightHMIManager.INSTANCE.hideTrafficLight()
-//                    CallTrafficLightListenerManager.resetTrafficLightData()
-//                }
+                //第一次查询路口时，如果红绿灯显示，则隐藏掉
+                if(firstLoopCrossRoad && TrafficLightHMIManager.INSTANCE.isWarningTrafficLightShow()){
+                    TrafficLightHMIManager.INSTANCE.hideTrafficLight()
+                    CallTrafficLightListenerManager.resetTrafficLightData()
+                }
+                firstLoopCrossRoad = false
                 mLocation?.let { it ->
                     val tileId = CallerMapUIServiceManager.getMapUIController()?.getTileId(it.longitude, it.latitude) ?: 0
                     trafficLightNetWorkModel.requestRoadID(
@@ -134,6 +137,7 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 {
                     CallTrafficLightListenerManager.invokeEnterCrossRoad(false)
                     inRange = false
                     trafficLightResult = null
+                    firstLoopCrossRoad = true
                     mThreadHandler?.sendEmptyMessage(MSG_WHAT_STOP_SEARCH_TRAFFIC_LIGHT)
                     TrafficLightHMIManager.INSTANCE.hideTrafficLight()
                     CallTrafficLightListenerManager.resetTrafficLightData()
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/TrafficLightDispatcher.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/TrafficLightDispatcher.kt
index e140dee55d..d1fb850bd2 100644
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/TrafficLightDispatcher.kt
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/TrafficLightDispatcher.kt
@@ -59,7 +59,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener , IMoGoTrafficLigh
                 }
                 if(light == null){
                     //隐藏红绿灯显示
-                    CallerHmiManager.showWarningTrafficLight(0)
+                    TrafficLightHMIManager.INSTANCE.hideTrafficLight()
                 }else{
                     when (light.state) {
                         TrafficLightOuterClass.LightState.STATE_RED -> {