diff --git a/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/provider/BusPStatusViewManager.java b/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java
similarity index 54%
rename from OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/provider/BusPStatusViewManager.java
rename to OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java
index 0d9743f6f5..d4fdde8ebb 100644
--- a/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/provider/BusPStatusViewManager.java
+++ b/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java
@@ -6,8 +6,11 @@ import android.view.View;
 import androidx.annotation.NonNull;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
+import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.data.constants.MogoServicePaths;
 import com.mogo.eagle.core.function.api.hmi.view.IStatusViewLayout;
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
+import com.mogo.och.bus.passenger.passenger.ui.widget.M2StatusBarView;
 import com.mogo.och.bus.passenger.ui.BusPStatusBarView;
 
 /**
@@ -17,13 +20,18 @@ import com.mogo.och.bus.passenger.ui.BusPStatusBarView;
  * 根据优先级控制显示 window view.
  */
 @Route( path = MogoServicePaths.PATH_STATUS_VIEW_MANAGER )
-public class BusPStatusViewManager implements IStatusViewLayout {
+public class StatusViewManager implements IStatusViewLayout {
 
 
     @NonNull
     @Override
     public View getStatusView(Context context) {
-        return new BusPStatusBarView(context);
+        if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) {
+            return new M2StatusBarView(context);
+        } else if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)) {
+            return  new BusPStatusBarView(context);
+        }
+        return  new BusPStatusBarView(context);
     }
 
     @Override
diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/provider/M2StatusViewManager.java b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/provider/M2StatusViewManager.java
deleted file mode 100644
index 3c79925efa..0000000000
--- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/provider/M2StatusViewManager.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.mogo.och.bus.passenger.passenger.provider;
-
-import android.content.Context;
-import android.view.View;
-
-import com.mogo.och.bus.passenger.passenger.ui.widget.M2StatusBarView;
-import androidx.annotation.NonNull;
-
-import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.eagle.core.data.constants.MogoServicePaths;
-import com.mogo.eagle.core.function.api.hmi.view.IStatusViewLayout;
-
-/**
- * @author congtaowang
- * @since 2020-01-06
- * <p>
- * 根据优先级控制显示 window view.
- */
-@Route( path = MogoServicePaths.PATH_STATUS_VIEW_MANAGER )
-public class M2StatusViewManager implements IStatusViewLayout {
-
-
-    @NonNull
-    @Override
-    public View getStatusView(Context context) {
-        return new M2StatusBarView(context);
-    }
-
-    @Override
-    public void init(Context context) {
-
-    }
-}
diff --git a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerStateView.kt b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerStateView.kt
index a1388b6280..f7b335c3a2 100644
--- a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerStateView.kt
+++ b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerStateView.kt
@@ -22,22 +22,13 @@ class ScannerStateView @JvmOverloads constructor(
 
     override fun stateChange(newBindValue: BindStatus, newOpentValue: OpenStatus) {
         CallerLogger.d(SceneConstant.M_BUS_P + TAG, "newBindValue = $newBindValue newOpentValue = $newOpentValue")
-        when (newBindValue) {
-            BindStatus.BIND_SUCCEED -> {
-                // 绑定成功
-                when (newOpentValue) {
-                    OpenStatus.Open -> {
-                        //成功打开
-                        visibility = View.GONE
-                    }
-                    OpenStatus.Unopen -> {
-                        // 打开失败
-                        setImageResource(R.drawable.driver_connect_statis)
-                    }
-                }
+        when (newOpentValue) {
+            OpenStatus.Open -> {
+                //成功打开
+                visibility = View.GONE
             }
-            else ->{
-                // 绑定失败
+            OpenStatus.Unopen -> {
+                // 打开失败
                 setImageResource(R.drawable.driver_connect_statis)
             }
         }
diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/provider/M2StatusViewManager.java b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/provider/StatusViewManager.java
similarity index 55%
rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/provider/M2StatusViewManager.java
rename to OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/provider/StatusViewManager.java
index 49b0288cd3..6c11478908 100644
--- a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/provider/M2StatusViewManager.java
+++ b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/provider/StatusViewManager.java
@@ -3,6 +3,9 @@ package com.mogo.och.shuttle.passenger.provider;
 import android.content.Context;
 import android.view.View;
 
+import com.mogo.eagle.core.data.config.FunctionBuildConfig;
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
+import com.mogo.och.shuttle.passenger.ui.BusPStatusBarView;
 import com.mogo.och.shuttle.passenger.ui.widget.M2StatusBarView;
 import androidx.annotation.NonNull;
 
@@ -17,13 +20,16 @@ import com.mogo.eagle.core.function.api.hmi.view.IStatusViewLayout;
  * 根据优先级控制显示 window view.
  */
 @Route( path = MogoServicePaths.PATH_STATUS_VIEW_MANAGER )
-public class M2StatusViewManager implements IStatusViewLayout {
-
-
+public class StatusViewManager implements IStatusViewLayout {
     @NonNull
     @Override
     public View getStatusView(Context context) {
-        return new M2StatusBarView(context);
+        if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) {
+            return new M2StatusBarView(context);
+        } else if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)) {
+            return  new BusPStatusBarView(context);
+        }
+        return  new BusPStatusBarView(context);
     }
 
     @Override
diff --git a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/provider/B1StatusViewManager.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/provider/B1StatusViewManager.java
deleted file mode 100644
index e29ef04b47..0000000000
--- a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/provider/B1StatusViewManager.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.mogo.och.shuttle.passenger.provider;
-
-import android.content.Context;
-import android.view.View;
-
-import com.mogo.och.shuttle.passenger.ui.BusPStatusBarView;
-import androidx.annotation.NonNull;
-
-import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.eagle.core.data.constants.MogoServicePaths;
-import com.mogo.eagle.core.function.api.hmi.view.IStatusViewLayout;
-
-/**
- * @author congtaowang
- * @since 2020-01-06
- * <p>
- * 根据优先级控制显示 window view.
- */
-@Route( path = MogoServicePaths.PATH_STATUS_VIEW_MANAGER )
-public class B1StatusViewManager implements IStatusViewLayout {
-
-
-    @NonNull
-    @Override
-    public View getStatusView(Context context) {
-        return new BusPStatusBarView(context);
-    }
-
-    @Override
-    public void init(Context context) {
-
-    }
-}
diff --git a/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_view_status_bar.xml b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_view_status_bar.xml
index f48c5371bc..0551cdb433 100644
--- a/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_view_status_bar.xml
+++ b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_view_status_bar.xml
@@ -49,7 +49,7 @@
         app:layout_constraintStart_toEndOf="@+id/wifiStateView"
         android:layout_width="@dimen/dp_24"
         android:layout_height="@dimen/dp_24"
-        android:src="@drawable/scanner_qr_code"
+        android:src="@drawable/driver_connect_statis"
         android:layout_gravity="center"
         android:layout_marginStart="@dimen/dp_40"/>
 
diff --git a/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_view_status_bar.xml b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_view_status_bar.xml
index a2d86ad7bd..f05bbb8358 100644
--- a/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_view_status_bar.xml
+++ b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_view_status_bar.xml
@@ -30,6 +30,17 @@
         android:layout_gravity="center"
         android:layout_marginStart="@dimen/dp_32" />
 
+    <com.mogo.och.shuttle.passenger.manager.scnner.ScannerStateView
+        android:id="@+id/scannerStateView"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/blueToothView"
+        android:layout_width="@dimen/dp_24"
+        android:layout_height="@dimen/dp_24"
+        android:src="@drawable/driver_connect_statis"
+        android:layout_gravity="center"
+        android:layout_marginStart="@dimen/dp_40"/>
+
     <ProgressBar
         android:id="@+id/progress"
         style="?android:attr/progressBarStyleHorizontal"