From e0aa56d32c7f9449016edabaccfa448f75ae1fcb Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 8 Jul 2024 19:24:34 +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=E8=A7=86=E8=A7=92=E5=88=87=E6=8D=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/ui/TaxiPassengerBaseFragment.kt | 4 +- .../och/taxi/passenger/ui/bar/LeftBarView.kt | 20 ++++++- .../drawable-nodpi/taxi_p_only_center_bg.png | Bin 0 -> 5738 bytes .../src/main/res/layout/taxi_p_leftbar.xml | 50 ++++++++++++++++-- .../passenger/ui/TaxiPassengerBaseFragment.kt | 9 +++- 5 files changed, 73 insertions(+), 10 deletions(-) create mode 100644 OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_only_center_bg.png 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 5b7955d84a..b467795782 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 @@ -125,6 +125,7 @@ class TaxiPassengerBaseFragment() : } rbv_setting_music.setShowOnlySetting(0) lbv_go2_center.visibility = View.VISIBLE + lbv_go2_center.showAngle() pcnActionView.visibility = View.VISIBLE CallerHmiManager.showTrafficLightView() infoVideoView.visibility = View.GONE @@ -138,7 +139,8 @@ class TaxiPassengerBaseFragment() : romaPView.updateVisible(false) romaDistanceView.visibility = View.GONE rbv_setting_music.setShowOnlySetting(0) - lbv_go2_center.visibility = View.GONE + lbv_go2_center.visibility = View.VISIBLE + lbv_go2_center.showOnlyCenter() pcnActionView.visibility = View.VISIBLE CallerHmiManager.showTrafficLightView() infoVideoView.visibility = View.GONE 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 55b4ae0a25..eab1bc98b9 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,10 @@ 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_bg +import kotlinx.android.synthetic.main.taxi_p_leftbar.view.aciv_only_center +import kotlinx.android.synthetic.main.taxi_p_leftbar.view.clgroup_self_map +import kotlinx.android.synthetic.main.taxi_p_leftbar.view.clgroup_self_only_map +import kotlinx.android.synthetic.main.taxi_p_leftbar.view.iv_center_location 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 import kotlinx.android.synthetic.main.taxi_p_leftbar.view.iv_visual_angle_title_value_bg @@ -34,7 +37,10 @@ class LeftBarView : ConstraintLayout { private fun initView() { LayoutInflater.from(context).inflate(R.layout.taxi_p_leftbar, this, true) - iv_center_location_bg.onClick { + iv_center_location.onClick { + this.rightBarCallback?.setGo2CenterClick() + } + aciv_only_center.onClick { this.rightBarCallback?.setGo2CenterClick() } @@ -54,6 +60,16 @@ class LeftBarView : ConstraintLayout { } } + fun showAngle(){ + clgroup_self_map.visibility = VISIBLE + clgroup_self_only_map.visibility = GONE + } + + fun showOnlyCenter(){ + clgroup_self_map.visibility = GONE + clgroup_self_only_map.visibility = VISIBLE + } + override fun onVisibilityAggregated(isVisible: Boolean) { super.onVisibilityAggregated(isVisible) } diff --git a/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_only_center_bg.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_only_center_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..b27a38babdfd6af5e5aa7d02ca4c97c7d788ca41 GIT binary patch literal 5738 zcmV-w7M1CVP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91XP^TB1ONa40RR91X8-^I06T&I6#xJg)Ja4^RCodHT}_M~$8qkN-6bhf z+6Yic1Og!$5EA4R0}+og>>L8?K+V-wff3|P??6dxQcscy`Zr{Bfn($jq+rB{s z-$ABSRH}d6x?rTT2K$yA=tdxOgMd8gyY2y*|Ma+NKM7xie|i1&=Bes!%RXg(&KW&C z=wI7y!#8*O?rUAszSVU7t^!d7VIG&%qe?FoGyvAO&2igzpPn@BKOJ}BC%5;TUnJx6 zqbg~iT{8dK_gD81j=vF_-QNps|J9}oI{+jDV*v;?l|>zMN&qVY6;49e{A=is|L$Oa z_aA<}X%5e>B6%d2UM_f%tzY#0{_z*x@6$nhm(B+_mH<)%VBH+6opwwGiq30K=vcY8 z`*Qm?uQkoVy7AVvb1ALsV!7Qx-@o?sp!-(4)4mhB{-q3*qWVQM3!>9q#>~z?!*1#M zCbx;LfwnLdq|i2Bb|>A(*Z12W?KfvPaL9zS6N5Omr2qrT~7c)UmgeQrTJW&zRV8#Y>Wb^ z$e#vDM-j~s_kR8#pZxiqJ9jpA=fU!t>(re5!Q=k*YuCc}=*z-eB{06Cqa%et@p_0i z2}Uu+P3Bh=-RqWMaX||GNsvgW0MQZm>9c3ygEwwApZOT;(i;Kiv;RK)&7CWIACj|I z%W2FPoQ6NmcEwhJQUzocAPV=R%>n@Ed7!v3g${Vs0jpU_V49=;{qp4b(fhCe>eYW6 zjlED{{uk;G)E+`-;&1j+eGfu)w9J7r1IUax%d@C)CgVn-Fa=U9*vM2z zLLNn3|7Ek=d~owd^T{ySa?Yv1;S+z?|0w~pI|WR3W|;zIq~as&*h_yDl>MIQU4cik zbb@J+W&xsms?DFB=0ag2{giKw0x&ed-=`BrTLWfpv}Ds)rTPQb6bQ8hr+7uL9UjTb zF%={>bNuKgfn;upzzCxMQJN3e1<3rRtmY}1%03($F*RW5Zl-Nhz&N$x6+&^zumrDR z2MdmCy1K_)9YX@*F@##{U?`p%qyb_`3pyQ*XKUwu6!TiK5ray7H zeD!MogSKgYWo#;&1tuFBfyTXTS@ky$h=wWmsQ`)6>blxTGhwU)P}leWb9mVN(JGhO zgZO3g+Qt`5e2<|nyt)Zs015*G91Ivh8{svUCQ#d}?bNWR97J+;k(^W~FxcUghSow?#tvYZ4d)PP|-RUl0xy+bgaK%0)m+Bi^F z{Z|W<`PE=v(b5r3*$FO_06`VEt1@@g;yTjZdi*&hlT{j%;P4;Hy8e#cFCzyUEe=uf zcv@iKR2>WHnmj^17%{3EE!oE@W#}V@^|3gQjG?IsQ+CS%ig(hzOVpFjJ$F!FsbF@}Cc-s>sNO4^8p)0hyc#MGEbA9i>_kv8jR z36Ke(CCVVNQ8U)HxrI7M=J2x$4t^y=Bkx@#ttLujxBZKRQl?_1MwR50Wh!Kn;(;p? zC7q&YEv2;|>{gAKnHnj+MUMnjvP~Ezf21Bz)ANrv;e&$ejCyD8rBMav=`XuKpl?lA z%25Mn=A05S8qVC2!lVi9Sc@TzpX@nFJ`f-j1xLbAn<90BF%a*+I>b&g#XGSuATrq6&~p16r0lQPzJU z%KAV*^GOV@Gu4~x4tH+Lz`>ORej=+5oF0)e74Q<3Yj8`11D%4OfXN*W>?$E%1S^Yc zjp9lRflU^(u%;2i>~c}wf;MV_x|dgO894Y+IWcbNsL?QNtc{VQ!j2l&D-w{Va%;dq zrg9B+*8406OJ*J*pSjgxq)u=f`!BsC2I`Hv^N;#nr!#QyYkzNO`MI(s9(l1$QXnLn z=}1F)-hZy>vf36>lcsz$Z(|vu&=AA%xC^d6xhS?gkNx9m3%40Kcs>S?VXQQ2#1ZEp zk$gZGryxnoDLS&yJD+Bj4>vMSH7U~|!ePR?Q|BI5U>o|N`ZEp^!N9rNhj;LNj7GL# zu8N7LTIIgbkfw6u(Wk9wo3~1T=hq(Qwc7Mn%RKiPTb_sdU!@1g)YibEpK1J#4qX*y zdpR7+qri`vOn<5&8TrJf)Xz(1`5Cb=6VkWQGg7yjC$2v|*{3oF2hU*QQNPJ4O)W^`x-@Bax~b{ zp@vKL$>kF5?a^5yZ>x_H*{PQL7M*(6j053;jx#uTYB@u(EQvU`Db35pvk#!BDdk1q z+R~J~lkKKc=E!r&=wY=%r>uSstWpWJ;-|<-5JwI@PR>d$3n;l}>7!^b)Lf`mINzS; z;{2B>LMs~-Y9@HJ^wo3^&-wHDW~2;i!(u^w0{qNN7Ce(&?8ef5S)GiSo;iR6zjuLf zX&)bkH|cj+lb6t=Wfash@M=7r=g3i}JL-7*1bN=6Wt0)FkB&Fqqp0Lnfd_DDkB-Av z#toCi=F7wq%DWv16Jw!TGT2gTaX;#c<8{pY3tZa02Jez_e`gRKbM1y>ZhqN1RRyH3 zR%ho7cmS7{zLnl~d?ssPl{!n>rJq_NOZ;q$PMLq%zjgDh`2jBU_(r(JPRq#aMk2f1 zRo*&<+buIq{YumZQWR&vrNwKpUeuM^22%Y$;lj=gMwAC|-c8^ETv~o#SuR`F5`?p( zCTlo1V|=G_p~$iRIKGiatky%|LSI7LYihQpA2q++pRxjZ{aXU3?+u(&`o1*ZWCaM9 zwr!im&x>p__NA}s3ILauhSKwCwM*%FQ~yP{qXtiMfpS7iI`qwiqMON3MIKYE(A;U+r+J*64GY_1%=4>yHJoPJ48^~Uq0hhLK z!^6^L?cJB9&XRWNXQQ21lE8*_%KXdztsAc92e`CHeRxn4S|THc9dmW8xzOIcN{cSgyZu#^ zTqa6ogT1I^nl+wFG}9e8++IeWcWN1BgoDNL#(Nf(yeja(Vi@!q8yZ2h=)#M-VyjJ= z-pH&~~=-eCx07(#%cQ2$c{J`et4?ijp)^ zs1+|8L(Qm0>&IZ35>-roYm`~7_hmG>)NmJLzee7Mff41D7M*(6j053;qOchj_QCow zeBN=IK+!d4iip?2xlJ0%yQrf_^N&4SGHP-QSCNc_R;-DziGlh92VH0>VcNC-oGE9n zs3Dr=&}8rV?Tsmy#FHsNFXRyuh}J)dKt zAx-6$qX$W-OcUCc{V=cTQ4{kXTKWFu(%AAm)c=rHzET?lhnK>l6_+Nbw(=+tFU*!G zK9~j>?n%ojI&!Fb4xB6>Ze*NlMy5f86;(9L*#^4VEX6kTLG|}blI4DADJ*XUCvmG$ zB+0F%;7iUu1GmE1vR&%771LNo=y662$K#&3`sAY6@;t6P)!$dZnTLQi%IK$6PgWW| z;vsWXW+_={GTHRzWGeRwo+XX=mV+bofOV`QEt905KxsWZ%A>-Zv0^d3!MSYeCjmqpFh$@Rclj?6Jx8Vv>KiAfVK11J^)Mq=nlxYwpg!CGmn+AEVi#Rl?-xmYGKjtd+~ zVbIQXJ!`Or2tlh~4afDRI&-~al_D7YpZXmgc)3|ts9Q@!NH1Gf+>hxQ^hB@vC(18S%nw7d!Wi#m@jZ&?Kg zPO#i!*YuCe(F2(ep^Gk*0GVUSrWik&8>nc~oUk3eDlsQfv0z7Ml~1pyG^=SNp71p$ zL@F^gCenxX1B$d+KMP>AE>TOAV}paly7rGyXJwar^IZyX<**aFzp$g3{A&pCEJ-pn zesR~;oQnc%RM+A;21wWBX~5#ML^Yh2XO(mo#0%pnNxoxT=QU46^0Mqj(fU^cV{zf8 zxZ)GrSi|mzkzlD5k64WDjF?Af#&=NQjvV zszyup35?uF4C`ZY9vMSZ6Q=AYfe|58HDB)%^+a9g)*1CSQmK50H-|s{Jp3gMmH3bq z{fJi|Rfvzvx!0=DH&~O+yv7)ss+&hdj|Q9?YpAr4Q|)w>d0Jr7A;<3N1JfCuf1X}{ zCH&#s`l5CKjP(l+2$+v>1nBuk`w@={ZIOqW5yZhvJx+4g^a+4j2$ZFJuRcesjqWr3 zDpN<46B3F1tzbgvxfYs9hz4^&M2hX>6o-1w0RuaWg~r&1Wv!@`*_{Io4S;Meh6D0w zvSNx8vG!cTW!AzoQK6f}h_UovvYPh`jhMgmLV{$4ngIqqs!eB7t9whA3Cm&*I^h^t zpp-76Kjrg}%Nr_d0R%(w10wzh=Ex>RVjHDLR5P~f`hBL58c{_Ri4T&ttVrtsLw;i2 znoqfo(e3P~grC)8h0B$vVx7jOvg(MT3gdLJ&dO6OfrHd8*KDITB530eH>9S3Auzvu z;cK=bDQuUk9mYD~GalWQa|{Xi%IqvxJJhr;*9n~m2D2G`2RPexLOnn-BneoqnE|XFR#MDFHic37lk~H(U)<24}A74e6Y$w zt?)IrO{6_$Qs*O~2mk)bcPT@@lYoSEyrXlmgYgS%{F@LiKHWx{;5K`vOLrJhJpJdi z<2OTOzvQ1YRA0J>NMrJCe)y9u@^K|b-yuAMDh>krKn+$&ppOGaZX z*=I4A7%bJn-E1slNk`}%o919Fl`ade)16ZphAO7A(#O!CC@K^xV1S(pk%N-SM9D@= z+uVQY#E*+v*Y9PT)Z6rjXlC-9?AO%)QosE>9N4$N~A+9uZ zq)>v-@i%|`X?f}|nBL!M=q#7hI9g(hRsEhGbl+-s+IO(@*ceFgH3dQf%t!SW!*11p zQ0swq2@3tLtUKvGzP{i7Xza%r>T8qxL0+45KIRLH$6<{!x&XRMr+^z7NHFqs7AF6D(-&@=AXN z3?8bW6|NNou=Tuy=lt<_KTV%M<%eVG8BBfDuP{H?=2n7JR)mVWhj;tq74mx>-XI@t z)A`^QUhf;dtKKb(X}|ermTC0*J8!DVueTaE&m}s*#7`;Ea4Yp&~yG} coNa6WFPg7ZksIY;rT_o{07*qoM6N<$f*xKAL;wH) literal 0 HcmV?d00001 diff --git a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_leftbar.xml b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_leftbar.xml index 23d9eb9a9d..f08843282f 100644 --- a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_leftbar.xml +++ b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_leftbar.xml @@ -8,8 +8,8 @@ @@ -35,9 +35,11 @@ + + + + + + + + + + \ 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 e7fff75ec4..550269a4b8 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 @@ -9,6 +9,7 @@ import android.view.View import com.alibaba.android.arouter.launcher.ARouter import com.mogo.commons.mvp.MvpFragment import com.mogo.commons.voice.AIAssist +import com.mogo.eagle.core.data.map.MogoLatLng import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger @@ -18,6 +19,7 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.map.listener.IMogoMapListener import com.mogo.och.common.module.biz.provider.CommonService import com.mogo.och.common.module.constant.OchCommonConst +import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager import com.mogo.och.common.module.manager.xiaozhi.ZhiStateManager import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.common.module.voice.VoiceNotice @@ -108,7 +110,8 @@ class TaxiPassengerBaseFragment() : BottomBar.SelectView.PRECISIONMAP -> { //切换到地图中间 mapBizView.getUI()?.let { - it.changeMapVisualAngle(it.getVrAngleDefaultMode(), null) + val wgs02Location = OchLocationManager.getWgs02Location() + it.moveToCenter(MogoLatLng(wgs02Location.latitude,wgs02Location.longitude)) } } BottomBar.SelectView.OVERMAPVIEW -> { @@ -141,6 +144,7 @@ class TaxiPassengerBaseFragment() : } rbv_setting_music.setShowOnlySetting(0) lbv_go2_center.visibility = View.VISIBLE + lbv_go2_center.showAngle() pcnActionView.visibility = View.VISIBLE CallerHmiManager.showTrafficLightView() infoVideoView.visibility = View.GONE @@ -154,7 +158,8 @@ class TaxiPassengerBaseFragment() : romaPView.updateVisible(false) romaDistanceView.visibility = View.GONE rbv_setting_music.setShowOnlySetting(0) - lbv_go2_center.visibility = View.GONE + lbv_go2_center.visibility = View.VISIBLE + lbv_go2_center.showOnlyCenter() pcnActionView.visibility = View.VISIBLE CallerHmiManager.showTrafficLightView() infoVideoView.visibility = View.GONE