diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.kt b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.kt
index c857117102..abd1f67289 100644
--- a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.kt
+++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.kt
@@ -53,7 +53,6 @@ class BusPassengerRouteFragment :
ToggleDebugView.toggleDebugView.toggle(requireContext())
true
}
- omvOverMap.hideResetView()
viewBusPM1MsgBoxButton.setClickListener(object : MMsgBoxButtonView.ClickListener {
override fun showMsgBoxList(show: Boolean) {
if (show) {
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bug_p_overmap_car_model.png b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bug_p_overmap_car_model.png
new file mode 100755
index 0000000000..0ec3b68450
Binary files /dev/null and b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bug_p_overmap_car_model.png differ
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_atmosphere_select.png b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_atmosphere_select.png
old mode 100644
new mode 100755
index 6771affff9..5f5addefff
Binary files a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_atmosphere_select.png and b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_atmosphere_select.png differ
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_select_right.png b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_select_right.png
old mode 100644
new mode 100755
index 106aa51d43..ca4f589fd6
Binary files a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_select_right.png and b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_select_right.png differ
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_overmap_reset.png b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_overmap_reset.png
new file mode 100755
index 0000000000..2176fbb0be
Binary files /dev/null and b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_overmap_reset.png differ
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_overmap_reset_size.xml b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_overmap_reset_size.xml
new file mode 100644
index 0000000000..0e59d45dc0
--- /dev/null
+++ b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_overmap_reset_size.xml
@@ -0,0 +1,7 @@
+
+
+
+
\ No newline at end of file
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml b/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml
index 036f011afb..46d90af947 100644
--- a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml
@@ -20,6 +20,10 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/mapBizView"
+ app:resetDrawable="@drawable/bus_p_overmap_reset_size"
+ app:carDrawable="@drawable/bug_p_overmap_car_model"
+ app:resetDrawableMarginRight="34dp"
+ app:resetDrawableMarginBottom="54dp"
android:layout_width="0dp"
android:layout_height="match_parent"/>
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt
index 880661cafd..93f4bf6c84 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt
@@ -66,6 +66,8 @@ class OverMapView @JvmOverloads constructor(
private var arrivedDrawable: Int = -1
private var unArrivedDrawable: Int = -1
private var resetDrawable: Int = -1
+ private var resetDrawableMarginRight: Int = -1
+ private var resetDrawableMarginBottom: Int = -1
private var mMapView: TextureMapView? = null
private var mAMap: AMap? = null
@@ -121,6 +123,8 @@ class OverMapView @JvmOverloads constructor(
unArrivedDrawable =
typedArray.getResourceId(R.styleable.OverMapView_unArrivedDrawable, -1)
resetDrawable = typedArray.getResourceId(R.styleable.OverMapView_resetDrawable, -1)
+ resetDrawableMarginRight = typedArray.getResourceId(R.styleable.OverMapView_resetDrawableMarginRight, AutoSizeUtils.dp2px(context,40f))
+ resetDrawableMarginBottom = typedArray.getResourceId(R.styleable.OverMapView_resetDrawableMarginBottom, AutoSizeUtils.dp2px(context,40f))
typedArray.recycle()
initView(context)
} catch (e: Exception) {
@@ -215,8 +219,16 @@ class OverMapView @JvmOverloads constructor(
val smpView = LayoutInflater.from(context).inflate(R.layout.module_overview_map_view, this)
mMapView = smpView.findViewById(R.id.aMapView)
overLayerView = findViewById(R.id.overLayer)
- overLayerView?.background =
- resources.getDrawable(if (resetDrawable != -1) resetDrawable else R.drawable.amap_reset)
+ overLayerView?.let {
+ it.background =
+ resources.getDrawable(if (resetDrawable != -1) resetDrawable else R.drawable.amap_reset)
+ val layoutParams = it.layoutParams
+ layoutParams as RelativeLayout.LayoutParams
+ layoutParams.rightMargin =resetDrawableMarginRight
+ layoutParams.bottomMargin =resetDrawableMarginBottom
+ it.layoutParams = layoutParams
+ }
+
arrivedBitmap =
BitmapDescriptorFactory.fromResource(if (arrivedDrawable != -1) arrivedDrawable else R.drawable.taxi_map_arrow_arrived)
unArrivedBitmap =
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 c50e325d22..3d7a27d73a 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
@@ -25,8 +25,8 @@
+
+
+
+
\ No newline at end of file