From 42443c0b71fe967a1d7dc88bfeed8a1b9c466952 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 10 Jul 2024 19:43:23 +0800 Subject: [PATCH] [6.5.0] [fea] [taxi order change listener] --- .../module/biz}/order/BaseOrderBean.java | 2 +- .../common/module/biz}/order/OrderListener.kt | 4 ++- .../common/module/biz}/order/OrderModel.kt | 25 +++++++++++++++---- .../och/taxi/bean/OrderQueryRespBean.java | 14 +++++++---- .../och/taxi/presenter/TaxiPresenter.java | 2 ++ .../bean/TaxiPassengerOrderQueryRespBean.java | 2 +- .../passenger/model/TaxiPassengerModel.kt | 2 +- .../presenter/BaseTaxiPassengerPresenter.kt | 6 ++--- .../ChekAndStartAutopilotViewModel.kt | 6 ++--- .../ui/orderinfo/OrderInfoViewModel.kt | 6 ++--- .../passenger/ui/arrived/ArrivedViewModel.kt | 2 +- .../ui/evaluate/EvaluateViewModel.kt | 2 +- .../passenger/ui/model/music/MusicModel.kt | 8 +++--- .../taxi/passenger/ui/music/MusicViewModel.kt | 3 ++- .../taxi/bean/TaxiDriverTaskWithOrderBean.kt | 9 +++---- .../unmanned/taxi/ui/task/TaxiTaskModel.kt | 5 ++++ ...PassengerOrdersInServiceQueryRespBean.java | 2 +- .../passenger/model/TaxiPassengerModel.kt | 2 +- .../presenter/BaseTaxiPassengerPresenter.kt | 6 ++--- .../ChekAndStartAutopilotViewModel.kt | 6 ++--- .../ui/orderinfo/OrderInfoViewModel.kt | 6 ++--- 21 files changed, 73 insertions(+), 47 deletions(-) rename OCH/{taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/model => common/common/src/main/java/com/mogo/och/common/module/biz}/order/BaseOrderBean.java (77%) rename OCH/{taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/model => common/common/src/main/java/com/mogo/och/common/module/biz}/order/OrderListener.kt (62%) rename OCH/{taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/model => common/common/src/main/java/com/mogo/och/common/module/biz}/order/OrderModel.kt (55%) diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/model/order/BaseOrderBean.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/order/BaseOrderBean.java similarity index 77% rename from OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/model/order/BaseOrderBean.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/order/BaseOrderBean.java index 417ccd40c2..290760753e 100644 --- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/model/order/BaseOrderBean.java +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/order/BaseOrderBean.java @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.ui.model.order; +package com.mogo.och.common.module.biz.order; public class BaseOrderBean { public String orderNo;// 订单号 diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/model/order/OrderListener.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/order/OrderListener.kt similarity index 62% rename from OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/model/order/OrderListener.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/order/OrderListener.kt index 6ecf8a741b..52888134a3 100644 --- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/model/order/OrderListener.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/order/OrderListener.kt @@ -1,4 +1,6 @@ -package com.mogo.och.taxi.passenger.ui.model.order +package com.mogo.och.common.module.biz.order + +import com.mogo.och.common.module.biz.order.BaseOrderBean interface OrderListener { // 当前进行单状态变更：新到进行中订单、进行中单状态变更 diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/model/order/OrderModel.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/order/OrderModel.kt similarity index 55% rename from OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/model/order/OrderModel.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/order/OrderModel.kt index 58ddeded67..4af86be7a1 100644 --- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/model/order/OrderModel.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/order/OrderModel.kt @@ -1,15 +1,14 @@ -package com.mogo.och.taxi.passenger.ui.model.order +package com.mogo.och.common.module.biz.order -import com.mogo.och.taxi.passenger.ui.model.music.MusicModel import java.util.concurrent.ConcurrentHashMap object OrderModel { private val mOrderStatusCallbackMap: MutableMap = ConcurrentHashMap() - var orderBean:BaseOrderBean?=null + var orderBean: BaseOrderBean?=null init { - MusicModel.load() + } fun setOrderStatusCallback(tag: String?, callback: OrderListener?) { @@ -22,7 +21,23 @@ object OrderModel { } fun invokeListener(orderBean: T?){ - this.orderBean = orderBean + + + + if(this.orderBean==null){ + this.orderBean = orderBean + }else { + if(orderBean==null){ + this.orderBean = orderBean + }else{ + if (this.orderBean!!.orderNo == orderBean.orderNo && this.orderBean!!.orderStatus == orderBean.orderStatus) { + return + }else{ + this.orderBean = orderBean + } + } + } + for (callback in mOrderStatusCallbackMap.values) { callback.onCurrentOrderStatusChanged(orderBean) } diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/bean/OrderQueryRespBean.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/bean/OrderQueryRespBean.java index 2d879dc63a..b7adcf2dbe 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/bean/OrderQueryRespBean.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/bean/OrderQueryRespBean.java @@ -1,6 +1,7 @@ package com.mogo.och.taxi.bean; import com.mogo.eagle.core.data.BaseData; +import com.mogo.och.common.module.biz.order.BaseOrderBean; import java.util.List; import java.util.Objects; @@ -13,13 +14,11 @@ import java.util.Objects; public class OrderQueryRespBean extends BaseData { public Result data; - public static class Result implements Comparable{ - // 订单no - public String orderNo; + public static class Result extends BaseOrderBean implements Comparable{ + // 订单类型 public int orderType; //1即时单 2预约单 - // 订单状态 - public int orderStatus; + // 订单运营类型 （9出租车，10小巴） public int businessType; // 起始站点id @@ -68,6 +67,11 @@ public class OrderQueryRespBean extends BaseData { // !!!接口中暂无此字段，仅用于本地实现逻辑使用：起始站目的站距离km public double travelDistance; + @Override + public String getEndSiteAddr() { + return endSiteAddr; + } + /** * @param distance */ 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 3acc53fd06..f935752c3a 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 @@ -20,6 +20,7 @@ import com.mogo.och.common.module.biz.login.ILoginCallback; import com.mogo.och.common.module.biz.login.LoginStatusEnum; import com.mogo.och.common.module.biz.login.LoginStatusManager; import com.mogo.och.common.module.biz.login.OpenOrderStatusEnum; +import com.mogo.och.common.module.biz.order.OrderModel; import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager; import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager; import com.mogo.och.common.module.manager.autopilot.line.LineManager; @@ -286,6 +287,7 @@ public class TaxiPresenter extends Presenter implements ITaxiADASS @Override public void onCurrentOrderStatusChanged(OrderQueryRespBean.Result order) { OchChainLogManager.writeChainLog("订单信息变化",order.toString()); + OrderModel.INSTANCE.invokeListener(order); CallerLogger.d(M_TAXI + TAG, "order = " + order.toString()); LineManager.setLineId(order.lineId); if (TaxiOrderStatusEnum.UserArriveAtStart.getCode() == order.orderStatus) { diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRespBean.java b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRespBean.java index 9cfd9cf0a5..7b37fd3173 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRespBean.java +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRespBean.java @@ -1,7 +1,7 @@ package com.mogo.och.taxi.passenger.bean; import com.mogo.eagle.core.data.BaseData; -import com.mogo.och.taxi.passenger.ui.model.order.BaseOrderBean; +import com.mogo.och.common.module.biz.order.BaseOrderBean; import java.util.List; import java.util.Objects; diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt index c423e1f062..4c8e965572 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt @@ -36,7 +36,7 @@ import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum.Companion.valueOf import com.mogo.och.taxi.passenger.network.TaxiPassengerServiceManager -import com.mogo.och.taxi.passenger.ui.model.order.OrderModel +import com.mogo.och.common.module.biz.order.OrderModel import com.mogo.och.taxi.passenger.utils.TaxiPassengerAnalyticsManager import java.util.concurrent.ConcurrentHashMap 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 21a45e9958..81af4c7ead 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 @@ -14,9 +14,9 @@ import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum import com.mogo.och.taxi.passenger.model.AutopilotManager import com.mogo.och.taxi.passenger.model.TaxiPassengerModel import com.mogo.och.taxi.passenger.ui.TaxiPassengerBaseFragment -import com.mogo.och.taxi.passenger.ui.model.order.BaseOrderBean -import com.mogo.och.taxi.passenger.ui.model.order.OrderListener -import com.mogo.och.taxi.passenger.ui.model.order.OrderModel +import com.mogo.och.common.module.biz.order.BaseOrderBean +import com.mogo.och.common.module.biz.order.OrderListener +import com.mogo.och.common.module.biz.order.OrderModel /** * @author: wangmingjun diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotViewModel.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotViewModel.kt index 9dea09ad2f..728a1fbb0d 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotViewModel.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotViewModel.kt @@ -2,9 +2,9 @@ package com.mogo.och.taxi.passenger.ui.checkstartautopilot import androidx.lifecycle.ViewModel import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum -import com.mogo.och.taxi.passenger.ui.model.order.BaseOrderBean -import com.mogo.och.taxi.passenger.ui.model.order.OrderListener -import com.mogo.och.taxi.passenger.ui.model.order.OrderModel +import com.mogo.och.common.module.biz.order.BaseOrderBean +import com.mogo.och.common.module.biz.order.OrderListener +import com.mogo.och.common.module.biz.order.OrderModel class ChekAndStartAutopilotViewModel : ViewModel(), OrderListener { diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/OrderInfoViewModel.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/OrderInfoViewModel.kt index 2c3a95e54e..13f8def085 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/OrderInfoViewModel.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/OrderInfoViewModel.kt @@ -9,9 +9,9 @@ import com.mogo.och.taxi.passenger.R import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerOrderStatusCallback import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum import com.mogo.och.taxi.passenger.model.TaxiPassengerModel -import com.mogo.och.taxi.passenger.ui.model.order.BaseOrderBean -import com.mogo.och.taxi.passenger.ui.model.order.OrderListener -import com.mogo.och.taxi.passenger.ui.model.order.OrderModel +import com.mogo.och.common.module.biz.order.BaseOrderBean +import com.mogo.och.common.module.biz.order.OrderListener +import com.mogo.och.common.module.biz.order.OrderModel import kotlin.math.ceil class OrderInfoViewModel: ViewModel(), IOCHTaxiPassengerOrderStatusCallback, OrderListener { diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedViewModel.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedViewModel.kt index 3d38f3a285..20e512983a 100644 --- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedViewModel.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedViewModel.kt @@ -3,7 +3,7 @@ package com.mogo.och.taxi.passenger.ui.arrived import androidx.lifecycle.ViewModel import com.mogo.och.common.module.manager.distance.IDistanceListener import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager -import com.mogo.och.taxi.passenger.ui.model.order.OrderModel +import com.mogo.och.common.module.biz.order.OrderModel class ArrivedViewModel : ViewModel(), IDistanceListener { diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/evaluate/EvaluateViewModel.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/evaluate/EvaluateViewModel.kt index 966a3c9954..9cc51c5388 100644 --- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/evaluate/EvaluateViewModel.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/evaluate/EvaluateViewModel.kt @@ -6,7 +6,7 @@ import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.common.module.manager.distance.IDistanceListener import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager -import com.mogo.och.taxi.passenger.ui.model.order.OrderModel +import com.mogo.och.common.module.biz.order.OrderModel class EvaluateViewModel : ViewModel(), IDistanceListener { diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/model/music/MusicModel.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/model/music/MusicModel.kt index 52d9355649..de0545c180 100644 --- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/model/music/MusicModel.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/model/music/MusicModel.kt @@ -7,9 +7,9 @@ import com.mogo.och.common.module.manager.audition.AuditionManager import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager import com.mogo.och.common.module.utils.RxUtils -import com.mogo.och.taxi.passenger.ui.model.order.BaseOrderBean -import com.mogo.och.taxi.passenger.ui.model.order.OrderListener -import com.mogo.och.taxi.passenger.ui.model.order.OrderModel +import com.mogo.och.common.module.biz.order.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.biz.order.TaxiOrderStatusEnum import io.reactivex.disposables.Disposable @@ -21,7 +21,7 @@ object MusicModel : OrderListener, IOchAutopilotStatusListener { } private var stopMusicDisposable: Disposable? = null - private var orderInfo:BaseOrderBean? = null + private var orderInfo: BaseOrderBean? = null private const val startMusicWithOrderKey = "STARTMUSICWITHORDER" diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/MusicViewModel.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/MusicViewModel.kt index c1a1823423..622faefd98 100644 --- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/MusicViewModel.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/MusicViewModel.kt @@ -1,6 +1,7 @@ package com.mogo.och.taxi.passenger.ui.music import androidx.lifecycle.ViewModel +import com.mogo.och.taxi.passenger.ui.model.music.MusicModel class MusicViewModel: ViewModel() { @@ -9,7 +10,7 @@ class MusicViewModel: ViewModel() { private var viewCallback: IMusicViewCallback?=null init { - + MusicModel.load() } fun setDistanceCallback(viewCallback: IMusicViewCallback){ diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiDriverTaskWithOrderBean.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiDriverTaskWithOrderBean.kt index a38b882ba0..1fc13354a3 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiDriverTaskWithOrderBean.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiDriverTaskWithOrderBean.kt @@ -1,6 +1,7 @@ package com.mogo.och.unmanned.taxi.bean import com.mogo.eagle.core.data.BaseData +import com.mogo.och.common.module.biz.order.BaseOrderBean import com.mogo.och.unmanned.taxi.constant.TaskStatusEnum import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum @@ -10,8 +11,6 @@ import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum */ data class OrderDetail( - var orderNo: String, - var orderStatus: Int, var orderStartSite: Site?, var orderEndSite: Site?, var planningLines: Array, //返回的是接驾任务的id集合 @@ -20,7 +19,7 @@ data class OrderDetail( var fullMinutes: Int, //到站后返回的总里程 /公里 var fullMileage: Float, // 到站后返回的总用时 /分钟 var orderLine: Long // 订单路线id -) { +): BaseOrderBean() { override fun equals(other: Any?): Boolean { if (this === other) return true if (javaClass != other?.javaClass) return false @@ -238,14 +237,12 @@ data class QueryCarOrderByNoReqBean( data class QueryCarOrderByNoRespBean(var data: Result) : BaseData() { data class Result( var sn: String, - var orderNo: String, - var orderStatus: Int, var bookingUserPhone: String, var businessType: String, var mileage: Float, var duration: Float, var passengerSize: Int - ) + ):BaseOrderBean() } /** diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt index a3a814d961..4d05d6cc39 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt @@ -40,6 +40,7 @@ import com.mogo.och.common.module.manager.socket.cloud.data.OCHOperationalMessag import com.mogo.och.common.module.biz.login.LoginStatusManager import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.biz.login.LoginService +import com.mogo.och.common.module.biz.order.OrderModel import com.mogo.och.common.module.callback.OchAdasStartFailureCallback import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager @@ -772,6 +773,7 @@ object TaxiTaskModel { if (newOrderStatus!=mCurrentTaskWithOrder?.order?.orderStatus) { // 订单状态发生改变 orderStatusChange = true + OrderModel.invokeListener(mCurrentTaskWithOrder!!.order) } } //订单或者伪任务更新, 都去刷新下界面 @@ -911,6 +913,7 @@ object TaxiTaskModel { TaxiOrderStatusEnum.Cancel.code -> { //更新本地标志位 mCurrentTaskWithOrder = null + OrderModel.invokeListener(data.data) mTaxiTaskWithOrderCallbackMap.forEach { val listener = it.value listener.onOrderCancel() @@ -918,6 +921,7 @@ object TaxiTaskModel { } TaxiOrderStatusEnum.ArriveAtEnd.code -> { + OrderModel.invokeListener(data.data) mTaxiTaskWithOrderCallbackMap.forEach { val listener = it.value listener.onOrderTripInfoChanged( @@ -930,6 +934,7 @@ object TaxiTaskModel { TaxiOrderStatusEnum.JourneyCompleted.code -> { //更新本地标志位 mCurrentTaskWithOrder = null + OrderModel.invokeListener(data.data) mTaxiTaskWithOrderCallbackMap.forEach { val listener = it.value listener.onOrderJourneyCompleted() diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java index 34cab3ce44..7ea36e4a06 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java @@ -1,7 +1,7 @@ package com.mogo.och.unmanned.passenger.bean; import com.mogo.eagle.core.data.BaseData; -import com.mogo.och.taxi.passenger.ui.model.order.BaseOrderBean; +import com.mogo.och.common.module.biz.order.BaseOrderBean; import java.util.List; import java.util.Objects; 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 609aa88782..576020bc68 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 @@ -31,7 +31,7 @@ import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum.Companion.valueOf -import com.mogo.och.taxi.passenger.ui.model.order.OrderModel +import com.mogo.och.common.module.biz.order.OrderModel import com.mogo.och.unmanned.passenger.bean.TaxiPassengerBaseRespBean import com.mogo.och.unmanned.passenger.bean.TaxiPassengerGetTrajectoryByLineIdRespBean import com.mogo.och.unmanned.passenger.bean.TaxiPassengerOrderQueryRespBean 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 69fea381ad..417901e19d 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 @@ -10,9 +10,9 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager import com.mogo.och.unmanned.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum -import com.mogo.och.taxi.passenger.ui.model.order.BaseOrderBean -import com.mogo.och.taxi.passenger.ui.model.order.OrderListener -import com.mogo.och.taxi.passenger.ui.model.order.OrderModel +import com.mogo.och.common.module.biz.order.BaseOrderBean +import com.mogo.och.common.module.biz.order.OrderListener +import com.mogo.och.common.module.biz.order.OrderModel import com.mogo.och.unmanned.passenger.callback.IOCHTaxiPassengerOrderStatusCallback import com.mogo.och.unmanned.passenger.model.TaxiPassengerModel import com.mogo.och.unmanned.passenger.ui.TaxiPassengerBaseFragment diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/ChekAndStartAutopilotViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/ChekAndStartAutopilotViewModel.kt index 4efae6ef1f..c07e3d9dba 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/ChekAndStartAutopilotViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/ChekAndStartAutopilotViewModel.kt @@ -2,9 +2,9 @@ package com.mogo.och.unmanned.passenger.ui.checkstartautopilot import androidx.lifecycle.ViewModel import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum -import com.mogo.och.taxi.passenger.ui.model.order.BaseOrderBean -import com.mogo.och.taxi.passenger.ui.model.order.OrderListener -import com.mogo.och.taxi.passenger.ui.model.order.OrderModel +import com.mogo.och.common.module.biz.order.BaseOrderBean +import com.mogo.och.common.module.biz.order.OrderListener +import com.mogo.och.common.module.biz.order.OrderModel class ChekAndStartAutopilotViewModel : ViewModel(), OrderListener { diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/orderinfo/OrderInfoViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/orderinfo/OrderInfoViewModel.kt index 94adf32f20..cd4f7e4579 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/orderinfo/OrderInfoViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/orderinfo/OrderInfoViewModel.kt @@ -7,9 +7,9 @@ import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.common.module.utils.NumberFormatUtil import com.mogo.och.unmanned.taxi.passenger.R import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum -import com.mogo.och.taxi.passenger.ui.model.order.BaseOrderBean -import com.mogo.och.taxi.passenger.ui.model.order.OrderListener -import com.mogo.och.taxi.passenger.ui.model.order.OrderModel +import com.mogo.och.common.module.biz.order.BaseOrderBean +import com.mogo.och.common.module.biz.order.OrderListener +import com.mogo.och.common.module.biz.order.OrderModel import com.mogo.och.unmanned.passenger.callback.IOCHTaxiPassengerOrderStatusCallback import com.mogo.och.unmanned.passenger.model.TaxiPassengerModel import kotlin.math.ceil