From 2afdd3989f5567ae77d3577d388779b4443e1fb5 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 15 Jul 2024 11:00:08 +0800 Subject: [PATCH] =?UTF-8?q?[6.5.0]=20[fea]=20[=E6=B7=BB=E5=8A=A0=E6=97=A5?= =?UTF-8?q?=E5=BF=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/data/taxi/BaseOrderBean.java | 8 ++++++++ .../mogo/och/data/taxi/OrderQueryRouteInfoReqBean.java | 8 ++++++++ .../och/data/taxi/OrderQueryRouteInfoRespBean.java | 10 ++++++++++ .../com/mogo/och/taxi/presenter/TaxiPresenter.java | 4 ++++ .../passenger/presenter/BaseTaxiPassengerPresenter.kt | 5 +++++ .../unmanned/taxi/ui/task/TaxiCurrentTaskViewModel.kt | 2 ++ .../och/unmanned/passenger/model/TaxiPassengerModel.kt | 6 ++---- .../passenger/presenter/BaseTaxiPassengerPresenter.kt | 6 +++++- 8 files changed, 44 insertions(+), 5 deletions(-) diff --git a/OCH/common/data/src/main/java/com/mogo/och/data/taxi/BaseOrderBean.java b/OCH/common/data/src/main/java/com/mogo/och/data/taxi/BaseOrderBean.java index a4fc4fb4bc..b9ac4f853d 100644 --- a/OCH/common/data/src/main/java/com/mogo/och/data/taxi/BaseOrderBean.java +++ b/OCH/common/data/src/main/java/com/mogo/och/data/taxi/BaseOrderBean.java @@ -7,4 +7,12 @@ public class BaseOrderBean { public String getEndSiteAddr() { return ""; } + + @Override + public String toString() { + return "BaseOrderBean{" + + "orderNo='" + orderNo + '\'' + + ", orderStatus=" + orderStatus + + '}'; + } } diff --git a/OCH/common/data/src/main/java/com/mogo/och/data/taxi/OrderQueryRouteInfoReqBean.java b/OCH/common/data/src/main/java/com/mogo/och/data/taxi/OrderQueryRouteInfoReqBean.java index addb481941..25a797173c 100644 --- a/OCH/common/data/src/main/java/com/mogo/och/data/taxi/OrderQueryRouteInfoReqBean.java +++ b/OCH/common/data/src/main/java/com/mogo/och/data/taxi/OrderQueryRouteInfoReqBean.java @@ -9,6 +9,14 @@ public class OrderQueryRouteInfoReqBean { public String sn; public String orderNo; + @Override + public String toString() { + return "OrderQueryRouteInfoReqBean{" + + "sn='" + sn + '\'' + + ", orderNo='" + orderNo + '\'' + + '}'; + } + public OrderQueryRouteInfoReqBean(String sn, String orderNo) { this.sn = sn; this.orderNo = orderNo; diff --git a/OCH/common/data/src/main/java/com/mogo/och/data/taxi/OrderQueryRouteInfoRespBean.java b/OCH/common/data/src/main/java/com/mogo/och/data/taxi/OrderQueryRouteInfoRespBean.java index 069b67d969..66b18ee055 100644 --- a/OCH/common/data/src/main/java/com/mogo/och/data/taxi/OrderQueryRouteInfoRespBean.java +++ b/OCH/common/data/src/main/java/com/mogo/och/data/taxi/OrderQueryRouteInfoRespBean.java @@ -18,5 +18,15 @@ public class OrderQueryRouteInfoRespBean extends BaseData { // 起点至终点 public long durationToEnd; //订单上车点到目的地的时长，单位：秒 public long distanceToEnd; //订单上车点到目的地的距离，单位：米 + + @Override + public String toString() { + return "Result{" + + "durationToStart=" + durationToStart + + ", distanceToStart=" + distanceToStart + + ", durationToEnd=" + durationToEnd + + ", distanceToEnd=" + distanceToEnd + + '}'; + } } } diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java index 7906624425..55d210c31f 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java @@ -376,6 +376,10 @@ public class TaxiPresenter extends Presenter implements ITaxiADASS @Override public void run() { if(mView!=null) { + OchChainLogManager.writeChainLog( + "到达目的地计算距离和时间", + "距离："+routeInfo.distanceToEnd+" 时间："+routeInfo.durationToEnd + ); mView.onCurrentOrderRouteInfoGot(routeInfo); } } diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt index c970cd46f4..1d2a3dd363 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt @@ -17,6 +17,7 @@ import com.mogo.och.taxi.passenger.ui.TaxiPassengerBaseFragment import com.mogo.och.data.taxi.BaseOrderBean import com.mogo.och.common.module.biz.order.OrderListener import com.mogo.och.common.module.biz.order.OrderModel +import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager /** * @author: wangmingjun @@ -155,6 +156,10 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) : } override fun onCurrentOrderDistAndduration(distanceToEnd: Long, durationToEnd: Long) { + OchChainLogManager.writeChainLog( + "到达目的地计算距离和时间", + "距离：${distanceToEnd} 时间：${durationToEnd}" + ) mView?.showDuringAndDistance(distanceToEnd,durationToEnd) } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskViewModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskViewModel.kt index 1039f9e12d..852c2fab6b 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskViewModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskViewModel.kt @@ -20,6 +20,7 @@ import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager import com.mogo.och.common.module.manager.autopilot.line.LineManager import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager +import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.utils.ToastUtilsOch import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.unmanned.taxi.R @@ -213,6 +214,7 @@ class TaxiCurrentTaskViewModel : BaseViewModel(), private fun updateOrderTripInfoUI(mileage: Float, duration: Int) { d(TAG, "updateOrderTripInfoUI") + OchChainLogManager.writeChainLog("到达目的地计算距离和时间", "距离：${mileage} 时间：${duration}") sendUiState { copy( taskWithOrderUIState = TaskWithOrderUIState.UpdateOrderTripInfo( diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt index 3568442e85..b0460b5f58 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt @@ -459,10 +459,8 @@ object TaxiPassengerModel { currentOCHOrder!!.orderNo, object : OchCommonServiceCallback { override fun onSuccess(data: QueryCarOrderByNoRespBean) { - if (data.data != null && currentOCHOrder != null ) { - for (callback in mOrderStatusCallbackMap.values) { - callback.onCurrentOrderDistAndduration(data.data.mileage,data.data.duration) - } + for (callback in mOrderStatusCallbackMap.values) { + callback.onCurrentOrderDistAndduration(data.data.mileage,data.data.duration) } } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/presenter/BaseTaxiPassengerPresenter.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/presenter/BaseTaxiPassengerPresenter.kt index 8786d5c6dc..2bf204fc6f 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/presenter/BaseTaxiPassengerPresenter.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/presenter/BaseTaxiPassengerPresenter.kt @@ -13,6 +13,7 @@ import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum import com.mogo.och.data.taxi.BaseOrderBean import com.mogo.och.common.module.biz.order.OrderListener import com.mogo.och.common.module.biz.order.OrderModel +import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.unmanned.passenger.callback.IOCHTaxiPassengerOrderStatusCallback import com.mogo.och.unmanned.passenger.model.TaxiPassengerModel import com.mogo.och.unmanned.passenger.ui.TaxiPassengerBaseFragment @@ -146,7 +147,10 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) : } override fun onCurrentOrderDistAndduration(mileage: Float, duration: Float) { - mView?.showDuringAndDistance(mileage,duration) + UiThreadHandler.post({ + OchChainLogManager.writeChainLog("到达目的地计算距离和时间","距离：${mileage} 时间：${duration}") + mView?.showDuringAndDistance(mileage,duration) + },UiThreadHandler.MODE.QUEUE) } companion object {