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 ae8970ff66..523a6fc82d 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
@@ -6,12 +6,13 @@
 
     <com.mogo.eagle.core.function.hmi.ui.widget.SteeringWheelView
         android:id="@+id/steering_wheel"
-        android:layout_width="@dimen/dp_630"
-        android:layout_height="@dimen/dp_630"
-        android:layout_marginLeft="-59px"
-        android:layout_marginTop="@dimen/dp_20"
+        android:layout_width="@dimen/dp_300"
+        android:layout_height="@dimen/dp_300"
+        android:layout_marginLeft="@dimen/dp_90"
+        android:layout_marginTop="@dimen/dp_112"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
+
     <ImageView
         android:id="@+id/bus_p_autopilot_iv"
         android:layout_width="wrap_content"
@@ -19,7 +20,7 @@
         android:layout_marginLeft="@dimen/bus_p_curent_station_panel_margin"
         android:layout_marginTop="@dimen/dp_112"
         android:scaleType="fitXY"
-        android:visibility="gone"
+        android:visibility="invisible"
         android:layout_gravity="center_horizontal"
         android:src="@drawable/bus_p_un_auto_nor"
         app:layout_constraintLeft_toLeftOf="parent"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowHelper.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowHelper.kt
index db7881ef3f..4a0ff636b6 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowHelper.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowHelper.kt
@@ -89,8 +89,10 @@ internal class WarningFloatWindowHelper(
         // 将浮窗布局文件添加到父容器frameLayout中，并返回该浮窗文件
         val floatingView = config.layoutView?.also {
             try {
-                val parent = (it.parent as ViewGroup)
-                parent.removeAllViews()
+                if (it.parent != null) {
+                    val parent = (it.parent as ViewGroup)
+                    parent.removeAllViews()
+                }
             } catch (e: Exception) {
                 e.printStackTrace()
             }
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
index 623824d7f6..d4d2eb4e49 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -1413,10 +1413,15 @@ class DebugSettingView @JvmOverloads constructor(
             AppConfigInfo.widevineIDMd5 =
                 DeviceIdUtils.getWidevineIDWithMd5(AbsMogoApplication.getApp())
         }
-        AppConfigInfo.mogoSN = MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn
-        AppConfigInfo.mogoToken = MoGoAiCloudClient.getInstance().aiCloudClientConfig.token
+        if (MoGoAiCloudClient.getInstance().aiCloudClientConfig != null) {
+            AppConfigInfo.mogoSN = MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn
+            AppConfigInfo.mogoToken = MoGoAiCloudClient.getInstance().aiCloudClientConfig.token
+        }
+
         AppConfigInfo.netMode = DebugConfig.getNetMode()
-        AppConfigInfo.mapSdkVersion = MogoMap.getInstance().mogoMap.mapVersion
+        if (MogoMap.getInstance().mogoMap != null) {
+            AppConfigInfo.mapSdkVersion = MogoMap.getInstance().mogoMap.mapVersion
+        }
         AppConfigInfo.isConnectNet = NetworkUtils.isConnected(context)
         AppConfigInfo.isConnectSocket = DebugConfig.isDownloadSnapshot()
 
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 c66620d1ff..b241f9e9cf 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
@@ -14,11 +14,13 @@ import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
 
 import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
+import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotVehicleStateListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotVehicleStateListenerManager;
 import com.mogo.eagle.core.function.hmi.R;
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.ThreadUtils;
 
@@ -55,7 +57,11 @@ public class SteeringWheelView extends ConstraintLayout {
     public SteeringWheelView(@NonNull Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
         Log.d(TAG, "2");
-        LayoutInflater.from(context).inflate(R.layout.hmi_steering_wheel_taxi, this);
+        if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
+            LayoutInflater.from(context).inflate(R.layout.hmi_steering_wheel_bus, this);
+        } else {
+            LayoutInflater.from(context).inflate(R.layout.hmi_steering_wheel_taxi, this);
+        }
         initView();
         CallerAutoPilotStatusListenerManager.INSTANCE.addListener(TAG, mGoAutopilotStatusListener);
         CallerAutopilotVehicleStateListenerManager.INSTANCE.addListener(TAG, mIMoGoAutopilotVehicleStateListener);
@@ -148,7 +154,7 @@ public class SteeringWheelView extends ConstraintLayout {
         }
 
         /**
-         * 方向盘转向角
+         * 方向盘转向角 左+右-
          * @param steering
          */
         @Override
@@ -156,12 +162,12 @@ public class SteeringWheelView extends ConstraintLayout {
             ThreadUtils.runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
-                    Log.d(TAG, "steering" + String.valueOf(steering));
-                    if (steeringTVL != null && steering < 0) {
+                    Log.d(TAG, "steering====" + String.valueOf(steering));
+                    if (steeringTVL != null && steering > 0) {
                         steeringTVR.setVisibility(View.INVISIBLE);
                         steeringTVL.setVisibility(View.VISIBLE);
                         steeringTVL.setText(String.valueOf((int) steering) + "°");
-                    } else if (steeringTVR != null && steering >= 0) {
+                    } else if (steeringTVR != null && steering <= 0) {
                         steeringTVL.setVisibility(View.INVISIBLE);
                         steeringTVR.setVisibility(View.VISIBLE);
                         steeringTVR.setText(String.valueOf((int) steering) + "°");
@@ -169,7 +175,7 @@ public class SteeringWheelView extends ConstraintLayout {
                         Log.d(TAG, "onAutopilotSteeringData error");
                     }
                     animationWithSteeringData(steering);
-                    steeringCircularV.setProgress((int) (steering * 100) / 360, 1000);
+                    steeringCircularV.setProgress((int) (-steering * 100) / 360, 1000);
                 }
             });
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_outer_bus.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_outer_bus.xml
new file mode 100644
index 0000000000..f5e1da1a55
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_outer_bus.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/background">
+        <shape
+            android:innerRadius="@dimen/dp_85"
+            android:shape="ring"
+            android:thickness="4px"
+            android:useLevel="false">
+            <solid android:color="#BBCFF6" />
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_outer.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_outer_taxi.xml
similarity index 100%
rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_outer.xml
rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_outer_taxi.xml
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_wheel_bus.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_wheel_bus.xml
new file mode 100644
index 0000000000..156cc4f0e0
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_wheel_bus.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/dp_36"/>
+            <gradient android:angle="315" android:endColor="#E6E9EFFC" android:startColor="#E6E9EFFC" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_wheel.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_wheel_taxi.xml
similarity index 100%
rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_wheel.xml
rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_steering_wheel_taxi.xml
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/streeing_wheel_rotate.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/streeing_wheel_rotate.xml
deleted file mode 100644
index d78c62cc72..0000000000
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/streeing_wheel_rotate.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:left="4dp"
-        android:top="4dp"
-        >
-        <shape>
-            <solid android:color="#FF31486E" />
-            <corners android:radius="10dp" />
-        </shape>
-    </item>
-
-    <item
-        android:bottom="4dp"
-        android:left="4dp"
-        android:right="4dp"
-        android:top="4dp">
-        <shape>
-            <solid android:color="#FFFFFF" />
-            <corners android:radius="10dp" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
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
new file mode 100644
index 0000000000..258956925c
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bg_steering_wheel_bus">
+
+    <ProgressBar
+        android:id="@+id/blue_circle"
+        android:layout_width="@dimen/dp_180"
+        android:layout_height="@dimen/dp_180"
+        android:layout_centerHorizontal="true"
+        android:layout_marginLeft="@dimen/dp_60"
+        android:layout_marginTop="@dimen/dp_38"
+        android:layout_marginRight="@dimen/dp_60"
+        android:indeterminateDrawable="@drawable/bg_steering_outer_bus"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/steering_tv_left"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_50"
+        android:layout_marginRight="-10px"
+        android:gravity="right"
+        android:text="-18°"
+        android:textColor="#415479"
+        android:textSize="@dimen/dp_26"
+        android:visibility="invisible"
+        app:layout_constraintRight_toLeftOf="@+id/blue_circle"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/steering_tv_right"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="-10px"
+        android:layout_marginTop="@dimen/dp_50"
+        android:gravity="left"
+        android:text="18°"
+        android:textColor="#415479"
+        android:textSize="@dimen/dp_26"
+        app:layout_constraintLeft_toRightOf="@+id/autopilot_iv"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.mogo.eagle.core.function.hmi.ui.widget.CircularProgressView
+        android:id="@+id/steering_circular"
+        android:layout_width="@dimen/dp_180"
+        android:layout_height="@dimen/dp_180"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="@dimen/dp_36"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:progWidth="8px"
+        app:progress="0" />
+
+    <ImageView
+        android:id="@+id/autopilot_iv"
+        android:layout_width="@dimen/dp_186"
+        android:layout_height="@dimen/dp_186"
+        android:layout_centerHorizontal="true"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="@dimen/dp_34"
+        android:src="@drawable/bg_auto"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:layout_width="@dimen/dp_40"
+        android:layout_height="@dimen/dp_40"
+        android:src="@drawable/icon_in_steering"
+        app:layout_constraintBottom_toBottomOf="@+id/autopilot_iv"
+        app:layout_constraintLeft_toLeftOf="@+id/autopilot_iv"
+        app:layout_constraintRight_toRightOf="@+id/autopilot_iv"
+        app:layout_constraintTop_toTopOf="@+id/autopilot_iv" />
+
+
+    <com.mogo.eagle.core.function.hmi.ui.widget.TapPositionView
+        android:id="@+id/tap_position"
+        android:layout_width="@dimen/dp_240"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/dp_20"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/blue_circle" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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 a6725a415a..bf88f0d590 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
@@ -26,7 +26,7 @@
         android:layout_marginLeft="@dimen/dp_85"
         android:layout_marginTop="@dimen/dp_130"
         android:layout_marginRight="@dimen/dp_85"
-        android:indeterminateDrawable="@drawable/bg_steering_outer"
+        android:indeterminateDrawable="@drawable/bg_steering_outer_taxi"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />