From da1b42dce4e3befd9c5cc7c33730fd90a2666b20 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 8 Jul 2024 10:25:20 +0800 Subject: [PATCH] =?UTF-8?q?[6.5.0]=20[fea]=20[=E4=B9=98=E5=AE=A2=E5=B1=8F?= =?UTF-8?q?=20=E5=85=A8=E5=B1=80=E6=A6=82=E8=A7=88=20=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../map/overmapview/OverMapBottomView.kt | 41 +++++++ .../main/res/layout/common_overmap_bottom.xml | 112 ++++++++++++++++++ .../passenger/ui/TaxiPassengerBaseFragment.kt | 10 +- .../main/res/layout/taxi_p_base_fragment.xml | 17 +-- .../passenger/ui/overmapview/OverMapView.kt | 46 +++++++ .../res/drawable-nodpi/taxt_u_p_map_car.png | Bin 0 -> 7582 bytes .../drawable-nodpi/taxt_u_p_map_car_light.png | Bin 0 -> 13282 bytes .../taxt_u_p_map_view_dir_end.png | Bin 0 -> 5779 bytes .../taxt_u_p_map_view_dir_start.png | Bin 0 -> 5574 bytes .../taxt_u_p_overmap_arrived.png | Bin 0 -> 768 bytes .../taxt_u_p_overmap_arriving.png | Bin 0 -> 1009 bytes .../src/main/res/layout/taxi_p_overmap.xml | 34 ++++++ .../passenger/ui/TaxiPassengerBaseFragment.kt | 12 +- .../res/layout/taxt_u_p_base_fragment.xml | 17 +-- 14 files changed, 248 insertions(+), 41 deletions(-) create mode 100644 OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/overmapview/OverMapBottomView.kt create mode 100644 OCH/common/common/src/main/res/layout/common_overmap_bottom.xml create mode 100644 OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/overmapview/OverMapView.kt create mode 100644 OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_map_car.png create mode 100755 OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_map_car_light.png create mode 100644 OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_end.png create mode 100644 OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_start.png create mode 100644 OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_overmap_arrived.png create mode 100644 OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_overmap_arriving.png create mode 100644 OCH/taxi/pcommon/src/main/res/layout/taxi_p_overmap.xml 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" /> 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 A6#xJL literal 0 HcmV?d00001 diff --git a/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_map_car_light.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_map_car_light.png new file mode 100755 index 0000000000000000000000000000000000000000..ed796603d57084501b9493f3692be83ada825546 GIT binary patch literal 13282 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 U(JbrWUxh=)`sR1*bX}wW2O_B&3jhEB literal 0 HcmV?d00001 diff --git a/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_end.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_end.png new file mode 100644 index 0000000000000000000000000000000000000000..a81336d4c23bf6b45c3c4aeb0e66c44cab48cdd1 GIT binary patch literal 5779 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 U?@zVk82|tP07*qoM6N<$g3-xjvH$=8 literal 0 HcmV?d00001 diff --git a/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_overmap_arrived.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_overmap_arrived.png new file mode 100644 index 0000000000000000000000000000000000000000..32fc7d5af8a00f83b8ee2434079b992d9252193d GIT binary patch literal 768 zcmeAS@N?(olHy`uVBq!ia0vp^3P3!KgAGXTf7vw$NHG=%xjQkeJ16rJ$Z<)H@J#dd zWzYh$IT#q*GZ|PwN`P1jh#44|7cep~18GK(*a9ZFtil3jIC~mMp)uopcLoNgEKe85 zkP61Pvu;nD%2*`9{{i^W5*>KNMZKQo||jqPf(MxMap-EINL+T?xnHKl8l`60rh1;)?P4FRec)lJoh5zvknC)2tcd3s3f+JI}gy$KR-)vO~OH0^2*om?nL3IsJXcr|iWu(`ROdY`QVa zEt$LQxANb}cX>ybF34H`v&j3m^QA3zlHPXW>27kD4J|XfJr+miCka_4b($zmHV~Sy zY-g5AWnBFoxjxOMn$bqj9?yy{ioFu05K*sh-m_<4MWhd(;zkv-4NshziVjD9bh7^A zdwNgrysUp$g)EOf-Eplo>_BI}S@+bNg{!=)?8P>#p41GF-LS{;Zhf4ffc#IVkMiYv zem{Ady>r!B@!Pj$H_1#-cWp@c-=(2jdnR@_hrGJYZ(EiI1`guUA7+6KJMN!eqIMjV O`aE6zT-G@yGywq5QY1M5 literal 0 HcmV?d00001 diff --git a/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_overmap_arriving.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_u_p_overmap_arriving.png new file mode 100644 index 0000000000000000000000000000000000000000..790562578c217dfa0672cff92a5a8b9199b36812 GIT binary patch literal 1009 zcmeAS@N?(olHy`uVBq!ia0vp^3P3!KgAGXTf7vw$NHG=%xjQkeJ16rJ$Z<)H@J#dd zWzYh$IT#q*GZ|PwN`P1jh#44|7cep~18GK(*a9ZFtil3jIC~mMp)uopccAiUPZ!6K z3dXmy&SwidiX6YMHaosI)AZ`Je*s?EfhGa2I%oGwCAzdR!{xM+Qj}*t0LTG z4~HD9qqnVwM#$=1&8SEZF3WAlrLzkRi)ls(IIXWI3cahL5a zx5FnF=q|7qT*Cf-)0g7CcQ$oR3ocl7dx`b)TPySf&EMwpUpVs9V(!b#TKj#vO+CLp z1sNX`-}c{r*}09+7HuqU`PldQT-7&Lj~&8=NBiEgr>M3q`l-)$IuO% z!rq#RD*Wj!*r(6irWtg1hwPl=R}(JH)b+Ca5WD1w((>0i>odhy8C|{b)u*xIs9UwO zN|*Pxw+U69LfZ~|PJR?)9Bi+1OUEn!YqhOY=^Evv3lZ@hlQtgHY~3)Ksk9;YF3T&$ z4l5-_sn`4ySMZi+_Z-@+&NoX$O!a-17Gw4HR}I-~e+RBH|5>yqn0+1RhSg`@HqKwF zQuzH=?q(5=@VM7UcVz5hNRQc_xBcPTri^n_80U5xtt?Yz)Km#xabfRC9n~Fac|9&~ zmlpMAg}*kRd4=@^M^5II1J-#@uH1?0l&ih5q~xCD%;(ReYYbFvyVj^VNL^=}(>IUF zHS_4#t%AYp#kfl9wW7K8?)ary3cX_K8PmT}QLUa`!Qc>Y7S&TjJJnWFED!)t!e zuRC}9^P|U4xBnE{aK^gEGJJuL=+Cfo_Il!(n!$^--IYa(WuxNCs<@_vE@E5uf6AM= zKRNY$!+#1?8O>e1UR!Ry-Od$N*EvJFmqx6+F#EljZd%Q})q2O3RM(5^O5KQGbVbp& zCuZIGf~9LeYk%tu%!}~#3Xl4|Lx0KXEt9rtTut3|PxE+$@Q2x-ZRhI=GXKbbtDo;7 z;}&;(vs%Km`!DZiBsp(hz3aVhcY%4!j#?)Mjt1h<0eiO7CwAXI;+_V|Zl11wF6*2U FngB>#l+XYG literal 0 HcmV?d00001 diff --git a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_overmap.xml b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_overmap.xml new file mode 100644 index 0000000000..22df41a649 --- /dev/null +++ b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_overmap.xml @@ -0,0 +1,34 @@ + + + + + + + + \ 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" />