diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml
index d7c90ab082..3f491d2e0d 100644
--- a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml
+++ b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml
@@ -21,7 +21,7 @@
android:id="@+id/bus_arc"
android:layout_width="@dimen/dp_616"
android:layout_height="@dimen/dp_320"
- android:layout_gravity="center" />
+ android:layout_marginLeft="@dimen/dp_13"/>
implement
BaseFragment fragmentHdMap = (BaseFragment) ARouter.getInstance().build(MoGoFragmentPaths.PATH_FRAGMENT_HMI).navigation();
addFragment(fragmentHdMap, fragmentHdMap.getTagName(), R.id.module_main_id_waring_fragment);
// 加载 小地图 图层
- BaseFragment fragmentSmpMap = (BaseFragment) ARouter.getInstance().build(MoGoFragmentPaths.PATH_FRAGMENT_SMP).navigation();
- addFragment(fragmentSmpMap, fragmentSmpMap.getTagName(), R.id.module_main_id_smp_fragment);
+// BaseFragment fragmentSmpMap = (BaseFragment) ARouter.getInstance().build(MoGoFragmentPaths.PATH_FRAGMENT_SMP).navigation();
+// addFragment(fragmentSmpMap, fragmentSmpMap.getTagName(), R.id.module_main_id_smp_fragment);
}
/**
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml
index 824f21cb8b..b2330d66a2 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml
@@ -2,14 +2,23 @@
+ android:layout_height="@dimen/dp_320">
+
+ app:layout_constraintTop_toTopOf="parent"
+ app:selectColor="@color/dark_mode_select_txt_color" />
+ app:layout_goneMarginLeft="@dimen/dp_81"
+ app:layout_constraintBottom_toBottomOf="@+id/brakeStatus"
+ app:layout_constraintLeft_toRightOf="@+id/brakeStatus"
+ app:layout_constraintTop_toTopOf="@+id/brakeStatus" />
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/overview/OverViewManager.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/overview/OverViewManager.kt
deleted file mode 100644
index 44b3c39c97..0000000000
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/overview/OverViewManager.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.mogo.eagle.core.function.overview
-
-class OverViewManager private constructor() {
-
- private object Holder {
- val INSTANCE = OverViewManager()
- }
-
- companion object {
- val instance by lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
- Holder.INSTANCE
- }
- }
-}
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java
index 0c29f7ed7b..899fabe352 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java
@@ -200,6 +200,10 @@ public class AMapCustomView
options.setNaviNight(true);
//导航全程光柱
options.setTrafficBarEnabled(false);
+ //隐藏摄像头
+ options.setCameraBubbleShow(false);
+ //转向箭头
+ options.setNaviArrowVisible(false);
//指南针
// options.setCompassEnabled(false);
// options.setTilt((int) tilt);
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_reset.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_reset.png
new file mode 100644
index 0000000000..1bbe87d40a
Binary files /dev/null and b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_reset.png differ
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/layout/module_overview_map_view.xml b/core/function-impl/mogo-core-function-map/src/main/res/layout/module_overview_map_view.xml
index a8a1ede8d9..25f68c9d41 100644
--- a/core/function-impl/mogo-core-function-map/src/main/res/layout/module_overview_map_view.xml
+++ b/core/function-impl/mogo-core-function-map/src/main/res/layout/module_overview_map_view.xml
@@ -24,12 +24,15 @@
@@ -42,5 +45,4 @@
android:src="@drawable/module_small_map_view_border_north"
android:visibility="gone" />
-
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/layout/module_small_map_fragment.xml b/core/function-impl/mogo-core-function-map/src/main/res/layout/module_small_map_fragment.xml
index 47b8763b7d..0392a650c8 100644
--- a/core/function-impl/mogo-core-function-map/src/main/res/layout/module_small_map_fragment.xml
+++ b/core/function-impl/mogo-core-function-map/src/main/res/layout/module_small_map_fragment.xml
@@ -10,6 +10,7 @@
android:layout_height="wrap_content"
android:layout_marginRight="30px"
android:layout_marginBottom="30px"
+ android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml
index cda607535f..4b508254cf 100644
--- a/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml
+++ b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -11,5 +11,6 @@
30px
270px
320px
+ 616px
630px