diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/overmapview/OverMapBottomView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/overmapview/OverMapBottomView.kt new file mode 100644 index 0000000000..97e45b9ac1 --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/overmapview/OverMapBottomView.kt @@ -0,0 +1,41 @@ +package com.mogo.och.common.module.wigets.map.overmapview + +import android.content.Context +import android.graphics.Color +import android.graphics.drawable.GradientDrawable +import android.util.AttributeSet +import android.view.LayoutInflater +import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.och.common.module.R + +class OverMapBottomView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : ConstraintLayout(context, attrs, defStyleAttr){ + + + private fun initView() { + LayoutInflater.from(context).inflate(R.layout.common_overmap_bottom, this, true) + // 定义渐变的方向 + // 定义渐变的方向 + val orientation = GradientDrawable.Orientation.LEFT_RIGHT + val temp01 = GradientDrawable(orientation, intArrayOf( + Color.parseColor("#33D7E5FF"), + Color.parseColor("#E6EFFF"), + Color.parseColor("#E6EFFF"), + Color.parseColor("#E6EFFF"), + Color.parseColor("#33D7E5FF"), + )) + background = temp01 + } + + init { + try { + initView() + } catch (e: Exception) { + e.printStackTrace() + } + } + +} \ No newline at end of file diff --git a/OCH/common/common/src/main/res/layout/common_overmap_bottom.xml b/OCH/common/common/src/main/res/layout/common_overmap_bottom.xml new file mode 100644 index 0000000000..902462b008 --- /dev/null +++ b/OCH/common/common/src/main/res/layout/common_overmap_bottom.xml @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 2bd575a587..5b7955d84a 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 @@ -65,7 +65,7 @@ class TaxiPassengerBaseFragment() : super.initViews(savedInstanceState) mapBizView!!.onCreate(savedInstanceState) overMapView.onCreateView(savedInstanceState) - overMapView.hideResetView() + //overMapView.hideResetView() val commonService = ARouter.getInstance().build(OchCommonConst.TAXI_PASSENGER).navigation(); if(commonService is CommonService){ @@ -96,7 +96,7 @@ class TaxiPassengerBaseFragment() : } } BottomBar.SelectView.OVERMAPVIEW -> { - overMapView.displayCustomOverView() + //overMapView.displayCustomOverView() } else -> {} @@ -138,7 +138,7 @@ class TaxiPassengerBaseFragment() : romaPView.updateVisible(false) romaDistanceView.visibility = View.GONE rbv_setting_music.setShowOnlySetting(0) - lbv_go2_center.visibility = View.VISIBLE + lbv_go2_center.visibility = View.GONE pcnActionView.visibility = View.VISIBLE CallerHmiManager.showTrafficLightView() infoVideoView.visibility = View.GONE @@ -328,8 +328,8 @@ class TaxiPassengerBaseFragment() : } fun showOrHideOverMapView() { - overMapView?.clearV2XMarkers() - overMapView?.clearCustomPolyline() +// overMapView?.clearV2XMarkers() +// overMapView?.clearCustomPolyline() } diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml index 917558d2bd..423001bf8d 100644 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -5,23 +5,10 @@ android:layout_height="match_parent"> - + android:layout_height="match_parent" /> + + + + + + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt index c95f2f9f20..e7fff75ec4 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt @@ -80,7 +80,7 @@ class TaxiPassengerBaseFragment() : super.initViews(savedInstanceState) mapBizView!!.onCreate(savedInstanceState) overMapView.onCreateView(savedInstanceState) - overMapView.hideResetView() + //overMapView.hideResetView() val commonService = ARouter.getInstance().build(OchCommonConst.TAXI_UNMANNED_PASSENGER).navigation(); if(commonService is CommonService){ @@ -112,7 +112,7 @@ class TaxiPassengerBaseFragment() : } } BottomBar.SelectView.OVERMAPVIEW -> { - overMapView.displayCustomOverView() + //overMapView.displayCustomOverView() } else -> {} @@ -154,7 +154,7 @@ class TaxiPassengerBaseFragment() : romaPView.updateVisible(false) romaDistanceView.visibility = View.GONE rbv_setting_music.setShowOnlySetting(0) - lbv_go2_center.visibility = View.VISIBLE + lbv_go2_center.visibility = View.GONE pcnActionView.visibility = View.VISIBLE CallerHmiManager.showTrafficLightView() infoVideoView.visibility = View.GONE @@ -310,7 +310,7 @@ class TaxiPassengerBaseFragment() : fun setOverMapDebug(){ - overMapView.setDebugMode(true) + //overMapView.setDebugMode(true) showOrHide(true,"Debug 按钮") } override fun setEvaluateView(){ @@ -351,8 +351,8 @@ class TaxiPassengerBaseFragment() : fun showOrHideOverMapView() { CallerLogger.d(M_TAXI_P + TAG, "showOrHideOverMapView 清理轨迹和站点") - overMapView?.clearV2XMarkers() - overMapView?.clearCustomPolyline() + //overMapView?.clearV2XMarkers() + //overMapView?.clearCustomPolyline() } fun showOverMapView() { diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml index 530ac26356..fed090fba0 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml @@ -4,23 +4,10 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:layout_height="match_parent" />