From 6b33ab9f9fb88b2f360785cff772072a37ceafe4 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 10 Aug 2023 20:02:47 +0800 Subject: [PATCH] =?UTF-8?q?[5.0.0]=20[taxi=20=E4=B9=98=E5=AE=A2=E5=B1=8F?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E8=87=AA=E9=A9=BE=E4=B8=8D=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E7=AB=AF=E5=85=88=E5=BC=80=E5=90=AF=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/layout/taxi_p_base_fragment.xml | 2 +- .../IOCHTaxiPassengerOrderStatusCallback.kt | 3 -- .../passenger/model/TaxiPassengerModel.kt | 41 ------------------- .../network/TaxiPassengerServiceApi.kt | 15 ------- .../network/TaxiPassengerServiceManager.kt | 9 ---- .../passenger/ui/TaxiPassengerBaseFragment.kt | 2 - .../taxi/passenger/ui/arrived/ArrivedView.kt | 2 +- .../taxi/passenger/ui/check/ChekViewModel.kt | 8 ---- .../ui/startautopilot/StartAutopilotView.kt | 18 ++------ .../startautopilot/StartAutopilotViewModel.kt | 6 --- .../{ => systemsetting}/TaxiPSettingView.kt | 2 +- .../main/res/layout/taxi_p_base_fragment.xml | 2 +- .../layout/taxi_p_start_autopilot_view.xml | 1 + 13 files changed, 8 insertions(+), 103 deletions(-) rename OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/{ => systemsetting}/TaxiPSettingView.kt (99%) diff --git a/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml index 55e9197f4b..c82a879f9f 100644 --- a/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -62,7 +62,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - { AutopilotManager.clearAutopilotControlParameters() //startOrStopQueryOrderRemaining(false) - startOrStopReadyToAutopilotLoop(false) cleanStation() } TaxiPassengerOrderStatusEnum.None -> TODO() } } - /** - * 查询司机是否已确认可开启自动驾驶 - */ - private fun loopQueryPilotStatus() { - if (currentOCHOrder == null) return - TaxiPassengerServiceManager.queryPilotStatus( - currentOCHOrder!!.orderNo, - object : OchCommonServiceCallback { - override fun onSuccess(data: TaxiPassengerBaseRespBean) { - if (data.code == 0 && data.data == true) { - updateAutopilotStatus(true) - startOrStopReadyToAutopilotLoop(false) - } - } - - override fun onFail(code: Int, msg: String) { - updateAutopilotStatus(false) - } - }) - } - - fun updateAutopilotStatus(isBoarded: Boolean) { - if (mOrderStatusCallbackMap.isNotEmpty()) { - for (callback in mOrderStatusCallbackMap.values) { - callback.onDriverHasCheckedPilotCondition(isBoarded) - } - } - } - - fun startOrStopReadyToAutopilotLoop(isStart: Boolean) { - if (isStart) { - BizLoopManager.setLoopFunction(STARTREADYTOAUTOPILOT, LoopInfo(1, TaxiPassengerModel::loopQueryPilotStatus)) - CallerLogger.i(M_TAXI_P + TAG, "startReadyToAutopilot()") - } else { - BizLoopManager.removeLoopFunction(STARTREADYTOAUTOPILOT) - CallerLogger.i(M_TAXI_P + TAG, "stopReadyToAutopilot()") - } - } - fun setStation() { if (currentOCHOrder != null) { val startStation = MogoLocation() diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt index df1d43e9a0..084cbe702c 100644 --- a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt +++ b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt @@ -60,21 +60,6 @@ internal interface TaxiPassengerServiceApi { @Body data: TaxiPassengerCheckPhoneUpdateOrderReqBean? ): Observable - /** - * 查询司机是否已确认可开启自动驾驶 - * @param appId - * @param ticket - * @param orderNo - * @return - */ - @Headers("Content-type:application/json;charset=UTF-8") - @GET("/autopilot-car-hailing/cab/flow/v1/driver/taxi/pilot/status") - fun queryPilotStatus( - @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token, - @Query("orderNo") orderNo: String - ): Observable - /** * 乘客屏启动自动驾驶成功 * @param appId diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt index 661c7c6873..c5ceee6b9f 100644 --- a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt +++ b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt @@ -80,15 +80,6 @@ object TaxiPassengerServiceManager { .subscribe(OchCommonSubscribeImpl(context, callback, "checkPhoneAndUpdateOrderStatus")) } - @JvmStatic - fun queryPilotStatus( - orderNo: String, - callback: OchCommonServiceCallback? - ) { - mOCHTaxiServiceApi.queryPilotStatus(orderNo = orderNo) - .transformTry() - .subscribe(OchCommonSubscribeImpl(context, callback, "queryPilotStatus")) - } @JvmStatic fun startServicePilotDone( orderNo: String?, loc: TaxiPassengerStartReqBean.Result?, diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt index 384136e8fb..516ec792f4 100644 --- a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt @@ -16,7 +16,6 @@ import com.mogo.map.uicontroller.VisualAngleMode import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.taxi.passenger.R -import com.mogo.och.taxi.passenger.callback.ITaxiPassengerCommonValueCallback import com.mogo.och.taxi.passenger.presenter.BaseTaxiPassengerPresenter import com.mogo.och.taxi.passenger.ui.arrived.ArrivedView import com.mogo.och.taxi.passenger.ui.bottom.BottomBar @@ -246,7 +245,6 @@ class TaxiPassengerBaseFragment() : } mStartAutopilotView?.get()?.let { OverlayViewUtils.showOverlayView(activity, it) - it.handleStartAutopilotBtnStatus(false) } } else { mStartAutopilotView?.get()?.closeAllAnimsAndView() diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt index 66b1054825..127d87a9fc 100644 --- a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt +++ b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt @@ -29,7 +29,7 @@ import kotlinx.android.synthetic.main.taxi_p_arrived_end_panel.view.v_video_righ * 评价View * Created on 2022/5/16 */ -class mViewModelArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { +class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { constructor(context: Context?) : super(context) diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/ChekViewModel.kt b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/ChekViewModel.kt index 7c54b5ab0a..5ad2e8aee8 100644 --- a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/ChekViewModel.kt +++ b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/ChekViewModel.kt @@ -1,16 +1,9 @@ package com.mogo.och.taxi.passenger.ui.check import androidx.lifecycle.ViewModel -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.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant -import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRespBean import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerOrderStatusCallback import com.mogo.och.taxi.passenger.constant.TaxiPassengerOrderStatusEnum -import com.mogo.och.taxi.passenger.model.AutopilotManager import com.mogo.och.taxi.passenger.model.TaxiPassengerModel class ChekViewModel : ViewModel(), IOCHTaxiPassengerOrderStatusCallback { @@ -25,7 +18,6 @@ class ChekViewModel : ViewModel(), IOCHTaxiPassengerOrderStatusCallback { fun setStartAutopilotCallback(viewCallback: CheckCallback) { this.viewCallback = viewCallback - TaxiPassengerModel.startOrStopReadyToAutopilotLoop(true) setOrderInfo() } fun checkAndUpdateStatus(phone: String) { diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt index 6a4625de3e..6bdf712434 100644 --- a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt +++ b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt @@ -77,25 +77,13 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "动画暂停") } }) - } - - fun startAutopilotBgAnimatorDrawable(isStart: Boolean) { - if (isStart) { - taxiPStartAutopilot?.start() - } else { - taxiPStartAutopilot?.stop() - } + handleStartAutopilotBtnStatus(true) } @SuppressLint("UseCompatLoadingForDrawables") - override fun handleStartAutopilotBtnStatus(isBoarded: Boolean) { - taxi_p_autopilot_starting?.setImageResource(R.drawable.light_00003) + fun handleStartAutopilotBtnStatus(isBoarded: Boolean) { updateStartAutopilotBtnStatus(isBoarded) - if (isBoarded) { //高亮可点击状态下动画一直进行 - startAutopilotBgAnimatorDrawable(true) - } else { // 置灰色可点击状态下动画停止 - startAutopilotBgAnimatorDrawable(false) - } + taxiPStartAutopilot?.start() } override fun setOrderInfo(show: String) { diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt index 27ee557d20..8891d34fd8 100644 --- a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt +++ b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt @@ -25,7 +25,6 @@ class StartAutopilotViewModel : ViewModel(), IOCHTaxiPassengerOrderStatusCallbac fun setStartAutopilotCallback(viewCallback: StartAutopilotCallback) { this.viewCallback = viewCallback - TaxiPassengerModel.startOrStopReadyToAutopilotLoop(true) setOrderInfo() setDoorInfo() } @@ -63,10 +62,6 @@ class StartAutopilotViewModel : ViewModel(), IOCHTaxiPassengerOrderStatusCallbac CallerChassisDoorStateListenerManager.removeListener(TAG) } - override fun onDriverHasCheckedPilotCondition(isBoarded: Boolean) { - viewCallback?.handleStartAutopilotBtnStatus(isBoarded) - } - /** * 开启自动驾驶 */ @@ -114,7 +109,6 @@ class StartAutopilotViewModel : ViewModel(), IOCHTaxiPassengerOrderStatusCallbac interface StartAutopilotCallback { - fun handleStartAutopilotBtnStatus(isBoarded: Boolean) fun setOrderInfo(show: String) fun setDoorStatus(doorPosition: DoorPosition,isOpen:Boolean) } diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPSettingView.kt b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/systemsetting/TaxiPSettingView.kt similarity index 99% rename from OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPSettingView.kt rename to OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/systemsetting/TaxiPSettingView.kt index 9f7b164b0f..7baaf6247b 100644 --- a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPSettingView.kt +++ b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/systemsetting/TaxiPSettingView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.ui +package com.mogo.och.taxi.passenger.ui.systemsetting import android.annotation.SuppressLint import android.content.Context diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/taxi/taxi-unmanned-passenger/src/main/res/layout/taxi_p_base_fragment.xml index 673385f981..bdb06a665e 100644 --- a/OCH/taxi/taxi-unmanned-passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/taxi/taxi-unmanned-passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -59,7 +59,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> -