diff --git a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml
index 0bab6f9d11..ab3db7be7a 100644
--- a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml
+++ b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml
@@ -221,6 +221,15 @@
         android:layout_marginTop="-24dp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@id/module_mogo_och_autopilot_status" />
+
+    <com.mogo.och.common.module.wigets.map.switchvisual.VisualViewDirver
+        app:layout_constraintStart_toEndOf="@+id/module_mogo_och_station_panel_container"
+        app:layout_constraintBottom_toBottomOf="@+id/module_mogo_och_station_panel_container"
+        android:layout_marginBottom="@dimen/dp_28"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+
     <!--订单调试页面-->
     <include
         android:id="@+id/module_mogo_och_bus_test_bar"
@@ -256,16 +265,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@id/module_mogo_och_arrived_tv" />
 
-    <!--切换地图远近事件 @dimen/module_switch_map -->
-    <com.mogo.och.common.module.wigets.map.switchvisual.VisualView
-        android:id="@+id/switch_visual_view"
-        android:layout_width="@dimen/dp_142"
-        android:layout_height="@dimen/dp_142"
-        android:layout_marginStart="-10dp"
-        android:layout_marginBottom="@dimen/dp_17"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/toolsView" />
-
 
     <com.mogo.och.common.module.wigets.map.reportworkorder.ReportWorkOrderView
         android:id="@+id/reportworkorderview"
@@ -274,7 +273,7 @@
         android:layout_marginStart="-10dp"
         android:layout_marginBottom="@dimen/dp_17"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/switch_visual_view" />
+        app:layout_constraintLeft_toRightOf="@id/toolsView" />
 
     <com.mogo.eagle.core.function.hmi.ui.widget.RomaTaxiView
         android:layout_width="@dimen/dp_142"
diff --git a/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml b/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml
index daa6f3b6e1..e73ddb0a21 100644
--- a/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml
+++ b/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml
@@ -187,6 +187,13 @@
         app:layout_constraintTop_toBottomOf="@id/autopilot_status"
         app:layout_goneMarginTop="@dimen/dp_530" />
 
+    <com.mogo.och.common.module.wigets.map.switchvisual.VisualViewDirver
+        app:layout_constraintStart_toEndOf="@+id/module_mogo_och_station_panel_container"
+        app:layout_constraintBottom_toBottomOf="@+id/module_mogo_och_station_panel_container"
+        android:layout_marginBottom="@dimen/dp_46"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
     <!--订单信息-->
     <include
         android:id="@+id/module_mogo_och_bus_test_bar"
@@ -223,23 +230,13 @@
         android:layout_width="@dimen/dp_142"
         android:layout_height="@dimen/dp_142"/>
 
-    <!--切换地图远近事件 @dimen/module_switch_map -->
-    <com.mogo.och.common.module.wigets.map.switchvisual.VisualView
-        android:id="@+id/switch_visual_view"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/toolsView"
-        android:layout_marginStart="-10dp"
-        android:layout_marginBottom="@dimen/dp_17"
-        android:layout_width="@dimen/dp_142"
-        android:layout_height="@dimen/dp_142"/>
-
 
     <com.mogo.och.common.module.wigets.map.reportworkorder.ReportWorkOrderView
         android:id="@+id/reportworkorderview"
         android:layout_marginStart="-10dp"
         android:layout_marginBottom="@dimen/dp_17"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/switch_visual_view"
+        app:layout_constraintLeft_toRightOf="@id/toolsView"
         android:layout_width="@dimen/dp_142"
         android:layout_height="@dimen/dp_142"/>
 
diff --git a/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt b/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt
index 73fdd2c46e..7aeb823941 100644
--- a/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt
+++ b/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt
@@ -11,6 +11,9 @@ import com.google.gson.reflect.TypeToken
 import com.mogo.eagle.core.data.enums.DataSourceType
 import com.mogo.eagle.core.data.enums.EventTypeEnumNew
 import com.mogo.eagle.core.data.map.MogoLocation
+import com.mogo.eagle.core.function.angle.scenes.CrossRoad
+import com.mogo.eagle.core.function.angle.scenes.Default
+import com.mogo.eagle.core.function.angle.scenes.LongSight
 import com.mogo.eagle.core.function.api.hmi.xiaozhi.event.V2N
 import com.mogo.eagle.core.function.api.hmi.xiaozhi.state.State
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
@@ -23,6 +26,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerPlanningActionsListener
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.call.map.CallerMapRomaListener
+import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.ActivityUtils
@@ -57,6 +61,7 @@ object DebugDataDispatch {
     const val stopSite = "stopSite"
     const val v2N = "xiaozhiV2N"
     const val romal = "romal"
+    const val visualView = "visual"
 
 //    adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "location" --es path "1111/11111"
 //    adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "globalPath" --es path "sy73.json"
@@ -69,6 +74,7 @@ object DebugDataDispatch {
 //    adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "stopSite" --ei state 6  --ei action 1
 //    adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "xiaozhiV2N" --es poiType "10002" --ei state 0
 //    adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "romal"  --ei show 0
+//    adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "visual"  --ei show 0
 
 
     val ROOT_PATH =
@@ -170,6 +176,22 @@ object DebugDataDispatch {
                 pncAction.parkScenarioAction = planningaction.build()
                 CallerPlanningActionsListenerManager.invokePNCActions(pncAction.build())
             }
+            visualView ->{
+                val state = intent.getIntExtra("show", 0)
+                when (state) {
+                    0 -> {
+                        CallerVisualAngleManager.changeScene(LongSight(0))
+                    }
+                    1 -> {
+                        CallerVisualAngleManager.changeScene(Default(0))
+                    }
+                    2 -> {
+                        CallerVisualAngleManager.changeScene(CrossRoad(0))
+                    }
+                    else -> {}
+                }
+
+            }
             romal ->{
                 val state = intent.getIntExtra("show", 0)
                 CallerMapRomaListener.invokeMapRomaRange(state==0)
diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/SeekBarView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/SeekBarView.kt
index 20323a5fce..c27788d5d5 100644
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/SeekBarView.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/SeekBarView.kt
@@ -11,12 +11,19 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.widget.ImageView
+import androidx.annotation.DrawableRes
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.constraintlayout.widget.ConstraintSet
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.findViewTreeViewModelStoreOwner
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.common.module.R
+import kotlinx.android.synthetic.main.taxi_p_seekbar_visualangle.view.iv_visualangle_bg
+import kotlinx.android.synthetic.main.taxi_p_seekbar_visualangle.view.iv_visualangle_value
+import kotlinx.android.synthetic.main.taxi_seekbar_visualangle.view.iv_visualangle_bg_dark
+import kotlinx.android.synthetic.main.taxi_seekbar_visualangle.view.iv_visualangle_value_dark
 import kotlin.properties.Delegates
 
 
@@ -53,13 +60,6 @@ class SeekBarView : ConstraintLayout, VisualViewModel.IVisualCallback {
 
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
-
-        val split = (height - draggableButton.height) / 3f
-        canvas.drawLine(0f,split,width.toFloat(),split,p)
-        canvas.drawLine(0f,split*2,width.toFloat(),split*2,p)
-        canvas.drawLine(0f,(height - draggableButton.height).toFloat(),width.toFloat(),split*3,p)
-        val translationY = draggableButton.translationY
-        canvas.drawLine(0f,translationY,width.toFloat(),translationY,p)
     }
 
     private var initialX = 0f
@@ -82,12 +82,12 @@ class SeekBarView : ConstraintLayout, VisualViewModel.IVisualCallback {
 
                 if(draggableButton.translationY<-draggableButton.height){
                     tempSet.clone(this)
-                    tempSet.setTranslationY(R.id.iv_setting_only_value,-draggableButton.height.toFloat())
+                    tempSet.setTranslationY(draggableButton.id,-draggableButton.height.toFloat())
                     tempSet.applyTo(this)
                     return true
                 }else if (draggableButton.translationY>(height)){
                     tempSet.clone(this)
-                    tempSet.setTranslationY(R.id.iv_setting_only_value,(height).toFloat())
+                    tempSet.setTranslationY(draggableButton.id,(height).toFloat())
                     tempSet.applyTo(this)
                     return true
                 }
@@ -98,7 +98,7 @@ class SeekBarView : ConstraintLayout, VisualViewModel.IVisualCallback {
                 initialY = event.rawY;
 
                 tempSet.clone(this)
-                tempSet.setTranslationY(R.id.iv_setting_only_value,draggableButton.translationY+dy)
+                tempSet.setTranslationY(draggableButton.id,draggableButton.translationY+dy)
                 tempSet.applyTo(this)
             }
             MotionEvent.ACTION_UP -> {
@@ -178,10 +178,31 @@ class SeekBarView : ConstraintLayout, VisualViewModel.IVisualCallback {
     private lateinit var draggableButton:ImageView
 
     private fun initView() {
-        LayoutInflater.from(context).inflate(R.layout.taxi_p_seekbar_visualangle, this, true)
-        draggableButton = findViewById(R.id.iv_setting_only_value)
+        if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
+            LayoutInflater.from(context).inflate(R.layout.taxi_seekbar_visualangle, this, true)
+            draggableButton = findViewById(R.id.iv_visualangle_value_dark)
+        }else{
+            LayoutInflater.from(context).inflate(R.layout.taxi_p_seekbar_visualangle, this, true)
+            draggableButton = findViewById(R.id.iv_visualangle_value)
+        }
     }
 
+    fun setBgResource(@DrawableRes resource:Int){
+        if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
+            iv_visualangle_bg_dark.setImageResource(resource)
+        }else{
+            iv_visualangle_bg.setImageResource(resource)
+        }
+    }
+    fun setHumbResource(@DrawableRes resource:Int){
+        if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
+            iv_visualangle_value_dark.setImageResource(resource)
+        }else{
+            iv_visualangle_value.setImageResource(resource)
+        }
+    }
+
+
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
         viewModel = findViewTreeViewModelStoreOwner()?.let {
diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/VisualViewDirver.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/VisualViewDirver.kt
new file mode 100644
index 0000000000..988b4e8e41
--- /dev/null
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/VisualViewDirver.kt
@@ -0,0 +1,67 @@
+package com.mogo.och.common.module.wigets.map.switchvisual
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import androidx.constraintlayout.widget.ConstraintLayout
+import com.mogo.och.common.module.R
+import kotlinx.android.synthetic.main.common_visualangle_black.view.iv_center_location_bg
+import kotlinx.android.synthetic.main.common_visualangle_black.view.iv_visual_angle_title_bottom
+import kotlinx.android.synthetic.main.common_visualangle_black.view.iv_visual_angle_title_head
+import kotlinx.android.synthetic.main.common_visualangle_black.view.iv_visual_angle_title_value_bg
+
+
+class VisualViewDirver : ConstraintLayout {
+
+    private val TAG = "LeftBarView"
+
+    constructor(context: Context) : super(context)
+
+    constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet)
+
+    constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int) : super(context, attributeSet, defStyleAttr)
+
+    constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes)
+
+    init {
+    }
+
+    private fun initView() {
+        LayoutInflater.from(context).inflate(R.layout.common_visualangle_black, this, true)
+
+        iv_visual_angle_title_value_bg.enableCallback = object :SeekBarView.EnableCallback{
+            override fun enableChangeListener(enable: Boolean) {
+                if(enable){
+                    iv_visual_angle_title_head.setImageResource(R.drawable.commont_visual_head)
+                    iv_visual_angle_title_bottom.setImageResource(R.drawable.common_visual_bottom)
+                    iv_visual_angle_title_value_bg.setBgResource(R.drawable.common_visual_angle_bg)
+                    iv_visual_angle_title_value_bg.setHumbResource(R.drawable.common_visual_angle)
+                    iv_center_location_bg.setImageResource(R.drawable.common_visualangle_bg)
+                }else{
+                    iv_visual_angle_title_head.setImageResource(R.drawable.commont_visual_head_unable)
+                    iv_visual_angle_title_bottom.setImageResource(R.drawable.common_visual_bottom_unenable)
+                    iv_visual_angle_title_value_bg.setBgResource(R.drawable.common_visual_angle_bg_unenable)
+                    iv_visual_angle_title_value_bg.setHumbResource(R.drawable.common_visual_angle_unenable)
+                    iv_center_location_bg.setImageResource(R.drawable.common_visualangle_bg_unenable)
+                }
+            }
+        }
+    }
+
+    override fun onVisibilityAggregated(isVisible: Boolean) {
+        super.onVisibilityAggregated(isVisible)
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+    }
+
+    init {
+        try {
+            initView()
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/OCH/common/common/src/main/res/drawable-nodpi/common_visual_angle.png b/OCH/common/common/src/main/res/drawable-nodpi/common_visual_angle.png
new file mode 100755
index 0000000000..f2ea150dff
Binary files /dev/null and b/OCH/common/common/src/main/res/drawable-nodpi/common_visual_angle.png differ
diff --git a/OCH/common/common/src/main/res/drawable-nodpi/common_visual_angle_bg.png b/OCH/common/common/src/main/res/drawable-nodpi/common_visual_angle_bg.png
new file mode 100755
index 0000000000..386839b12e
Binary files /dev/null and b/OCH/common/common/src/main/res/drawable-nodpi/common_visual_angle_bg.png differ
diff --git a/OCH/common/common/src/main/res/drawable-nodpi/common_visual_angle_bg_unenable.png b/OCH/common/common/src/main/res/drawable-nodpi/common_visual_angle_bg_unenable.png
new file mode 100644
index 0000000000..80df6287df
Binary files /dev/null and b/OCH/common/common/src/main/res/drawable-nodpi/common_visual_angle_bg_unenable.png differ
diff --git a/OCH/common/common/src/main/res/drawable-nodpi/common_visual_angle_unenable.png b/OCH/common/common/src/main/res/drawable-nodpi/common_visual_angle_unenable.png
new file mode 100644
index 0000000000..c80017aeed
Binary files /dev/null and b/OCH/common/common/src/main/res/drawable-nodpi/common_visual_angle_unenable.png differ
diff --git a/OCH/common/common/src/main/res/drawable-nodpi/common_visual_bottom.png b/OCH/common/common/src/main/res/drawable-nodpi/common_visual_bottom.png
new file mode 100755
index 0000000000..13076e27b6
Binary files /dev/null and b/OCH/common/common/src/main/res/drawable-nodpi/common_visual_bottom.png differ
diff --git a/OCH/common/common/src/main/res/drawable-nodpi/common_visual_bottom_unenable.png b/OCH/common/common/src/main/res/drawable-nodpi/common_visual_bottom_unenable.png
new file mode 100644
index 0000000000..de0caf66ae
Binary files /dev/null and b/OCH/common/common/src/main/res/drawable-nodpi/common_visual_bottom_unenable.png differ
diff --git a/OCH/common/common/src/main/res/drawable-nodpi/common_visualangle_bg.png b/OCH/common/common/src/main/res/drawable-nodpi/common_visualangle_bg.png
new file mode 100644
index 0000000000..aa30746eb0
Binary files /dev/null and b/OCH/common/common/src/main/res/drawable-nodpi/common_visualangle_bg.png differ
diff --git a/OCH/common/common/src/main/res/drawable-nodpi/common_visualangle_bg_unenable.png b/OCH/common/common/src/main/res/drawable-nodpi/common_visualangle_bg_unenable.png
new file mode 100644
index 0000000000..e7421ad3db
Binary files /dev/null and b/OCH/common/common/src/main/res/drawable-nodpi/common_visualangle_bg_unenable.png differ
diff --git a/OCH/common/common/src/main/res/drawable-nodpi/commont_visual_head.png b/OCH/common/common/src/main/res/drawable-nodpi/commont_visual_head.png
new file mode 100755
index 0000000000..fa95919a55
Binary files /dev/null and b/OCH/common/common/src/main/res/drawable-nodpi/commont_visual_head.png differ
diff --git a/OCH/common/common/src/main/res/drawable-nodpi/commont_visual_head_unable.png b/OCH/common/common/src/main/res/drawable-nodpi/commont_visual_head_unable.png
new file mode 100644
index 0000000000..ffac29ef2c
Binary files /dev/null and b/OCH/common/common/src/main/res/drawable-nodpi/commont_visual_head_unable.png differ
diff --git a/OCH/common/common/src/main/res/layout/common_visualangle_black.xml b/OCH/common/common/src/main/res/layout/common_visualangle_black.xml
new file mode 100644
index 0000000000..69a1e5df26
--- /dev/null
+++ b/OCH/common/common/src/main/res/layout/common_visualangle_black.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="@dimen/dp_64"
+    android:layout_height="@dimen/dp_308"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <ImageView
+        android:id="@+id/iv_center_location_bg"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:src="@drawable/common_visualangle_bg"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.mogo.och.common.module.wigets.map.switchvisual.SeekBarView
+        android:id="@+id/iv_visual_angle_title_value_bg"
+        android:layout_width="@dimen/dp_64"
+        android:layout_height="@dimen/dp_169"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/iv_visual_angle_title_head"
+        android:layout_width="@dimen/dp_30"
+        android:layout_height="@dimen/dp_30"
+        android:layout_marginTop="@dimen/dp_22"
+        android:src="@drawable/commont_visual_head"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
+    <ImageView
+        android:id="@+id/iv_visual_angle_title_bottom"
+        android:layout_width="@dimen/dp_31"
+        android:layout_height="@dimen/dp_25"
+        android:layout_marginBottom="@dimen/dp_22"
+        android:src="@drawable/common_visual_bottom"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+</merge>
\ No newline at end of file
diff --git a/OCH/common/common/src/main/res/layout/taxi_p_seekbar_visualangle.xml b/OCH/common/common/src/main/res/layout/taxi_p_seekbar_visualangle.xml
index 4c1bc8426c..55f173c633 100644
--- a/OCH/common/common/src/main/res/layout/taxi_p_seekbar_visualangle.xml
+++ b/OCH/common/common/src/main/res/layout/taxi_p_seekbar_visualangle.xml
@@ -7,7 +7,7 @@
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
     <ImageView
-        android:id="@+id/iv_setting_only_bg"
+        android:id="@+id/iv_visualangle_bg"
         android:layout_width="39dp"
         android:layout_height="141dp"
         android:src="@drawable/taxi_p_visual_angle_bg"
@@ -17,7 +17,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
-        android:id="@+id/iv_setting_only_value"
+        android:id="@+id/iv_visualangle_value"
         android:layout_width="100dp"
         android:layout_height="100dp"
         android:src="@drawable/taxi_p_visual_angle"
diff --git a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_seekbar_visualangle.xml b/OCH/common/common/src/main/res/layout/taxi_seekbar_visualangle.xml
similarity index 59%
rename from OCH/taxi/pcommon/src/main/res/layout/taxi_p_seekbar_visualangle.xml
rename to OCH/common/common/src/main/res/layout/taxi_seekbar_visualangle.xml
index 4c1bc8426c..456da864d2 100644
--- a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_seekbar_visualangle.xml
+++ b/OCH/common/common/src/main/res/layout/taxi_seekbar_visualangle.xml
@@ -2,25 +2,25 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="100dp"
-    android:layout_height="208dp"
+    android:layout_width="@dimen/dp_64"
+    android:layout_height="@dimen/dp_169"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
     <ImageView
-        android:id="@+id/iv_setting_only_bg"
-        android:layout_width="39dp"
-        android:layout_height="141dp"
-        android:src="@drawable/taxi_p_visual_angle_bg"
+        android:id="@+id/iv_visualangle_bg_dark"
+        android:layout_width="@dimen/dp_40"
+        android:layout_height="@dimen/dp_169"
+        android:src="@drawable/common_visual_angle_bg"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
-        android:id="@+id/iv_setting_only_value"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:src="@drawable/taxi_p_visual_angle"
+        android:id="@+id/iv_visualangle_value_dark"
+        android:layout_width="@dimen/dp_64"
+        android:layout_height="@dimen/dp_33"
+        android:src="@drawable/common_visual_angle"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml b/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml
index 4e8489372e..a20568f292 100644
--- a/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml
+++ b/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml
@@ -198,6 +198,14 @@
         app:layout_constraintTop_toBottomOf="@id/module_mogo_och_autopilot_status"
         app:layout_goneMarginTop="@dimen/module_mogo_och_station_panel_container_margin_top_no_call" />
 
+    <com.mogo.och.common.module.wigets.map.switchvisual.VisualViewDirver
+        app:layout_constraintStart_toEndOf="@+id/module_mogo_och_station_panel_container"
+        app:layout_constraintBottom_toBottomOf="@+id/module_mogo_och_station_panel_container"
+        android:layout_marginBottom="@dimen/dp_28"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+
     <include
         android:id="@+id/module_mogo_och_bus_test_bar"
         layout="@layout/shuttle_test_bar_view"
@@ -241,23 +249,12 @@
         android:layout_width="@dimen/dp_142"
         android:layout_height="@dimen/dp_142"/>
 
-    <!--切换地图远近事件 @dimen/module_switch_map -->
-    <com.mogo.och.common.module.wigets.map.switchvisual.VisualView
-        android:id="@+id/switch_visual_view"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/toolsView"
-        android:layout_marginStart="-10dp"
-        android:layout_marginBottom="@dimen/dp_17"
-        android:layout_width="@dimen/dp_142"
-        android:layout_height="@dimen/dp_142"/>
-
-
     <com.mogo.och.common.module.wigets.map.reportworkorder.ReportWorkOrderView
         android:id="@+id/reportworkorderview"
         android:layout_marginStart="-10dp"
         android:layout_marginBottom="@dimen/dp_17"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/switch_visual_view"
+        app:layout_constraintLeft_toRightOf="@id/toolsView"
         android:layout_width="@dimen/dp_142"
         android:layout_height="@dimen/dp_142"/>
 
diff --git a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java
index 6fcaf29aa3..d59f3ac076 100644
--- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java
+++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java
@@ -792,4 +792,9 @@ public class SweeperCloudTaskModel implements IMoGoSweeperFutianCloudTaskListene
     public void onAutopilotTrajectoryDownloadReq(@NonNull AutopilotControlParameters.AutoPilotLine autoPilotLine, int downloadType) {
 
     }
+
+    @Override
+    public void onFsmReceiveTimeout(boolean isTimeout) {
+
+    }
 }
diff --git a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/presenter/SweeperOperatePresenter.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/presenter/SweeperOperatePresenter.java
index 130c155a68..764942e060 100644
--- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/presenter/SweeperOperatePresenter.java
+++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/presenter/SweeperOperatePresenter.java
@@ -469,4 +469,9 @@ public class SweeperOperatePresenter extends Presenter<SweeperOperateFragment>
     @Override
     public void onAutopilotTrajectoryDownloadReq(@NonNull AutopilotControlParameters.AutoPilotLine autoPilotLine, int downloadType) {
     }
+
+    @Override
+    public void onFsmReceiveTimeout(boolean isTimeout) {
+
+    }
 }
diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
index 2138637b81..1a169220bd 100644
--- a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
+++ b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
@@ -220,6 +220,14 @@
         app:layout_constraintTop_toBottomOf="@+id/module_mogo_och_autopilot_status"
         tools:visibility="visible" />
 
+    <com.mogo.och.common.module.wigets.map.switchvisual.VisualViewDirver
+        app:layout_constraintStart_toEndOf="@+id/module_mogo_och_station_panel_container"
+        app:layout_constraintBottom_toBottomOf="@+id/module_mogo_och_station_panel_container"
+        android:layout_marginBottom="@dimen/dp_32"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+
     <com.mogo.och.common.module.wigets.map.orderstatus.OrderStatusView
         android:id="@+id/module_mogo_och_operation_status"
         android:layout_width="@dimen/dp_316"
@@ -250,16 +258,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@id/module_mogo_och_operation_status" />
 
-
-    <com.mogo.och.common.module.wigets.map.switchvisual.VisualView
-        android:id="@+id/switch_visual_view"
-        android:layout_width="@dimen/dp_142"
-        android:layout_height="@dimen/dp_142"
-        android:layout_marginStart="-10dp"
-        android:layout_marginBottom="@dimen/dp_17"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/toolsView" />
-
     <com.mogo.och.common.module.wigets.map.reportworkorder.ReportWorkOrderView
         android:id="@+id/reportworkorderview"
         android:layout_width="@dimen/dp_142"
@@ -267,7 +265,7 @@
         android:layout_marginStart="-10dp"
         android:layout_marginBottom="@dimen/dp_17"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/switch_visual_view" />
+        app:layout_constraintLeft_toRightOf="@id/toolsView" />
 
     <com.mogo.eagle.core.function.hmi.ui.widget.RomaTaxiView
         android:layout_width="@dimen/dp_142"
diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
index 591b531499..2bd575a587 100644
--- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
+++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
@@ -86,7 +86,7 @@ class TaxiPassengerBaseFragment() :
             }
 
         })
-        lbv_go2_center.setOrderIdCallback(object :LeftBarView.LeftBarCallback{
+        lbv_go2_center.setOrderIdCallback(object : LeftBarView.LeftBarCallback{
             override fun setGo2CenterClick() {
                 when (bottom.getCurrentPage()) {
                     BottomBar.SelectView.PRECISIONMAP -> {
diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/LeftBarView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/LeftBarView.kt
index 99618fa399..55b4ae0a25 100644
--- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/LeftBarView.kt
+++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/LeftBarView.kt
@@ -8,7 +8,6 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.och.common.module.wigets.map.switchvisual.SeekBarView
 import com.mogo.och.taxi.passenger.common.R
-import kotlinx.android.synthetic.main.taxi_p_leftbar.view.iv_center_location
 import kotlinx.android.synthetic.main.taxi_p_leftbar.view.iv_center_location_bg
 import kotlinx.android.synthetic.main.taxi_p_leftbar.view.iv_visual_angle_title_bottom
 import kotlinx.android.synthetic.main.taxi_p_leftbar.view.iv_visual_angle_title_head
diff --git a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_rightbar.xml b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_rightbar.xml
index 36e55e319b..b12099d8b8 100644
--- a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_rightbar.xml
+++ b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_rightbar.xml
@@ -58,13 +58,13 @@
     <androidx.constraintlayout.widget.Group
         android:id="@+id/con_only_one_group"
         android:visibility="gone"
-        app:constraint_referenced_ids="iv_setting_only_bg,ck_setting_only"
+        app:constraint_referenced_ids="iv_visualangle_bg,ck_setting_only"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
 
     <ImageView
-        android:id="@+id/iv_setting_only_bg"
+        android:id="@+id/iv_visualangle_bg"
         android:layout_width="@dimen/dp_120"
         android:layout_height="@dimen/dp_120"
         android:src="@drawable/taxi_p_reset_location_bg"
@@ -78,9 +78,9 @@
         android:layout_height="@dimen/dp_76"
         android:background="@drawable/taxi_p_setting_selector"
         android:button="@null"
-        app:layout_constraintBottom_toBottomOf="@+id/iv_setting_only_bg"
-        app:layout_constraintStart_toStartOf="@+id/iv_setting_only_bg"
-        app:layout_constraintEnd_toEndOf="@+id/iv_setting_only_bg"
-        app:layout_constraintTop_toTopOf="@+id/iv_setting_only_bg" />
+        app:layout_constraintBottom_toBottomOf="@+id/iv_visualangle_bg"
+        app:layout_constraintStart_toStartOf="@+id/iv_visualangle_bg"
+        app:layout_constraintEnd_toEndOf="@+id/iv_visualangle_bg"
+        app:layout_constraintTop_toTopOf="@+id/iv_visualangle_bg" />
 
 </merge>
\ No newline at end of file
diff --git a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_seekbar_.xml b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_seekbar_.xml
index 693d5af861..cf8aac9f7d 100644
--- a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_seekbar_.xml
+++ b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_seekbar_.xml
@@ -7,7 +7,7 @@
     tools:parentTag="androidx.constraintlayout.motion.widget.MotionLayout">
 
     <ImageView
-        android:id="@+id/iv_setting_only_bg"
+        android:id="@+id/iv_visualangle_bg"
         android:layout_width="39px"
         android:layout_height="141px"
         android:src="@drawable/taxi_p_visual_angle_bg"
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
index b7beb2ae1a..81eab19ac5 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
@@ -208,6 +208,13 @@
         app:layout_constraintTop_toBottomOf="@+id/module_mogo_och_autopilot_status"
         tools:visibility="visible" />
 
+    <com.mogo.och.common.module.wigets.map.switchvisual.VisualViewDirver
+        app:layout_constraintStart_toEndOf="@+id/module_mogo_och_station_panel_container"
+        app:layout_constraintBottom_toBottomOf="@+id/module_mogo_och_station_panel_container"
+        android:layout_marginBottom="@dimen/dp_32"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
     <com.mogo.och.common.module.wigets.map.orderstatus.OrderStatusView
         android:id="@+id/module_mogo_och_operation_status"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -237,21 +244,12 @@
         android:layout_width="@dimen/dp_142"
         android:layout_height="@dimen/dp_142"/>
 
-    <com.mogo.och.common.module.wigets.map.switchvisual.VisualView
-        android:id="@+id/switch_visual_view"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/toolsView"
-        android:layout_marginStart="-11dp"
-        android:layout_marginBottom="@dimen/dp_17"
-        android:layout_width="@dimen/dp_142"
-        android:layout_height="@dimen/dp_142"/>
-
     <com.mogo.och.common.module.wigets.map.reportworkorder.ReportWorkOrderView
         android:id="@+id/reportworkorderview"
         android:layout_marginStart="-11dp"
         android:layout_marginBottom="@dimen/dp_17"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/switch_visual_view"
+        app:layout_constraintLeft_toRightOf="@id/toolsView"
         android:layout_width="@dimen/dp_142"
         android:layout_height="@dimen/dp_142"/>