From e4823c9f46b4c21818b414b4eb4fb86ffe313426 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 27 Jul 2023 16:32:12 +0800 Subject: [PATCH] =?UTF-8?q?[bugfix]=20[id=20=E5=86=B2=E7=AA=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taxi/passenger/ui/arrived/ArrivedView.kt | 6 +++--- .../passenger/ui/arrived/RightRearCamView.kt | 5 +++++ .../taxi_p_blue_tooth_close.png | Bin 1418 -> 1484 bytes .../res/layout/taxi_p_arrived_end_panel.xml | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt index a2486b5d26..6239737409 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt @@ -12,8 +12,6 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.OverlayViewUtils import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.taxi.passenger.R -import com.mogo.och.taxi.passenger.ui.TaxiPassengerBaseFragment -import com.mogo.och.taxi.passenger.ui.startautopilot.StartAutopilotView import com.mogo.och.taxi.passenger.widget.WindowRelativeLayout import com.mogo.och.taxi.passenger.widget.animutils.AnimationsContainer import com.shuyu.gsyvideoplayer.GSYVideoManager @@ -24,7 +22,7 @@ import kotlinx.android.synthetic.main.taxi_p_arrived_end_panel.view.aciv_close import kotlinx.android.synthetic.main.taxi_p_arrived_end_panel.view.actv_endstation import kotlinx.android.synthetic.main.taxi_p_arrived_end_panel.view.iv_xiaozhi_belt import kotlinx.android.synthetic.main.taxi_p_arrived_end_panel.view.svp_frame -import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.taxi_p_autopilot_starting +import kotlinx.android.synthetic.main.taxi_p_arrived_end_panel.view.v_video_right_rear_view /** @@ -80,6 +78,7 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { val viewModel = ViewModelProvider(this).get(ArrivedViewModel::class.java) viewModel.setViewCallback(this) taxiPxiaozhiLove?.start() + v_video_right_rear_view.resetView() } override fun onDetachedFromWindow() { @@ -88,6 +87,7 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { svp_frame.onVideoReset() svp_frame.release() taxiPxiaozhiLove?.stop() + v_video_right_rear_view.resetView() super.onDetachedFromWindow() subscribe?.let { diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamView.kt index b1426decaf..96e0cc9214 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamView.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamView.kt @@ -92,6 +92,11 @@ class RightRearCamView : ConstraintLayout , IMoGoBackCameraVideoListener, } } + fun resetView(){ + actv_cam_position_group.visibility = GONE + v_video_right_rear.setImageResource(R.drawable.taxi_p_right_rear_cam) + } + private fun draw(data: ByteArray) { ThreadUtils.runOnUiThread { if(actv_cam_position_group.visibility == GONE) { diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_close.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_close.png index fcedabb20aa409337b12ad26d0921273f306fca6..f114ddbb6721744c72fd1c332dee9634b8ff5916 100644 GIT binary patch delta 1373 zcmV-j1)}+A}yd3`KYbR5j5HZ3Z+qFi4hFg7z(k)DEJX$j9=*=rs^No zG`5F84{!JO`IhU!?B(G0W{=iCb`#h)Z{C~t`@MNHH#>wlkAIT^Cj(9foD4V_a5CUz zz{!Bk3{ac?mfRWZzC5f(BZe^s9C0rv+xFG?CoDM&8cBkF!frrFNpy;S{sIeKD?Eq= z$BRzPzyts{M>XF)ouxv^(>P^?7-Jwb4iLzNnBEtt z4?Ud*XU5$^fPeTX)pZB+C)D;ID{DI*=JnQPaDh(V2-LN=h$bjiEL+5?YCDTm(8h2> zSOZjlucEH~nN&fNb(GLP{F~(Uxb6ZIYR3nGmfmH&UR1V4OsD#jNNS}K9DqppuMNpH zrvpPJ+D{buHY7LB+hS>Mg|p{AeU2Tzir0(CwupJ;ynn|irSF>p1MCjeg}QosdtD}d zQX|O9e)TAMcO%J0N{K$#4PMLUET)tKWg@e8+4VXoq66TS++&Y7>qHh2OE85SXKx4!Ew!OB4@+H0oJ*S*Yk3G z<2g4rYk$ji;0(UwQM`|Es*J^~9;qs7LqSAP!K1(cKgra+MTO|egkF-QojTFoRHv=R zmY>iYZ!FE1gAL^`@j4MXtHcZdvzrI5Gad}iz-cVc)d?N0%inO8u1mBpyj29_3pV+C zlJr8&MHjfph~uLJBL(YAjm=;q=YIt!8=}|LrhhanxkzcS(cf><+h}B+n1N+{ba1qw zX!A6R_gKJo%1x!>*BZ*dwqR@7WJ!n_(Z@d<_@Zz_>E8tCeb`J{^0?uAm6Ictyuy5^ z44-U1ws*zFz<69Y9Y974%mj@Q#r0Hkt?#eJ#t`jWGGd`nNC|5vkKnF%S88y0M$}@* zDu3!aic|O7(=G|Iwzi{}{qj5MBS0Qp6dr(=fc{CKHnek5JAuxuuQA3#Ij1Kl2k;De zuSGlthAo8~HcPmp9=GU|)-2_sPV2RRLG`|a%cGOpAkI_~Z-PNakZ4IlhwYDn;?Dt) zoP^GJ&z?BsmAe>wD9YvAG2S5QyRpLpa8iCJ&o`3I; zOGe2R-s*jx5*Re~0m%nVGtQmDk1b+>#-3}=NAwdI{T2>^N+sBVq|ySbVcpl`=glZG zH(%&b@*!Pi?{qJ7fHD>#@^3df<m}P z_sHedtdh=ueDVesWn09S<;vS5=YQ3Y5L_XylQUFy-5+GTzDXOKLOovK;ewU3^bdb` zpBxPV{0R!#)XMzdCimHC+bTsnfiL*}K#79oTlPm5#xf0Is}xNmW!S)@ zDf^@hD3@r)Xcu1H`Hfqu4D(^x{2~#{#jRUC7Dolctxe_oEhBUcoeVe`a5CUzz{!A< f0Vf0h`waXCQ-7vvC1E2r00000NkvXXu0mjf)CHPE delta 1307 zcmV+$1?2k73yKSnfPVz^NklpM2$g>5;P)|-EC`88>y+r01to)1c(X`s0ow+52W}LqluJg2wJg=h6IG_ z)?Iez_|4YY-dVTo?943qFq>@V-gD2n=ljmNbLPwtc|R`#UVj9<2zU|jBH%^9i+~pa zhY?_h_Lj^WHb`}wwM&ut<#MXx*e$nKey11;i9iSrK91**sO=gouJwh^Bgtma(b47go zM}*3_1LbkRv>@{0x)%Cq!fLt1B)2(nL@b-3XHey8hJ1?;Wo$s`>Lx65QhX6NdN*#5bkc`8befZRsaIlw)Bu$Ok0I##-U?Nn+-m++ZtPa+fP z9F@$x$);f9h?u@tj9KfC(i4dK8g*~ncTL(^>IS)5Rj!Wp!gIPecaJuya_qIKW(qxI zmX$YiwST3G#H3RrdBF^Ud;Na8H=C6o4Y|+9kD<&5QE=Wyc0z_+zaslBi5N#!nVqq# z#B>09@zC!xGZ_AjNXF-7%zYqqWqytUD&;wVd9pvs@2hgVW7mo4KtQe;Ix$OYz|CClzg!rbEzMCEQ0{ICdlW z;V-KLboWoo`FHD(t!X;0isy4PX%?+Pqx)4+9p-FR6)mm=DcxVih)rKBfgcXgHWZB; zixNYRh|XnCq*dk>U3VxP;fOff^_ngjl{`%!<3W9Ash!-ehK4`aGZtPeqm!p-mlaYv z2!H4WP(e3_V-hz&xp8%sSmPTqMo!S@=sIpw!Rg;Q3g(}p#3xl5Y*yCAQB zX_w2=XJ{{?ev|4Pnd(SHX;Eq%TH1o2{(s!6nMyOza&+R44(s2a$ec`?dO+?fLuBXb znApVE-d`$6jZJOBXoF)v9(`DKtB2Ax+J8XSIr)3;2amyp3->Jsj|#!QMjRav>? zs&Wlf{RwRnNo5H4k2D%`y~?4JUDUslw-~aKt_`cC0k1ck5tN(FI{b-mEG;z4%72?V z%9xg=4SIBkUGkrJGBzbFkV04Ta4JRL6_P?=-g-Jp3w~X~xeu(vdzUwIL~L{bFPY3e zIhV{Q(MilrG&2gw`F}W@&FCXHBhzE^n&?E>$BS`%m+J3$dAZGjBVtEi<&(jBnuqH4 zuHQ#9kFVgbt>8eGuQlm0{{EndA;873n+*@u=VK3)hhG6I6xcyPUr%Tyrva zR6LwG9)0<{cazMe|nW&2W6XL$x$BvBG^)I+BY*45ZfM)7$MwpXamX zg~Ph`1v!eL5NT=VJvmrR-6#@oCah!hG`$FT5%415MZk-I7XdE<|MLj^0~D{Pp%?4g RCMN&@002ovPDHLkV1mUpelY+5 diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml index 17ce3f897d..f7e396c76d 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml @@ -50,7 +50,7 @@ android:layout_height="wrap_content"/>