From caf7f939e53b42baa80d5acf2e920f6a60424ee8 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 21 Jul 2023 17:05:31 +0800 Subject: [PATCH] =?UTF-8?q?[3.4.0]=20[=E8=BD=A6=E9=97=A8=E5=9B=BE=E6=A0=87?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/ui/TaxiPassengerBaseFragment.kt | 2 - .../taxi/passenger/ui/arrived/ArrivedView.kt | 8 +- .../ui/startautopilot/StartAutopilotView.kt | 43 ++++++++ .../startautopilot/StartAutopilotViewModel.kt | 95 +++++++++++++++--- .../passenger/widget/ConsultVideoPlayer.kt | 2 + .../taxi_p_front_left_door_bg.9.png | Bin 0 -> 2526 bytes ...9.png => taxi_p_front_right_door_bg.9.png} | Bin .../taxi_p_rear_left_door_bg.9.png | Bin 0 -> 2591 bytes .../taxi_p_rear_right_door_bg.9.png | Bin 0 -> 2602 bytes .../main/res/layout/taxi_p_base_fragment.xml | 1 + .../layout/taxi_p_start_autopilot_view.xml | 53 +++++++++- 11 files changed, 181 insertions(+), 23 deletions(-) create mode 100644 OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_front_left_door_bg.9.png rename OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/{taxi_p_top_right_door_bg.9.png => taxi_p_front_right_door_bg.9.png} (100%) create mode 100644 OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_rear_left_door_bg.9.png create mode 100644 OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_rear_right_door_bg.9.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt index ca3c1e94fe..0a8eb1e3fd 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt @@ -137,8 +137,6 @@ class TaxiPassengerBaseFragment() : // 切换缩放到中视角 controller.changeZoom2(0.8f) } -// showOrHideArrivedEndLayout(true) - showOrHideStartAutopilotView(true) } BottomBar.SelectView.OVERMAPVIEW -> { overMapView.displayCustomOverView() 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 ec1b21f7b7..c83027dc5e 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 @@ -4,14 +4,15 @@ import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import androidx.lifecycle.ViewModelProvider +import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d 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.callback.ITaxiPassengerCommonCallback import com.mogo.och.taxi.passenger.widget.WindowRelativeLayout +import com.shuyu.gsyvideoplayer.GSYVideoManager import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack import io.reactivex.disposables.Disposable @@ -39,9 +40,6 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { private val gsyVideoOptionBuilder = GSYVideoOptionBuilder() - - var taxiPassengerCommonCallback: ITaxiPassengerCommonCallback?=null - private fun initView() { d(SceneConstant.M_TAXI_P + TAG, "initView") LayoutInflater.from(context).inflate(R.layout.taxi_p_arrived_end_panel, this, true) @@ -50,7 +48,7 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { svp_frame.setIsTouchWigetFull(false) svp_frame.enableshowProgressDialog = false svp_frame.enableDoubleClick = false - + GSYVideoManager.instance().enableRawPlay(AbsMogoApplication.getApp()) val url = "android.resource://" + context.packageName + "/" + R.raw.end_video gsyVideoOptionBuilder.setUrl(url) .setCacheWithPlay(false) diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt index 585d97353c..a33a565770 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt @@ -13,7 +13,11 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.utils.AnimatorDrawableUtil import com.mogo.och.taxi.passenger.R import com.mogo.och.taxi.passenger.widget.WindowRelativeLayout +import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.actv_front_left_door +import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.actv_front_right_door import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.actv_orderinfo +import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.actv_rear_left_door +import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.actv_rear_right_door import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.starting_autopilot_view_close import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.taxi_p_autopilot_btn_bg import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.taxi_p_autopilot_starting @@ -106,6 +110,45 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu actv_orderinfo.text = show } + override fun setDoorStatus( + doorPosition: StartAutopilotViewModel.DoorPosition, + isOpen: Boolean + ) { + when (doorPosition) { + StartAutopilotViewModel.DoorPosition.FRONT_LEFT -> { + if(isOpen){ + actv_front_left_door.visibility = VISIBLE + }else{ + actv_front_left_door.visibility = GONE + } + } + StartAutopilotViewModel.DoorPosition.FRONT_RIGHT -> { + if(isOpen){ + actv_front_right_door.visibility = VISIBLE + }else{ + actv_front_right_door.visibility = GONE + } + } + StartAutopilotViewModel.DoorPosition.REAR_LEFT -> { + if(isOpen){ + actv_rear_left_door.visibility = VISIBLE + }else{ + actv_rear_left_door.visibility = GONE + } + } + StartAutopilotViewModel.DoorPosition.REAR_RIGHT -> { + if(isOpen){ + actv_rear_right_door.visibility = VISIBLE + }else{ + actv_rear_right_door.visibility = GONE + } + } + else ->{ + + } + } + } + fun closeAllAnimsAndView() { isStarting = false clearStartingAnimFrame() diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt index 8d0e7814d0..22148f17e5 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt @@ -1,40 +1,77 @@ package com.mogo.och.taxi.passenger.ui.startautopilot import androidx.lifecycle.ViewModel +import chassis.Chassis +import chassis.Chassis.DoorNumber +import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisDoorStateListener +import com.mogo.eagle.core.function.call.autopilot.CallerChassisDoorStateListenerManager import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerOrderStatusCallback import com.mogo.och.taxi.passenger.model.AutopilotManager import com.mogo.och.taxi.passenger.model.TaxiPassengerModel -class StartAutopilotViewModel: ViewModel(), IOCHTaxiPassengerOrderStatusCallback { +class StartAutopilotViewModel : ViewModel(), IOCHTaxiPassengerOrderStatusCallback, + IMoGoChassisDoorStateListener { private val TAG = StartAutopilotViewModel::class.java.simpleName - private var viewCallback:StartAutopilotCallback?=null + private var viewCallback: StartAutopilotCallback? = null init { - TaxiPassengerModel.setOrderStatusCallback(TAG,this) + TaxiPassengerModel.setOrderStatusCallback(TAG, this) + CallerChassisDoorStateListenerManager.addListener(TAG, this) } - fun setStartAutopilotCallback(viewCallback:StartAutopilotCallback){ - this.viewCallback = viewCallback - TaxiPassengerModel.startOrStopReadyToAutopilotLoop(true) - setOrderInfo() - } + fun setStartAutopilotCallback(viewCallback: StartAutopilotCallback) { + this.viewCallback = viewCallback + TaxiPassengerModel.startOrStopReadyToAutopilotLoop(true) + setOrderInfo() + setDoorInfo() + } + + private fun setDoorInfo() { + val doorList = CallerChassisDoorStateListenerManager.getDoorList() + + doorList?.forEach { + when (it.number) { + DoorNumber.FRONT_LEFT -> { + viewCallback?.setDoorStatus(DoorPosition.FRONT_LEFT,it.status==1) + } + + DoorNumber.FRONT_RIGHT -> { + viewCallback?.setDoorStatus(DoorPosition.FRONT_RIGHT,it.status==1) + } + + DoorNumber.REAR_LEFT -> { + viewCallback?.setDoorStatus(DoorPosition.REAR_LEFT,it.status==1) + } + + DoorNumber.REAR_RIGHT -> { + viewCallback?.setDoorStatus(DoorPosition.REAR_RIGHT,it.status==1) + } + + DoorNumber.MIDDLE -> { + viewCallback?.setDoorStatus(DoorPosition.MIDDLE,it.status==1) + } + + else -> {} + } + } + } private fun setOrderInfo() { val currentOCHOrder = TaxiPassengerModel.currentOCHOrder currentOCHOrder?.let { val phone = it.passengerPhone var show = "" - if(phone.length>8) { + if (phone.length > 8) { //截取电话号码前三位 val phoneNumPre = phone.substring(0, 3); //截取电话号码后四位 val phoneNumFix = phone.substring(7); - show ="用户：$phoneNumPre****$phoneNumFix 目的地：${it.endSiteAddr}" - }else{ - show ="用户：${phone} 目的地：${it.endSiteAddr}" + show = "用户：$phoneNumPre****$phoneNumFix 目的地：${it.endSiteAddr}" + } else { + show = "用户：${phone} 目的地：${it.endSiteAddr}" } viewCallback?.setOrderInfo(show) } @@ -43,7 +80,7 @@ class StartAutopilotViewModel: ViewModel(), IOCHTaxiPassengerOrderStatusCallback override fun onCleared() { super.onCleared() this.viewCallback = null - TaxiPassengerModel.setOrderStatusCallback(TAG,null) + TaxiPassengerModel.setOrderStatusCallback(TAG, null) } override fun onDriverHasCheckedPilotCondition(isBoarded: Boolean) { @@ -57,10 +94,40 @@ class StartAutopilotViewModel: ViewModel(), IOCHTaxiPassengerOrderStatusCallback AutopilotManager.startAutopilot() } + override fun onAutopilotSingleDoorState(num: Chassis.DoorNumber, open: Boolean) { + super.onAutopilotSingleDoorState(num, open) + when (num) { + DoorNumber.FRONT_LEFT -> { + viewCallback?.setDoorStatus(DoorPosition.FRONT_LEFT,open) + } + DoorNumber.FRONT_RIGHT -> { + viewCallback?.setDoorStatus(DoorPosition.FRONT_RIGHT,open) + } - interface StartAutopilotCallback{ + DoorNumber.REAR_LEFT -> { + viewCallback?.setDoorStatus(DoorPosition.REAR_LEFT,open) + } + + DoorNumber.REAR_RIGHT -> { + viewCallback?.setDoorStatus(DoorPosition.REAR_RIGHT,open) + } + + DoorNumber.MIDDLE -> { + viewCallback?.setDoorStatus(DoorPosition.MIDDLE,open) + } + + else -> {} + } + } + + interface StartAutopilotCallback { fun handleStartAutopilotBtnStatus(isBoarded: Boolean) fun setOrderInfo(show: String) + fun setDoorStatus(doorPosition: DoorPosition,isOpen:Boolean) + } + + enum class DoorPosition { + FRONT_LEFT, FRONT_RIGHT, REAR_LEFT, REAR_RIGHT, MIDDLE } } \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt index a6f7982aef..ea3f4a32de 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt @@ -17,6 +17,7 @@ import android.widget.TextView import androidx.appcompat.widget.AppCompatImageView import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.app.ActivityCompat +import com.mogo.eagle.core.utilcode.util.ActivityUtils import com.mogo.eagle.core.utilcode.util.TimeTransformUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider @@ -418,6 +419,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { frameLayout.setBackgroundColor(Color.BLACK) val lp = LayoutParams(width, height) frameLayout.addView(gsyVideoPlayer, lp) + ActivityUtils.getActivityByContext(context) FullVideoUtils.showOverlayView(context as Activity,frameLayout,R.style.och_window_anim_alpha) gsyVideoPlayer.visibility = INVISIBLE frameLayout.visibility = INVISIBLE diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_front_left_door_bg.9.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_front_left_door_bg.9.png new file mode 100644 index 0000000000000000000000000000000000000000..b34a60c25eab8463e07e08da144a548ccba8dd1f GIT binary patch literal 2526 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 literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_top_right_door_bg.9.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_front_right_door_bg.9.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_top_right_door_bg.9.png rename to OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_front_right_door_bg.9.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_rear_left_door_bg.9.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_rear_left_door_bg.9.png new file mode 100644 index 0000000000000000000000000000000000000000..bfa9354128281bd55ecfc3fa8be00dd8ceeb8209 GIT binary patch literal 2591 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 B3331c literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_rear_right_door_bg.9.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_rear_right_door_bg.9.png new file mode 100644 index 0000000000000000000000000000000000000000..9dae84147d942111a42a612043dafff2f83d9f94 GIT binary patch literal 2602 zcmV+_3f1+AP)O004Ig1^@s6DNqDD000T`NklMtmXG}Wqbw!6>F-fiubeP*^$LI{6ILb-jOx&ARe&$-C%cV>5IuBF}Gdw-G_ zT<)HkoxSw=WaegeW@3Vn!Aa#e2q~1Rw##Q`(qrZK2_a;kqGo1K4I=wM5Y3$5kg3*1kGoU3nDYwSun0}9tpL1zZ^>l zA*B-Pm!7a|Hti#tdZqWge#awRb(!d>m!7a`S{b# z{)3FNJc?4Wxw-OGdX!u*A%sl$i{@l$l%Zn#&{UM1CD+?4X__A5Z^h|PbE`O6;jbKa zdqKDQQ{?XJJ6ze_?bf?NY5NCY)P+%UZxAPUx_{H_-T&A6qXqZE`p+u^om`@#*82aQWy+2P(9=I$$*lEP z)caf3%K18Sac^i<&YN6_(Al2zeE_8;{|p-DCe=vZBIoSLq|r!U=JqoFl6`XkhCvu5 z_e{lm&zEy|Boaog^W+->Fm&#(HtYxe$q_k+hdOSSLvTa|AF!0_=`*}KD~Z~2obaxM>LRKr{;-vof+<*%Bb+GQ`2b9w0E@2Bf`x#SxF zFx>oJj6XRe=k!pe5*bstngp@AT5dFe(ct!AsjyOTG+m;ilC^rbe`0$^)mUI6lPY{_K<%R$lFYU9xACmLGKvMaQLJ1@DS-BAa z##J({cI|zS?12F(UoJsxKahQK0AnpqCM&yUPmz7lC*{he-b_z+heKO4FAQMpDQ)g4 zaU-hY<>D{zZ{OE5^P&J23EjFuc0-R8FP9*myDIZS02UwJI#>2XPKuR_zg?bNX+85I z02Up8_sIeubSzdb{#JSN1pq8wVQjxFdqQMzxm2}XE>{d-adUewQ}w9zTG0d7O zdVPtC%)@fU0N@JdcG(#n>0d5fEC-;UZF5Z~KCi<0&Tj0+*D*=FRak5tS$3(AksXW$NmRSJ+tidVIh`;Q^H3FSHd^k}a1&Czr?t0bmeuQC+rNxOF9f1&Pho9aYj@ zF8*E(L1eaN76O2Ql3#YzNq4z~aqC^#1puIs(0^now_KFAU&~nl018pj+&lBjg=Y`} z*ascAVi1Q#k=-H(13(Es&6G>feD=7UfdEjL(spCET%x&i z0)Vo@$iAtoT*9bzo*V=KWvIyRsHdsF)n!My>};JT2LeDDN}EmXN_nwd(lkB9wN6bA z27sbeWbVk6i%%FO_sYQlP*`kN=a!5AL1r)j6x6<#OSW95;=Sj~!2nRu_RaNYj>#>T zTJ7nh{eYZ>0H81b`NWPo=`I%^|Fn9!5C9bL)s8C3mP^nuSLG}O0DV=W=g;b>l5Dw5 z#?PPRFNBc`0zfZH+XqFJWXr|JKdoLa3;?~fZ?n*u{Bo(q_F}m(0Q6GXHG7Jvk^FM0 zJe3|5L}sg80RTw;Msu=5CVG{Nk2{9?id+c*NR`K0%Vd8{^edP72h+!ik}Cp$7x+t8 zWOuaFyIg$uH~@ftIxhE@>0d6YvF9~z1)*Fa0I0~`Cp)7f{maG2pJI|L1%OIp_H5Y~ z9T{9M^?H4Y(srXcgz<3IK2c8R9t3j!E_e&@pP zWXN9Vk#gnYqqO;yd{F@7E}0g$R2Y=<<>I3vdt3I!0gS7vZhb=bzRe%QpgGIQSzBH%G4@ia*>gBvoyfySf&|bHmuIR66;lfAF=x-GeKijbUWBxUZ|Ov3JN{J}{!T z2a(wtXuH{c{ebg3cZjpz&4Jab(OOa4HFtJ_yYG`8@i&?Q(A&`GzmC7zs)8u85C8xG M07*qoM6N<$g0UMC=>Px# literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml index 89374ce8b4..e7af3b7e73 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -9,6 +9,7 @@ android:id="@+id/overMapView" android:layout_width="match_parent" android:layout_height="match_parent" + app:resetDrawable="@null" app:startPointDrawable="@drawable/taxi_p_map_view_dir_start" app:endPointDrawable="@drawable/taxi_p_map_view_dir_end" app:mapStyleExtraPath="style_extra.data" diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml index 03e838328b..581add3167 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml @@ -145,16 +145,65 @@ android:layout_height="wrap_content"/> + + + + + + + + \ No newline at end of file