diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/order/OrderListener.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/order/OrderListener.kt index 52888134a3..be6e91fc07 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/order/OrderListener.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/order/OrderListener.kt @@ -1,6 +1,6 @@ package com.mogo.och.common.module.biz.order -import com.mogo.och.common.module.biz.order.BaseOrderBean +import com.mogo.och.data.taxi.BaseOrderBean interface OrderListener { // 当前进行单状态变更：新到进行中订单、进行中单状态变更 diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/order/OrderModel.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/order/OrderModel.kt index 4af86be7a1..84048b6426 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/order/OrderModel.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/order/OrderModel.kt @@ -1,5 +1,6 @@ package com.mogo.och.common.module.biz.order +import com.mogo.och.data.taxi.BaseOrderBean import java.util.concurrent.ConcurrentHashMap object OrderModel { diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/rodedata/OchAutomaticExplorationView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/rodedata/OchAutomaticExplorationView.kt new file mode 100644 index 0000000000..24b5a8cc21 --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/rodedata/OchAutomaticExplorationView.kt @@ -0,0 +1,38 @@ +package com.mogo.och.common.module.wigets.rodedata + +import android.content.Context +import android.util.AttributeSet +import com.mogo.eagle.core.function.hmi.ui.notice.exploration.AutomaticExplorationView +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.biz.order.TaxiOrderStatusEnum + +class OchAutomaticExplorationView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : AutomaticExplorationView(context, attrs, defStyleAttr), OrderListener { + private val TAG = "OchAutomaticExplorationView" + init { + OrderModel.setOrderStatusCallback(TAG,this) + } + + override fun onCurrentOrderStatusChanged(order: BaseOrderBean?) { + if(order==null){ + + }else { + when (order.orderStatus) { + TaxiOrderStatusEnum.None.code -> {} + TaxiOrderStatusEnum.OnTheWayToStart.code -> {} + TaxiOrderStatusEnum.ArriveAtStart.code -> {} + TaxiOrderStatusEnum.UserArriveAtStart.code -> {} + TaxiOrderStatusEnum.OnTheWayToEnd.code -> {} + TaxiOrderStatusEnum.ArriveAtEnd.code -> {} + TaxiOrderStatusEnum.JourneyCompleted.code -> {} + TaxiOrderStatusEnum.Cancel.code -> {} + else -> {} + } + } + } +} \ No newline at end of file diff --git a/OCH/common/data/build.gradle b/OCH/common/data/build.gradle index 91ba454fa1..c106019e8c 100644 --- a/OCH/common/data/build.gradle +++ b/OCH/common/data/build.gradle @@ -41,7 +41,9 @@ dependencies { if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { api rootProject.ext.dependencies.mogoutils + api rootProject.ext.dependencies.mogo_core_data }else { api project(":core:mogo-core-utils") + api project(':core:mogo-core-data') } } \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/order/BaseOrderBean.java b/OCH/common/data/src/main/java/com/mogo/och/data/taxi/BaseOrderBean.java similarity index 79% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/biz/order/BaseOrderBean.java rename to OCH/common/data/src/main/java/com/mogo/och/data/taxi/BaseOrderBean.java index 290760753e..a4fc4fb4bc 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/order/BaseOrderBean.java +++ b/OCH/common/data/src/main/java/com/mogo/och/data/taxi/BaseOrderBean.java @@ -1,4 +1,4 @@ -package com.mogo.och.common.module.biz.order; +package com.mogo.och.data.taxi; public class BaseOrderBean { public String orderNo;// 订单号 diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/bean/OrderQueryRouteInfoReqBean.java b/OCH/common/data/src/main/java/com/mogo/och/data/taxi/OrderQueryRouteInfoReqBean.java similarity index 91% rename from OCH/taxi/driver/src/main/java/com/mogo/och/taxi/bean/OrderQueryRouteInfoReqBean.java rename to OCH/common/data/src/main/java/com/mogo/och/data/taxi/OrderQueryRouteInfoReqBean.java index caa2be9c66..addb481941 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/bean/OrderQueryRouteInfoReqBean.java +++ b/OCH/common/data/src/main/java/com/mogo/och/data/taxi/OrderQueryRouteInfoReqBean.java @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.bean; +package com.mogo.och.data.taxi; /** * Created on 2021/9/7 diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/bean/OrderQueryRouteInfoRespBean.java b/OCH/common/data/src/main/java/com/mogo/och/data/taxi/OrderQueryRouteInfoRespBean.java similarity index 95% rename from OCH/taxi/driver/src/main/java/com/mogo/och/taxi/bean/OrderQueryRouteInfoRespBean.java rename to OCH/common/data/src/main/java/com/mogo/och/data/taxi/OrderQueryRouteInfoRespBean.java index 02cc314c59..069b67d969 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/bean/OrderQueryRouteInfoRespBean.java +++ b/OCH/common/data/src/main/java/com/mogo/och/data/taxi/OrderQueryRouteInfoRespBean.java @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.bean; +package com.mogo.och.data.taxi; import com.mogo.eagle.core.data.BaseData; diff --git a/OCH/common/data/src/main/java/com/mogo/och/data/taxi/QueryCarOrderByNoReqBean.kt b/OCH/common/data/src/main/java/com/mogo/och/data/taxi/QueryCarOrderByNoReqBean.kt new file mode 100644 index 0000000000..5467ec2706 --- /dev/null +++ b/OCH/common/data/src/main/java/com/mogo/och/data/taxi/QueryCarOrderByNoReqBean.kt @@ -0,0 +1,5 @@ +package com.mogo.och.data.taxi + +data class QueryCarOrderByNoReqBean( + var sn: String, var orderNo: String +) \ No newline at end of file diff --git a/OCH/common/data/src/main/java/com/mogo/och/data/taxi/QueryCarOrderByNoRespBean.kt b/OCH/common/data/src/main/java/com/mogo/och/data/taxi/QueryCarOrderByNoRespBean.kt new file mode 100644 index 0000000000..d57d09f3a0 --- /dev/null +++ b/OCH/common/data/src/main/java/com/mogo/och/data/taxi/QueryCarOrderByNoRespBean.kt @@ -0,0 +1,14 @@ +package com.mogo.och.data.taxi + +import com.mogo.eagle.core.data.BaseData + +data class QueryCarOrderByNoRespBean(var data: Result) : BaseData() { + data class Result( + var sn: String, + var bookingUserPhone: String, + var businessType: String, + var mileage: Float, + var duration: Float, + var passengerSize: Int + ):BaseOrderBean() +} 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 b7adcf2dbe..eb21df6157 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,7 +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 com.mogo.och.data.taxi.BaseOrderBean; import java.util.List; import java.util.Objects; diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java index 6061dfa8bb..4ced7e787a 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java @@ -3,7 +3,7 @@ package com.mogo.och.taxi.callback; import androidx.annotation.NonNull; import com.mogo.och.taxi.bean.OrderQueryRespBean; -import com.mogo.och.taxi.bean.OrderQueryRouteInfoRespBean; +import com.mogo.och.data.taxi.OrderQueryRouteInfoRespBean; import java.util.List; diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index 8294d44822..4a588a6c16 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -65,7 +65,7 @@ import com.mogo.och.taxi.bean.DriverServiceDataRespBean; import com.mogo.och.taxi.bean.OrderGrabRespBean; import com.mogo.och.taxi.bean.OrderGrabStatusQueryRespBean; import com.mogo.och.taxi.bean.OrderQueryRespBean; -import com.mogo.och.taxi.bean.OrderQueryRouteInfoRespBean; +import com.mogo.och.data.taxi.OrderQueryRouteInfoRespBean; import com.mogo.och.taxi.bean.OrderRouteUpdateReqBean; import com.mogo.och.taxi.bean.OrdersInServiceQueryRespBean; import com.mogo.och.taxi.bean.OrdersListQueryRespBean; diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/network/TaxiServiceApiNew.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/network/TaxiServiceApiNew.java index cbb3885cf6..d94db25dfe 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/network/TaxiServiceApiNew.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/network/TaxiServiceApiNew.java @@ -9,8 +9,8 @@ import com.mogo.och.taxi.bean.OrderGrabRespBean; import com.mogo.och.taxi.bean.OrderGrabStatusQueryRespBean; import com.mogo.och.taxi.bean.OrderQueryReqBean; import com.mogo.och.taxi.bean.OrderQueryRespBean; -import com.mogo.och.taxi.bean.OrderQueryRouteInfoReqBean; -import com.mogo.och.taxi.bean.OrderQueryRouteInfoRespBean; +import com.mogo.och.data.taxi.OrderQueryRouteInfoReqBean; +import com.mogo.och.data.taxi.OrderQueryRouteInfoRespBean; import com.mogo.och.taxi.bean.OrderRouteUpdateReqBean; import com.mogo.och.taxi.bean.OrderStatusUpdateReqBean; import com.mogo.och.taxi.bean.OrdersInServiceQueryRespBean; diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.kt b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.kt index 18208cc5bc..49524e0060 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.kt +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.kt @@ -9,6 +9,8 @@ import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.network.OchCommonSubscribeImpl import com.mogo.och.common.module.network.interceptor.transformTry +import com.mogo.och.data.taxi.OrderQueryRouteInfoReqBean +import com.mogo.och.data.taxi.OrderQueryRouteInfoRespBean import com.mogo.och.taxi.bean.* import io.reactivex.Observable 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 f935752c3a..7906624425 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 @@ -26,7 +26,7 @@ import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager; import com.mogo.och.common.module.manager.autopilot.line.LineManager; import com.mogo.och.common.module.voice.VoiceNotice; import com.mogo.och.taxi.bean.OrderQueryRespBean; -import com.mogo.och.taxi.bean.OrderQueryRouteInfoRespBean; +import com.mogo.och.data.taxi.OrderQueryRouteInfoRespBean; import com.mogo.och.taxi.callback.ITaxiADASStatusCallback; import com.mogo.och.taxi.callback.ITaxiControllerStatusCallback; import com.mogo.och.taxi.callback.ITaxiOrderStatusCallback; diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java index 956bd55af2..bb5184cdc8 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java @@ -43,7 +43,7 @@ import com.mogo.och.taxi.R; import com.mogo.och.taxi.constant.TaxiConst; import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum; import com.mogo.och.taxi.bean.OrderQueryRespBean; -import com.mogo.och.taxi.bean.OrderQueryRouteInfoRespBean; +import com.mogo.och.data.taxi.OrderQueryRouteInfoRespBean; import com.mogo.och.taxi.model.TaxiModel; import java.util.Calendar; @@ -430,6 +430,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment dis = NumberFormatUtil.formatLong( (double) distance/ 1000); } + dialog.setOrderMileage(distance); String strHtml2 = "全程 " + "" + dis + "" + " 公里" + "，总用时 " + "" + (int)Math.ceil( (double) duration/ 60) + "" + " 分钟"; diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java index 37c46179ab..b837a3510f 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java @@ -24,7 +24,7 @@ import com.mogo.och.common.module.biz.login.OpenOrderStatusEnum; import com.mogo.och.taxi.R; import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum; import com.mogo.och.taxi.bean.OrderQueryRespBean; -import com.mogo.och.taxi.bean.OrderQueryRouteInfoRespBean; +import com.mogo.och.data.taxi.OrderQueryRouteInfoRespBean; import com.mogo.och.taxi.model.TaxiModel; import com.mogo.och.taxi.presenter.TaxiPresenter; import com.mogo.och.taxi.utils.TPRouteDataTestUtils; diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java index 25e5d02ec1..c006376d84 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java @@ -23,12 +23,11 @@ import com.google.android.material.tabs.TabLayout; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.och.taxi.R; import com.mogo.och.taxi.bean.OrderQueryRespBean; -import com.mogo.och.taxi.bean.OrderQueryRouteInfoRespBean; +import com.mogo.och.data.taxi.OrderQueryRouteInfoRespBean; import java.util.ArrayList; import java.util.List; -import me.jessyan.autosize.AutoSize; import me.jessyan.autosize.utils.AutoSizeUtils; /** 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 7b37fd3173..4e1f5ce7b8 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.common.module.biz.order.BaseOrderBean; +import com.mogo.och.data.taxi.BaseOrderBean; import java.util.List; import java.util.Objects; diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/callback/IOCHTaxiPassengerOrderStatusCallback.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/callback/IOCHTaxiPassengerOrderStatusCallback.kt index 43f917bf55..88c075658d 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/callback/IOCHTaxiPassengerOrderStatusCallback.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/callback/IOCHTaxiPassengerOrderStatusCallback.kt @@ -16,4 +16,5 @@ interface IOCHTaxiPassengerOrderStatusCallback { fun onDriverHasCheckedPilotCondition(isBoarded: Boolean){} fun onMessageGo2OverMapview(){} + fun onCurrentOrderDistAndduration(distanceToEnd: Long, durationToEnd: Long) } \ No newline at end of file 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 4c8e965572..7c7022e5f0 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 @@ -37,6 +37,7 @@ 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.common.module.biz.order.OrderModel +import com.mogo.och.data.taxi.OrderQueryRouteInfoRespBean import com.mogo.och.taxi.passenger.utils.TaxiPassengerAnalyticsManager import java.util.concurrent.ConcurrentHashMap @@ -375,4 +376,23 @@ object TaxiPassengerModel { TrajectoryAndDistanceManager.setStationPoint(null, null, -1L) } + fun queryOrderRouteInfo() { + if (currentOCHOrder == null) return + TaxiPassengerServiceManager.queryOrderRouteInfo( + currentOCHOrder!!.orderNo, + object : OchCommonServiceCallback { + override fun onSuccess(data: OrderQueryRouteInfoRespBean) { + if (data.data != null && currentOCHOrder != null ) { + for (callback in mOrderStatusCallbackMap.values) { + callback.onCurrentOrderDistAndduration(data.data.distanceToEnd,data.data.durationToEnd) + } + } + } + + override fun onFail(code: Int, msg: String) {} + } + + ) + } + } \ No newline at end of file diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt index e5953babe4..1c9fdbdf4b 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt @@ -2,6 +2,8 @@ package com.mogo.och.taxi.passenger.network import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.storage.SharedPrefsMgr +import com.mogo.och.data.taxi.OrderQueryRouteInfoReqBean +import com.mogo.och.data.taxi.OrderQueryRouteInfoRespBean import com.mogo.och.taxi.passenger.bean.TaxiPassengerBaseRespBean import com.mogo.och.taxi.passenger.bean.TaxiPassengerCheckPhoneUpdateOrderReqBean import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryReqBean @@ -90,4 +92,18 @@ internal interface TaxiPassengerServiceApi { @Header("ticket") ticket: String= SharedPrefsMgr.getInstance().token, @Body data: TaxiPassengerStartReqBean ): Observable + + /** + * 查询订单路径规划信息（到上车点、起始点间的距离和预估时间） + * @param data + * @return + */ + @Headers("Content-type:application/json;charset=UTF-8") // @POST( "/autopilot-car-hailing/api/v1/driver/routeInfo/query" ) + @POST("/autopilot-car-hailing/order/v2/driver/taxi/routeInfo/query") + fun queryOrderRouteInfo( + @Header("appId") appId: String?, + @Header("ticket") ticket: String?, + @Body data: OrderQueryRouteInfoReqBean? + ): Observable + } \ No newline at end of file diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt index c9a850c025..6e95ef73de 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt @@ -1,8 +1,10 @@ package com.mogo.och.taxi.passenger.network import android.content.Context +import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean import com.mogo.commons.AbsMogoApplication +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager import com.mogo.och.taxi.passenger.bean.TaxiPassengerBaseRespBean import com.mogo.och.taxi.passenger.bean.TaxiPassengerCheckPhoneUpdateOrderReqBean @@ -14,6 +16,8 @@ import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.network.OchCommonSubscribeImpl import com.mogo.och.common.module.network.interceptor.transformTry +import com.mogo.och.data.taxi.OrderQueryRouteInfoReqBean +import com.mogo.och.data.taxi.OrderQueryRouteInfoRespBean import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryReqBean import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRespBean @@ -124,5 +128,27 @@ object TaxiPassengerServiceManager { .subscribe(OchCommonSubscribeImpl(context, callback, "queryOrderById")) } + /** + * 查询订单路径规划信息（到上车点、起始点间的距离和预估时间） + * @param context + * @param orderNo + * @param callback + */ + @JvmStatic + fun queryOrderRouteInfo(orderNo: String?, + callback: OchCommonServiceCallback? + ) { + mOCHTaxiServiceApi.queryOrderRouteInfo( + MoGoAiCloudClientConfig.getInstance().serviceAppId, + SharedPrefsMgr.getInstance().token, + OrderQueryRouteInfoReqBean( + SharedPrefsMgr.getInstance().sn, orderNo + ) + ) + .transformTry() + .subscribe(OchCommonSubscribeImpl(context, callback, "queryOrderRouteInfo")) + } + + } \ No newline at end of file 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 81af4c7ead..c970cd46f4 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,7 +14,7 @@ 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.common.module.biz.order.BaseOrderBean +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 @@ -96,6 +96,7 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) : TaxiOrderStatusEnum.ArriveAtEnd -> { // 50 到达终点 乘客可以评价 mView?.showOrHideArrivedEndLayout(true) + getOrderRouteInfo() overMapViewClear() } TaxiOrderStatusEnum.JourneyCompleted -> { @@ -115,6 +116,10 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) : } } + private fun getOrderRouteInfo() { + TaxiPassengerModel.queryOrderRouteInfo() + } + private fun overMapViewShow(){ CallerFuncBizManager.bizProvider.getAllV2XEvents() } @@ -149,6 +154,10 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) : mView?.showOverMapView() } + override fun onCurrentOrderDistAndduration(distanceToEnd: Long, durationToEnd: Long) { + mView?.showDuringAndDistance(distanceToEnd,durationToEnd) + } + companion object { private val TAG = BaseTaxiPassengerPresenter::class.java.simpleName } diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt index 22042eb93d..929ba4ecc6 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt @@ -476,6 +476,10 @@ class TaxiPassengerBaseFragment() : evaluate.visibility = View.VISIBLE } + fun showDuringAndDistance(distanceToEnd: Long, durationToEnd: Long) { + arrivedView.dialog.setOrderMileage(distanceToEnd.toFloat()) + } + companion object { @JvmField 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 728a1fbb0d..0185ce5052 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,7 +2,7 @@ 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.common.module.biz.order.BaseOrderBean +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 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 13f8def085..8fdaa1aa27 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,7 +9,7 @@ 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.common.module.biz.order.BaseOrderBean +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 kotlin.math.ceil 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 de0545c180..f483176e79 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,7 +7,7 @@ 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.common.module.biz.order.BaseOrderBean +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.biz.order.TaxiOrderStatusEnum 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 1fc13354a3..71d49da0cd 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,7 +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.data.taxi.BaseOrderBean import com.mogo.och.unmanned.taxi.constant.TaskStatusEnum import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum @@ -230,21 +230,6 @@ data class OrderCompletedReqBean( var sn: String, var orderNo: String ) -data class QueryCarOrderByNoReqBean( - var sn: String, var orderNo: String -) - -data class QueryCarOrderByNoRespBean(var data: Result) : BaseData() { - data class Result( - var sn: String, - 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/network/TaxiTaskWithOrderServiceApi.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/network/TaxiTaskWithOrderServiceApi.kt index 41b0622477..5324ae986e 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/network/TaxiTaskWithOrderServiceApi.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/network/TaxiTaskWithOrderServiceApi.kt @@ -3,6 +3,8 @@ package com.mogo.och.unmanned.taxi.network import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.BaseData +import com.mogo.och.data.taxi.QueryCarOrderByNoReqBean +import com.mogo.och.data.taxi.QueryCarOrderByNoRespBean import com.mogo.och.unmanned.taxi.bean.ArriveSiteReqBean import com.mogo.och.unmanned.taxi.bean.CancelOrderReqBean import com.mogo.och.unmanned.taxi.bean.TrajectoryListRespBean @@ -10,8 +12,6 @@ import com.mogo.och.unmanned.taxi.bean.JumpPassengerCheckReqBean import com.mogo.och.unmanned.taxi.bean.OrderCompletedReqBean import com.mogo.och.unmanned.taxi.bean.PrepareTaskReqBean import com.mogo.och.unmanned.taxi.bean.PrepareTaskRespBean -import com.mogo.och.unmanned.taxi.bean.QueryCarOrderByNoReqBean -import com.mogo.och.unmanned.taxi.bean.QueryCarOrderByNoRespBean import com.mogo.och.unmanned.taxi.bean.QueryCurrentTaskRespBean import com.mogo.och.unmanned.taxi.bean.StartServiceReqBean import com.mogo.och.unmanned.taxi.bean.StartServiceRespBean diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/network/TaxiTaskWithOrderServiceManager.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/network/TaxiTaskWithOrderServiceManager.kt index 99cc3a930e..cd79b5555a 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/network/TaxiTaskWithOrderServiceManager.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/network/TaxiTaskWithOrderServiceManager.kt @@ -8,14 +8,14 @@ import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.network.OchCommonSubscribeImpl import com.mogo.och.common.module.network.interceptor.transformTry +import com.mogo.och.data.taxi.QueryCarOrderByNoReqBean +import com.mogo.och.data.taxi.QueryCarOrderByNoRespBean import com.mogo.och.unmanned.taxi.bean.ArriveSiteReqBean import com.mogo.och.unmanned.taxi.bean.CancelOrderReqBean import com.mogo.och.unmanned.taxi.bean.JumpPassengerCheckReqBean import com.mogo.och.unmanned.taxi.bean.OrderCompletedReqBean import com.mogo.och.unmanned.taxi.bean.PrepareTaskReqBean import com.mogo.och.unmanned.taxi.bean.PrepareTaskRespBean -import com.mogo.och.unmanned.taxi.bean.QueryCarOrderByNoReqBean -import com.mogo.och.unmanned.taxi.bean.QueryCarOrderByNoRespBean import com.mogo.och.unmanned.taxi.bean.QueryCurrentTaskRespBean import com.mogo.och.unmanned.taxi.bean.StartServiceReqBean import com.mogo.och.unmanned.taxi.bean.StartServiceRespBean diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskFragment.kt index 7066e489f3..d029f20170 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskFragment.kt @@ -185,6 +185,7 @@ class TaxiCurrentTaskFragment : BaseFragment(), } is TaskWithOrderUIState.UpdateOrderTripInfo -> { + dialog?.setOrderMileage(taskAndOrderUiState.mileage) taskOtherInfo.text = TaskUtils.getCurrentTaskTotalAndDurationHtml( taskAndOrderUiState.mileage, 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 4d05d6cc39..22a50fa6e1 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 @@ -71,6 +71,7 @@ import com.mogo.och.unmanned.taxi.callback.ITaxiTaskWithOrderCallback import com.mogo.och.unmanned.taxi.constant.TaskStatusEnum import com.mogo.och.unmanned.taxi.constant.TaskTypeEnum import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum +import com.mogo.och.data.taxi.QueryCarOrderByNoRespBean import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst.Companion.BUSINESSTYPE import com.mogo.och.unmanned.taxi.network.TaxiTaskWithOrderServiceManager 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 7ea36e4a06..d81fca4e8c 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.common.module.biz.order.BaseOrderBean; +import com.mogo.och.data.taxi.BaseOrderBean; import java.util.List; import java.util.Objects; diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/callback/IOCHTaxiPassengerOrderStatusCallback.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/callback/IOCHTaxiPassengerOrderStatusCallback.kt index 6821f3cf27..69ff5adf11 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/callback/IOCHTaxiPassengerOrderStatusCallback.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/callback/IOCHTaxiPassengerOrderStatusCallback.kt @@ -11,4 +11,5 @@ interface IOCHTaxiPassengerOrderStatusCallback { fun onCurrentOrderDistToEndChanged(meters: Long, timeInSecond: Long,stationDistance:Int){} fun onMessageGo2OverMapview(){} + fun onCurrentOrderDistAndduration(mileage: Float, duration: Float) } \ No newline at end of file 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 576020bc68..3568442e85 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 @@ -32,6 +32,7 @@ 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.common.module.biz.order.OrderModel +import com.mogo.och.data.taxi.QueryCarOrderByNoRespBean import com.mogo.och.unmanned.passenger.bean.TaxiPassengerBaseRespBean import com.mogo.och.unmanned.passenger.bean.TaxiPassengerGetTrajectoryByLineIdRespBean import com.mogo.och.unmanned.passenger.bean.TaxiPassengerOrderQueryRespBean @@ -426,6 +427,7 @@ object TaxiPassengerModel { TaxiOrderStatusEnum.ArriveAtEnd -> { AutopilotManager.clearAutopilotControlParameters() + queryOrderRouteInfo() //startOrStopQueryOrderRemaining(false) CallerOrderListenerManager.invokeOrderStatus(false) clearStation() @@ -451,6 +453,25 @@ object TaxiPassengerModel { } } + fun queryOrderRouteInfo() { + if (currentOCHOrder == null) return + TaxiPassengerServiceManager.queryOrderRouteInfo( + 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) + } + } + } + + override fun onFail(code: Int, msg: String) {} + } + + ) + } + private fun setStation() { if (currentOCHOrder != null && currentLineId != null) { val startStation = MogoLocation() diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/network/TaxiPassengerServiceApi.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/network/TaxiPassengerServiceApi.kt index 4fc66c9f4a..edee8fb524 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/network/TaxiPassengerServiceApi.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/network/TaxiPassengerServiceApi.kt @@ -2,6 +2,8 @@ package com.mogo.och.unmanned.passenger.network import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.storage.SharedPrefsMgr +import com.mogo.och.data.taxi.QueryCarOrderByNoReqBean +import com.mogo.och.data.taxi.QueryCarOrderByNoRespBean import com.mogo.och.unmanned.passenger.bean.TaxiPassengerBaseRespBean import com.mogo.och.unmanned.passenger.bean.TaxiPassengerCheckPhoneUpdateOrderReqBean import com.mogo.och.unmanned.passenger.bean.TaxiPassengerGetTrajectoryByLineIdRespBean @@ -88,4 +90,12 @@ internal interface TaxiPassengerServiceApi { @Header("ticket") ticket: String= SharedPrefsMgr.getInstance().token, @Body data: TaxiPassengerStartReqBean ): Observable + + @Headers("Content-type:application/json;charset=UTF-8") + @POST("/och-taxi-cabin/api/business/v1/queryCarOrder") + fun queryOrderRouteInfo( + @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, + @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, + @Body data: QueryCarOrderByNoReqBean? + ): Observable } \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/network/TaxiPassengerServiceManager.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/network/TaxiPassengerServiceManager.kt index 2139fe50c0..31174aae06 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/network/TaxiPassengerServiceManager.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/network/TaxiPassengerServiceManager.kt @@ -2,6 +2,7 @@ package com.mogo.och.unmanned.passenger.network import android.content.Context import com.mogo.commons.AbsMogoApplication +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager import com.mogo.eagle.core.network.MoGoRetrofitFactory import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger @@ -10,6 +11,8 @@ import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.network.OchCommonSubscribeImpl import com.mogo.och.common.module.network.interceptor.transformTry +import com.mogo.och.data.taxi.QueryCarOrderByNoReqBean +import com.mogo.och.data.taxi.QueryCarOrderByNoRespBean import com.mogo.och.unmanned.passenger.bean.TaxiPassengerBaseRespBean import com.mogo.och.unmanned.passenger.bean.TaxiPassengerCheckPhoneUpdateOrderReqBean import com.mogo.och.unmanned.passenger.bean.TaxiPassengerGetTrajectoryByLineIdRespBean @@ -152,6 +155,22 @@ object TaxiPassengerServiceManager { .transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryOrderById")) } + /** + * 根据订单号查询订单, 主要是拿完成或者被乘客取消的订单状态 + */ + @JvmStatic + fun queryOrderRouteInfo( + orderNo: String, + callback: OchCommonServiceCallback? + ) { + if (beforeNet()) { + return + } + mOCHTaxiServiceApi.queryOrderRouteInfo( + data = QueryCarOrderByNoReqBean(SharedPrefsMgr.getInstance().sn, orderNo) + ).transformTry() + .subscribe(OchCommonSubscribeImpl(context, callback, "queryCarOrderByOrderNo")) + } } \ No newline at end of file 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 417901e19d..8786d5c6dc 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,7 +10,7 @@ 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.common.module.biz.order.BaseOrderBean +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.unmanned.passenger.callback.IOCHTaxiPassengerOrderStatusCallback @@ -145,6 +145,10 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) : mView?.showOverMapView() } + override fun onCurrentOrderDistAndduration(mileage: Float, duration: Float) { + mView?.showDuringAndDistance(mileage,duration) + } + companion object { private val TAG = BaseTaxiPassengerPresenter::class.java.simpleName } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt index 2780a758a7..76ee3dc6d0 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt @@ -496,6 +496,10 @@ class TaxiPassengerBaseFragment() : arrivedView.preLoadImages() } + fun showDuringAndDistance(mileage: Float, duration: Float) { + arrivedView.dialog.setOrderMileage(mileage) + } + companion object { @JvmField 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 c07e3d9dba..2b82b384cf 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,7 +2,7 @@ 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.common.module.biz.order.BaseOrderBean +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 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 cd4f7e4579..5b954c0329 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,7 +7,7 @@ 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.common.module.biz.order.BaseOrderBean +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.unmanned.passenger.callback.IOCHTaxiPassengerOrderStatusCallback diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt index 1e3dec751f..5c7be959ca 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt @@ -30,7 +30,7 @@ import com.mogo.eagle.core.utilcode.util.ThreadUtils * 自动探查 * 鹰眼6.5.0需求 */ -class AutomaticExplorationView @JvmOverloads constructor( +open class AutomaticExplorationView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ItinerarySummaryDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ItinerarySummaryDialog.kt index c6f0ea18a1..5385e767b2 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ItinerarySummaryDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ItinerarySummaryDialog.kt @@ -15,7 +15,7 @@ import java.util.Random * 行程总结View * 鹰眼6.5.0需求 */ -class ItinerarySummaryDialog(context: Context, isDriver: Boolean, theme: Int) : +open class ItinerarySummaryDialog(context: Context, isDriver: Boolean, theme: Int) : Dialog(context, theme) { private val mContext: Context @@ -108,4 +108,8 @@ class ItinerarySummaryDialog(context: Context, isDriver: Boolean, theme: Int) : } + fun setOrderMileage(mileage: Float) { + TODO("Not yet implemented") + } + } \ No newline at end of file