[6.5.0]

[fea]
[taxi 订单状态枚举统一]

OCH/common/common/src/main/java/com/mogo/och/common/module/biz/order/TaxiOrderStatusEnum.kt

@@ -1,4 +1,4 @@
-package com.mogo.och.taxi.constant
+package com.mogo.och.common.module.biz.order
 
 /**
  * Created on 2021/12/7

OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java

@@ -79,7 +79,7 @@ import com.mogo.och.taxi.callback.ITaxiCarOperationalCallback;
 import com.mogo.och.taxi.callback.ITaxiControllerStatusCallback;
 import com.mogo.och.taxi.callback.ITaxiOrderStatusCallback;
 import com.mogo.och.taxi.constant.TaxiConst;
-import com.mogo.och.taxi.constant.TaxiOrderStatusEnum;
+import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum;
 import com.mogo.och.taxi.constant.TaxiOrderTypeEnum;
 import com.mogo.och.taxi.network.TaxiServiceManager;
 import com.mogo.och.taxi.utils.OrderUtil;

OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java

@@ -30,7 +30,7 @@ import com.mogo.och.taxi.callback.ITaxiADASStatusCallback;
 import com.mogo.och.taxi.callback.ITaxiControllerStatusCallback;
 import com.mogo.och.taxi.callback.ITaxiOrderStatusCallback;
 import com.mogo.och.taxi.constant.TaxiConst;
-import com.mogo.och.taxi.constant.TaxiOrderStatusEnum;
+import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum;
 import com.mogo.och.taxi.model.TaxiModel;
 import com.mogo.och.taxi.ui.TaxiFragment;
 

OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java

@@ -41,7 +41,7 @@ import com.mogo.och.common.module.voice.VoiceNotice;
 import com.mogo.och.common.module.wigets.OCHCommitDialog;
 import com.mogo.och.taxi.R;
 import com.mogo.och.taxi.constant.TaxiConst;
-import com.mogo.och.taxi.constant.TaxiOrderStatusEnum;
+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.taxi.model.TaxiModel;

OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java

@@ -15,7 +15,6 @@ import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.fragment.app.FragmentTransaction;
 
-import com.mogo.commons.AbsMogoApplication;
 import com.mogo.eagle.core.data.temp.EventLogout;
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
@@ -23,7 +22,7 @@ import com.mogo.map.overlay.IMoGoOverlayManager;
 import com.mogo.och.common.module.biz.login.LoginStatusManager;
 import com.mogo.och.common.module.biz.login.OpenOrderStatusEnum;
 import com.mogo.och.taxi.R;
-import com.mogo.och.taxi.constant.TaxiOrderStatusEnum;
+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.taxi.model.TaxiModel;

OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java

@@ -25,7 +25,7 @@ import androidx.annotation.RequiresApi;
 
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
-import com.mogo.och.taxi.constant.TaxiOrderStatusEnum;
+import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum;
 import com.mogo.och.taxi.R;
 import com.mogo.och.taxi.constant.TaxiOrderCancelReasons;
 

OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java

@@ -35,7 +35,7 @@ import com.google.android.material.tabs.TabLayout;
 import com.mogo.commons.mvp.MvpDialogFragment;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.och.common.module.utils.DateTimeUtil;
-import com.mogo.och.taxi.constant.TaxiOrderStatusEnum;
+import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum;
 import com.mogo.och.taxi.R;
 import com.mogo.och.taxi.bean.OrderQueryRespBean;
 import com.mogo.och.taxi.constant.TaxiOrderTypeEnum;

OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java

@@ -9,7 +9,7 @@ import com.mogo.eagle.core.utilcode.util.GsonUtils;
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager;
 import com.mogo.och.taxi.bean.OrderQueryRespBean;
 import com.mogo.och.taxi.constant.TaxiConst;
-import com.mogo.och.taxi.constant.TaxiOrderStatusEnum;
+import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum;
 import com.mogo.och.taxi.model.TaxiModel;
 
 import java.util.concurrent.TimeUnit;

OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt

@@ -23,10 +23,9 @@ import com.mogo.och.common.module.utils.PinYinUtil
 import com.mogo.och.common.module.voice.VoiceNotice
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerBaseRespBean
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerStartReqBean
-import com.mogo.och.taxi.passenger.ui.model.order.TaxiPassengerOrderStatusEnum
+import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum
 import com.mogo.och.taxi.passenger.network.TaxiPassengerServiceManager
 import com.mogo.och.taxi.passenger.utils.TaxiPassengerAnalyticsManager
-import java.lang.StringBuilder
 
 object AutopilotManager : IOchAutopilotStatusListener {
 
@@ -53,7 +52,7 @@ object AutopilotManager : IOchAutopilotStatusListener {
             ToastUtils.showShort("当前订单不存在或异常！")
             return "当前订单不存在或异常！"
         }
-        if (TaxiPassengerModel.currentOCHOrder!!.orderStatus == TaxiPassengerOrderStatusEnum.UserArriveAtStart.code) {
+        if (TaxiPassengerModel.currentOCHOrder!!.orderStatus == TaxiOrderStatusEnum.UserArriveAtStart.code) {
             startServicePilotDone()
         }
         //1、判断轨迹Id是否可用
@@ -205,7 +204,7 @@ object AutopilotManager : IOchAutopilotStatusListener {
         // 启动自驾成功
         when (state) {
             IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> {
-                if (TaxiPassengerModel.currentOCHOrder != null && TaxiPassengerModel.curOrderStatus === TaxiPassengerOrderStatusEnum.UserArriveAtStart) {
+                if (TaxiPassengerModel.currentOCHOrder != null && TaxiPassengerModel.curOrderStatus === TaxiOrderStatusEnum.UserArriveAtStart) {
                     TaxiPassengerAnalyticsManager.triggerStartAutopilotEvent(
                         false,
                         true,

OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt

@@ -33,8 +33,8 @@ import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRespBean
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean
 import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerOrderStatusCallback
 import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst
-import com.mogo.och.taxi.passenger.ui.model.order.TaxiPassengerOrderStatusEnum
-import com.mogo.och.taxi.passenger.ui.model.order.TaxiPassengerOrderStatusEnum.Companion.valueOf
+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.taxi.passenger.utils.TaxiPassengerAnalyticsManager
@@ -179,7 +179,7 @@ object TaxiPassengerModel {
                 object : OchCommonServiceCallback<TaxiPassengerOrderQueryRespBean> {
                     override fun onSuccess(data: TaxiPassengerOrderQueryRespBean) {
                         if (data.data != null && currentOCHOrder != null && currentOCHOrder!!.orderNo == data.data.orderNo) {
-                            if (data.data.orderStatus == TaxiPassengerOrderStatusEnum.Cancel.code || data.data.orderStatus == TaxiPassengerOrderStatusEnum.JourneyCompleted.code || data.data.orderStatus == TaxiPassengerOrderStatusEnum.None.code) {
+                            if (data.data.orderStatus == TaxiOrderStatusEnum.Cancel.code || data.data.orderStatus == TaxiOrderStatusEnum.JourneyCompleted.code || data.data.orderStatus == TaxiOrderStatusEnum.None.code) {
                                 currentOCHOrder = data.data
                                 orderStatusChange()
                                 currentOCHOrder = null
@@ -196,11 +196,11 @@ object TaxiPassengerModel {
     }
 
     // 获取当前订单状态
-    val curOrderStatus: TaxiPassengerOrderStatusEnum
+    val curOrderStatus: TaxiOrderStatusEnum
         get() {
             val order: TaxiPassengerOrderQueryRespBean.Result =
                 currentOCHOrder
-                    ?: return TaxiPassengerOrderStatusEnum.None
+                    ?: return TaxiOrderStatusEnum.None
             return valueOf(order.orderStatus)
         }
 
@@ -258,7 +258,7 @@ object TaxiPassengerModel {
             phoneTail, object : OchCommonServiceCallback<TaxiPassengerBaseRespBean> {
                 override fun onSuccess(data: TaxiPassengerBaseRespBean) {
                     if (data.code == 0 && currentOCHOrder != null) {
-                        currentOCHOrder!!.orderStatus = TaxiPassengerOrderStatusEnum.UserArriveAtStart.code
+                        currentOCHOrder!!.orderStatus = TaxiOrderStatusEnum.UserArriveAtStart.code
                         //乘客验证成功，更新订单状态为 "乘客已上车", 立马弹出乘客开始行程页面，不再等待轮询
                         orderStatusChange()
                         VoiceNotice.showNotice("验证成功！关闭车门并佩戴安全带后开启行程吧！", AIAssist.LEVEL2)
@@ -283,15 +283,15 @@ object TaxiPassengerModel {
 
     private fun orderStatusChangeInner() {
         when (curOrderStatus) {
-            TaxiPassengerOrderStatusEnum.OnTheWayToStart -> {
+            TaxiOrderStatusEnum.OnTheWayToStart -> {
             }
-            TaxiPassengerOrderStatusEnum.ArriveAtStart -> {
+            TaxiOrderStatusEnum.ArriveAtStart -> {
             }
-            TaxiPassengerOrderStatusEnum.UserArriveAtStart -> {
+            TaxiOrderStatusEnum.UserArriveAtStart -> {
                 //开启轮询司机是否已准备好开启自动驾驶的环境
                 setStation()
             }
-            TaxiPassengerOrderStatusEnum.OnTheWayToEnd -> {
+            TaxiOrderStatusEnum.OnTheWayToEnd -> {
                 CallerFuncBizManager.bizProvider.queryV2XEvents() //全览模式的V2X事件轮询开始
                 //startOrStopQueryOrderRemaining(true)
                 AutopilotManager.updateAutopilotControlParameters()
@@ -299,24 +299,24 @@ object TaxiPassengerModel {
                 setStation()
                 CallerOrderListenerManager.invokeOrderStatus(true)
             }
-            TaxiPassengerOrderStatusEnum.ArriveAtEnd -> {
+            TaxiOrderStatusEnum.ArriveAtEnd -> {
                 AutopilotManager.clearAutopilotControlParameters()
                 //startOrStopQueryOrderRemaining(false)
                 CallerOrderListenerManager.invokeOrderStatus(false)
                 cleanStation()
             }
-            TaxiPassengerOrderStatusEnum.JourneyCompleted -> {
+            TaxiOrderStatusEnum.JourneyCompleted -> {
                 AutopilotManager.clearAutopilotControlParameters()
                 //startOrStopQueryOrderRemaining(false)
                 cleanStation()
             }
-            TaxiPassengerOrderStatusEnum.Cancel -> {
+            TaxiOrderStatusEnum.Cancel -> {
                 AutopilotManager.clearAutopilotControlParameters()
                 //startOrStopQueryOrderRemaining(false)
                 startOrStopReadyToAutopilotLoop(false)
                 cleanStation()
             }
-            TaxiPassengerOrderStatusEnum.None -> TODO()
+            TaxiOrderStatusEnum.None -> TODO()
         }
     }
 

OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/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.taxi.passenger.bean.TaxiPassengerOrderQueryRespBean
 import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerOrderStatusCallback
-import com.mogo.och.taxi.passenger.ui.model.order.TaxiPassengerOrderStatusEnum
+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
@@ -65,7 +65,7 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) :
         order?.let {
             setItineraryVisibility()
             when (TaxiPassengerModel.curOrderStatus) {
-                TaxiPassengerOrderStatusEnum.OnTheWayToStart -> {
+                TaxiOrderStatusEnum.OnTheWayToStart -> {
                     // 10 接驾中
                     mView?.showOrHideCheckAndStartAutopilotView(3)
 
@@ -73,19 +73,19 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) :
                     overMapViewClear()
                 }
 
-                TaxiPassengerOrderStatusEnum.ArriveAtStart -> {
+                TaxiOrderStatusEnum.ArriveAtStart -> {
                     // 20 司机到达上车点
                     mView?.showOrHideCheckAndStartAutopilotView(0)
                     overMapViewClear()
                 }
 
-                TaxiPassengerOrderStatusEnum.UserArriveAtStart -> {
+                TaxiOrderStatusEnum.UserArriveAtStart -> {
                     // 30  乘客到达上车点
                     mView?.showOrHideCheckAndStartAutopilotView(1)
                     overMapViewClear()
                 }
 
-                TaxiPassengerOrderStatusEnum.OnTheWayToEnd -> {
+                TaxiOrderStatusEnum.OnTheWayToEnd -> {
                     // 服务中（去往目的地）
                     mView?.showOrHideArrivedEndLayout(isShow = false)
                     mView?.showOrHideCheckAndStartAutopilotView(2)
@@ -93,18 +93,18 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) :
                     overMapViewShow()
                 }
 
-                TaxiPassengerOrderStatusEnum.ArriveAtEnd -> {
+                TaxiOrderStatusEnum.ArriveAtEnd -> {
                     // 50 到达终点 乘客可以评价
                     mView?.showOrHideArrivedEndLayout(true)
                     overMapViewClear()
                 }
-                TaxiPassengerOrderStatusEnum.JourneyCompleted -> {
+                TaxiOrderStatusEnum.JourneyCompleted -> {
                     // 60 行程完成
                     mView?.showOrHideCheckAndStartAutopilotView(3)
                     mView?.showOrHideArrivedEndLayout(false)
                     overMapViewClear()
                 }
-                TaxiPassengerOrderStatusEnum.Cancel -> {
+                TaxiOrderStatusEnum.Cancel -> {
                     // 70 取消订单
                     mView?.showOrHideCheckAndStartAutopilotView(3)
                     mView?.showOrHideArrivedEndLayout(isShow = false)
@@ -133,14 +133,14 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) :
     fun setItineraryVisibility() {
         UiThreadHandler.post {
             when (TaxiPassengerModel.curOrderStatus) {
-                TaxiPassengerOrderStatusEnum.None,
-                TaxiPassengerOrderStatusEnum.OnTheWayToStart,
-                TaxiPassengerOrderStatusEnum.ArriveAtStart,
-                TaxiPassengerOrderStatusEnum.JourneyCompleted,
-                TaxiPassengerOrderStatusEnum.ArriveAtEnd,
-                TaxiPassengerOrderStatusEnum.Cancel -> mView?.showOrHideServingOrderFragment(false)
-                TaxiPassengerOrderStatusEnum.UserArriveAtStart,
-                TaxiPassengerOrderStatusEnum.OnTheWayToEnd -> mView?.showOrHideServingOrderFragment(true)
+                TaxiOrderStatusEnum.None,
+                TaxiOrderStatusEnum.OnTheWayToStart,
+                TaxiOrderStatusEnum.ArriveAtStart,
+                TaxiOrderStatusEnum.JourneyCompleted,
+                TaxiOrderStatusEnum.ArriveAtEnd,
+                TaxiOrderStatusEnum.Cancel -> mView?.showOrHideServingOrderFragment(false)
+                TaxiOrderStatusEnum.UserArriveAtStart,
+                TaxiOrderStatusEnum.OnTheWayToEnd -> mView?.showOrHideServingOrderFragment(true)
             }
         }
     }

OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotViewModel.kt

@@ -1,7 +1,7 @@
 package com.mogo.och.taxi.passenger.ui.checkstartautopilot
 
 import androidx.lifecycle.ViewModel
-import com.mogo.och.taxi.passenger.ui.model.order.TaxiPassengerOrderStatusEnum
+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
@@ -33,10 +33,10 @@ class ChekAndStartAutopilotViewModel : ViewModel(), OrderListener {
 
     override fun onCurrentOrderStatusChanged(order: BaseOrderBean?) {
         when (order?.orderStatus) {
-            TaxiPassengerOrderStatusEnum.ArriveAtStart.code -> {
+            TaxiOrderStatusEnum.ArriveAtStart.code -> {
                 // 显示手机号验证
             }
-            TaxiPassengerOrderStatusEnum.UserArriveAtStart.code -> {
+            TaxiOrderStatusEnum.UserArriveAtStart.code -> {
                 // 显示启动自驾
             }
             else -> {

OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/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.taxi.passenger.R
 import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerOrderStatusCallback
-import com.mogo.och.taxi.passenger.ui.model.order.TaxiPassengerOrderStatusEnum
+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
@@ -78,7 +78,7 @@ class OrderInfoViewModel: ViewModel(), IOCHTaxiPassengerOrderStatusCallback, Ord
             }
         }
         when (TaxiPassengerModel.curOrderStatus) {
-            TaxiPassengerOrderStatusEnum.OnTheWayToEnd -> {
+            TaxiOrderStatusEnum.OnTheWayToEnd -> {
 
             }
             else ->{

OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/model/music/MusicModel.kt

@@ -2,7 +2,6 @@ package com.mogo.och.taxi.passenger.ui.model.music
 
 import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.utilcode.util.TAG
 import com.mogo.och.common.module.manager.audition.AuditionManager
 import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener
@@ -11,7 +10,7 @@ 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.taxi.passenger.ui.model.order.TaxiPassengerOrderStatusEnum
+import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum
 import io.reactivex.disposables.Disposable
 
 object MusicModel : OrderListener, IOchAutopilotStatusListener {
@@ -29,26 +28,26 @@ object MusicModel : OrderListener, IOchAutopilotStatusListener {
     override fun onCurrentOrderStatusChanged(order: BaseOrderBean?) {
         this.orderInfo = order
         order?.orderStatus?.let {
-            when (TaxiPassengerOrderStatusEnum.valueOf(it)) {
-                TaxiPassengerOrderStatusEnum.None -> {
+            when (TaxiOrderStatusEnum.valueOf(it)) {
+                TaxiOrderStatusEnum.None -> {
                     cancelStopMusicDisposable()
                 }
-                TaxiPassengerOrderStatusEnum.OnTheWayToStart -> {
+                TaxiOrderStatusEnum.OnTheWayToStart -> {
                     cancelStopMusicDisposable()
                 }
-                TaxiPassengerOrderStatusEnum.ArriveAtStart -> {
+                TaxiOrderStatusEnum.ArriveAtStart -> {
                     cancelStopMusicDisposable()
                 }
-                TaxiPassengerOrderStatusEnum.UserArriveAtStart -> {}
-                TaxiPassengerOrderStatusEnum.OnTheWayToEnd -> {}
-                TaxiPassengerOrderStatusEnum.ArriveAtEnd -> {}
-                TaxiPassengerOrderStatusEnum.JourneyCompleted -> {
+                TaxiOrderStatusEnum.UserArriveAtStart -> {}
+                TaxiOrderStatusEnum.OnTheWayToEnd -> {}
+                TaxiOrderStatusEnum.ArriveAtEnd -> {}
+                TaxiOrderStatusEnum.JourneyCompleted -> {
                     cancelStopMusicDisposable()
                     stopMusicDisposable = RxUtils.createSubscribe(60_000) {
                         AuditionManager.stop()
                     }
                 }
-                TaxiPassengerOrderStatusEnum.Cancel -> {
+                TaxiOrderStatusEnum.Cancel -> {
                     cancelStopMusicDisposable()
                     stopMusicDisposable = RxUtils.createSubscribe(60_000) {
                         AuditionManager.stop()

OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/model/order/TaxiPassengerOrderStatusEnum.kt

@@ -1,47 +0,0 @@
-package com.mogo.och.taxi.passenger.ui.model.order
-
-/**
- * Created on 2021/12/7
- *
- * * Old code：START
- * 未派单	                0
- * 去往上车站点	1
- * 车辆已到达上车站点	2
- * 乘客已到达上车站点 3
- * 去往下车站点	4
- * 到达下车站点	5
- * 已完成	                6
- * 已取消	                7
- * Old code：END
- *
- * 0   订单创建（为派单）,
- * 10  已派上司机（司机去往上车点）,
- * 20  司机到达上车点,
- * 30  乘客到达上车点,
- * 40  服务中（去往目的地）,
- * 50  到达目的地,
- * 60  已完成,
- * 70  已取消
- */
-enum class TaxiPassengerOrderStatusEnum(val code: Int) {
-    None( 0 ),
-    OnTheWayToStart( 10),
-    ArriveAtStart( 20),
-    UserArriveAtStart( 30),
-    OnTheWayToEnd( 40),
-    ArriveAtEnd( 50),
-    JourneyCompleted(60),//行程完成
-    Cancel( 70);
-
-    companion object {
-        @JvmStatic
-        fun valueOf(code: Int): TaxiPassengerOrderStatusEnum {
-            for (value in values()) {
-                if (value.code == code) {
-                    return value
-                }
-            }
-            return None
-        }
-    }
-}

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiDriverTaskWithOrderBean.kt

@@ -2,7 +2,7 @@ package com.mogo.och.unmanned.taxi.bean
 
 import com.mogo.eagle.core.data.BaseData
 import com.mogo.och.unmanned.taxi.constant.TaskStatusEnum
-import com.mogo.och.unmanned.taxi.constant.TaxiOrderStatusEnum
+import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum
 
 /**
  * @author: wangmingjun

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaxiOrderStatusEnum.kt

@@ -1,47 +0,0 @@
-package com.mogo.och.unmanned.taxi.constant
-
-/**
- * Created on 2021/12/7
- *
- * * Old code：START
- * 未派单	                0
- * 去往上车站点	1
- * 车辆已到达上车站点	2
- * 乘客已到达上车站点 3
- * 去往下车站点	4
- * 到达下车站点	5
- * 已完成	                6
- * 已取消	                7
- * Old code：END
- *
- * 0   订单创建（为派单）,
- * 10  已派上司机（司机去往上车点）,
- * 20  司机到达上车点,
- * 30  乘客到达上车点,
- * 40  服务中（去往目的地）,
- * 50  到达目的地,
- * 60  已完成,
- * 70  已取消
- */
-enum class TaxiOrderStatusEnum(val code: Int) {
-    None( 0 ),
-    OnTheWayToStart( 10),
-    ArriveAtStart( 20),
-    UserArriveAtStart( 30),
-    OnTheWayToEnd( 40),
-    ArriveAtEnd( 50),
-    JourneyCompleted(60),//行程完成
-    Cancel( 70);
-
-    companion object {
-        @JvmStatic
-        fun valueOf(code: Int): TaxiOrderStatusEnum? {
-            for (value in values()) {
-                if (value.code == code) {
-                    return value
-                }
-            }
-            return None
-        }
-    }
-}

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiFragment.kt

@@ -6,8 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.FragmentTransaction
-import com.mogo.commons.AbsMogoApplication
- import com.mogo.commons.module.status.IMogoStatusChangedListener
+import com.mogo.commons.module.status.IMogoStatusChangedListener
 import com.mogo.commons.module.status.MogoStatusManager
 import com.mogo.commons.module.status.StatusDescriptor
 import com.mogo.eagle.core.data.temp.EventLogout
@@ -21,7 +20,7 @@ import com.mogo.och.common.module.biz.login.OpenOrderStatusEnum
 import com.mogo.och.common.module.utils.FlowBus
 import com.mogo.och.unmanned.taxi.R
 import com.mogo.och.unmanned.taxi.constant.TaxiDriverEventConst
-import com.mogo.och.unmanned.taxi.constant.TaxiOrderStatusEnum
+import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum
 import com.mogo.och.unmanned.taxi.ui.operational.TaxiOperationalDialogFragment
 import com.mogo.och.unmanned.taxi.ui.routing.TaxiRoutingFragment
 import com.mogo.och.unmanned.taxi.ui.task.TaxiTaskModel

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/debug/DebugView.kt

@@ -32,7 +32,7 @@ import com.mogo.och.unmanned.taxi.bean.TrajectoryListRespBean
 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.unmanned.taxi.constant.TaxiOrderStatusEnum
+import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum
 import com.mogo.och.unmanned.taxi.ui.task.TaxiTaskModel
 import kotlinx.android.synthetic.main.unmanned_taxi_debug_order.view.btnContainer
 import kotlinx.android.synthetic.main.unmanned_taxi_debug_order.view.currentBusinessModeTextView

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/TaskOrOrderAdapter.kt

@@ -20,7 +20,7 @@ import com.mogo.och.unmanned.taxi.bean.QueryOrdersRespBean
 import com.mogo.och.unmanned.taxi.bean.QueryTaskRespBean
 import com.mogo.och.unmanned.taxi.constant.OperationalOrderStatusEnum
 import com.mogo.och.unmanned.taxi.constant.StationTypeEnum
-import com.mogo.och.unmanned.taxi.constant.TaxiOrderStatusEnum
+import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum
 
 /**
  * @author: wangmingjun

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskFragment.kt

@@ -23,6 +23,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_
 import com.mogo.eagle.core.utilcode.util.ClickUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
+import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum
 import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.map.AmapNaviToDestinationModel
 import com.mogo.och.common.module.map.ICommonNaviChangedCallback
@@ -37,7 +38,6 @@ import com.mogo.och.unmanned.taxi.bean.StartServiceRespBean
 import com.mogo.och.unmanned.taxi.constant.TaskStatusEnum
 import com.mogo.och.unmanned.taxi.constant.TaskTypeEnum
 import com.mogo.och.unmanned.taxi.constant.TaxiDriverEventConst
-import com.mogo.och.unmanned.taxi.constant.TaxiOrderStatusEnum
 import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst.Companion.TAXI_END_MAP_MAKER
 import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst.Companion.TAXI_START_MAP_MAKER
 import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst.Companion.TYPE_MARKER_TAXI_ORDER

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskViewModel.kt

@@ -15,6 +15,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.NetworkUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
+import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum
 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
@@ -31,7 +32,6 @@ import com.mogo.och.unmanned.taxi.callback.ITaxiCarServiceCallback
 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.unmanned.taxi.constant.TaxiOrderStatusEnum
 import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst
 import com.mogo.och.unmanned.taxi.network.TaxiTaskWithOrderServiceManager
 import com.mogo.och.unmanned.taxi.ui.debug.DebugView

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiOrderCancelDialog.java

@@ -24,7 +24,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
 import com.mogo.och.unmanned.taxi.R;
 import com.mogo.och.unmanned.taxi.constant.TaxiOrderCancelReasons;
-import com.mogo.och.unmanned.taxi.constant.TaxiOrderStatusEnum;
+import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum;
 
 import java.lang.ref.WeakReference;
 

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt

@@ -30,7 +30,6 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.CoordinateUtils
-import com.mogo.eagle.core.utilcode.util.DateTimeUtils
 import com.mogo.eagle.core.utilcode.util.DrivingDirectionUtils
 import com.mogo.eagle.core.utilcode.util.NetworkUtils
 import com.mogo.eagle.core.utilcode.util.StringUtils
@@ -70,7 +69,7 @@ import com.mogo.och.unmanned.taxi.callback.ITaxiOrderStatusCallback
 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.unmanned.taxi.constant.TaxiOrderStatusEnum
+import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum
 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

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt

@@ -18,7 +18,7 @@ import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManage
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import com.mogo.och.common.module.voice.VoiceNotice
-import com.mogo.och.taxi.passenger.ui.model.order.TaxiPassengerOrderStatusEnum
+import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum
 import com.mogo.och.unmanned.passenger.bean.TaxiPassengerBaseRespBean
 import com.mogo.och.unmanned.passenger.constant.TaxiPassengerConst
 import com.mogo.och.unmanned.passenger.network.TaxiPassengerServiceManager
@@ -52,7 +52,7 @@ object AutopilotManager : IOchAutopilotStatusListener {
             ToastUtils.showShort("当前订单不存在或异常！")
             return "当前订单不存在或异常！"
         }
-        if (TaxiPassengerModel.currentOCHOrder!!.orderStatus == TaxiPassengerOrderStatusEnum.UserArriveAtStart.code) {
+        if (TaxiPassengerModel.currentOCHOrder!!.orderStatus == TaxiOrderStatusEnum.UserArriveAtStart.code) {
             startAutoPilotServiceByPassenger()
         }
         TaxiPassengerModel.currentTrajectoryInfo?.let {
@@ -198,7 +198,7 @@ object AutopilotManager : IOchAutopilotStatusListener {
         // 启动自驾成功
         when (state) {
             IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> {
-                if (TaxiPassengerModel.currentOCHOrder != null && TaxiPassengerModel.curOrderStatus === TaxiPassengerOrderStatusEnum.UserArriveAtStart) {
+                if (TaxiPassengerModel.currentOCHOrder != null && TaxiPassengerModel.curOrderStatus === TaxiOrderStatusEnum.UserArriveAtStart) {
                     TaxiPassengerAnalyticsManager.triggerStartAutopilotEvent(
                         false,
                         true,

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt

@@ -29,8 +29,8 @@ import com.mogo.och.common.module.manager.loop.LoopInfo
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import com.mogo.och.common.module.utils.RxUtils
 import com.mogo.och.common.module.voice.VoiceNotice
-import com.mogo.och.taxi.passenger.ui.model.order.TaxiPassengerOrderStatusEnum
-import com.mogo.och.taxi.passenger.ui.model.order.TaxiPassengerOrderStatusEnum.Companion.valueOf
+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.unmanned.passenger.bean.TaxiPassengerBaseRespBean
 import com.mogo.och.unmanned.passenger.bean.TaxiPassengerGetTrajectoryByLineIdRespBean
@@ -216,8 +216,8 @@ object TaxiPassengerModel {
                             currentOCHOrder = currentOrder
                             orderStatusChange()
                         } else if (currentOCHOrder?.orderStatus != currentOrder.orderStatus) {
-                            if (currentOCHOrder?.orderStatus == TaxiPassengerOrderStatusEnum.UserArriveAtStart.code
-                                && currentOrder.orderStatus < TaxiPassengerOrderStatusEnum.UserArriveAtStart.code
+                            if (currentOCHOrder?.orderStatus == TaxiOrderStatusEnum.UserArriveAtStart.code
+                                && currentOrder.orderStatus < TaxiOrderStatusEnum.UserArriveAtStart.code
                             ) {
                                 // 0830 UserArriveAtStart 状态是乘客屏本地在用户验证后本地设置，而且因为后端查询数据有延迟
                                 // 这里过下过滤，如果当前是UserArriveAtStart 且后端返回是之前状态，不更新数据
@@ -275,9 +275,9 @@ object TaxiPassengerModel {
                             && currentOCHOrder != null
                             && currentOCHOrder!!.orderNo == data.data.orderNo
                         ) {
-                            if (data.data.orderStatus == TaxiPassengerOrderStatusEnum.Cancel.code
-                                || data.data.orderStatus == TaxiPassengerOrderStatusEnum.JourneyCompleted.code
-                                || data.data.orderStatus == TaxiPassengerOrderStatusEnum.None.code
+                            if (data.data.orderStatus == TaxiOrderStatusEnum.Cancel.code
+                                || data.data.orderStatus == TaxiOrderStatusEnum.JourneyCompleted.code
+                                || data.data.orderStatus == TaxiOrderStatusEnum.None.code
                             ) {
                                 currentOCHOrder = data.data
                                 orderStatusChange()
@@ -298,11 +298,11 @@ object TaxiPassengerModel {
     }
 
     // 获取当前订单状态
-    val curOrderStatus: TaxiPassengerOrderStatusEnum
+    val curOrderStatus: TaxiOrderStatusEnum
         get() {
             val order: TaxiPassengerOrdersInServiceQueryRespBean.OrderBean =
                 currentOCHOrder
-                    ?: return TaxiPassengerOrderStatusEnum.None
+                    ?: return TaxiOrderStatusEnum.None
             return valueOf(order.orderStatus)
         }
 
@@ -376,7 +376,7 @@ object TaxiPassengerModel {
                 override fun onSuccess(data: TaxiPassengerBaseRespBean) {
                     if (data.code == 0 && currentOCHOrder != null) {
                         currentOCHOrder!!.orderStatus =
-                            TaxiPassengerOrderStatusEnum.UserArriveAtStart.code
+                            TaxiOrderStatusEnum.UserArriveAtStart.code
                         //乘客验证成功，更新订单状态为 "乘客已上车", 立马弹出乘客开始行程页面，不再等待轮询
                         orderStatusChange()
                         VoiceNotice.showNotice(
@@ -405,18 +405,18 @@ object TaxiPassengerModel {
 
     private fun orderStatusChangeInner() {
         when (curOrderStatus) {
-            TaxiPassengerOrderStatusEnum.OnTheWayToStart -> {
+            TaxiOrderStatusEnum.OnTheWayToStart -> {
             }
 
-            TaxiPassengerOrderStatusEnum.ArriveAtStart -> {
+            TaxiOrderStatusEnum.ArriveAtStart -> {
             }
 
-            TaxiPassengerOrderStatusEnum.UserArriveAtStart -> {
+            TaxiOrderStatusEnum.UserArriveAtStart -> {
                 //开启轮询司机是否已准备好开启自动驾驶的环境
                 setStation()
             }
 
-            TaxiPassengerOrderStatusEnum.OnTheWayToEnd -> {
+            TaxiOrderStatusEnum.OnTheWayToEnd -> {
                 CallerFuncBizManager.bizProvider.queryV2XEvents() //全览模式的V2X事件轮询开始
                 //startOrStopQueryOrderRemaining(true)
                 AutopilotManager.updateAutopilotControlParameters()
@@ -424,26 +424,26 @@ object TaxiPassengerModel {
                 CallerOrderListenerManager.invokeOrderStatus(true)
             }
 
-            TaxiPassengerOrderStatusEnum.ArriveAtEnd -> {
+            TaxiOrderStatusEnum.ArriveAtEnd -> {
                 AutopilotManager.clearAutopilotControlParameters()
                 //startOrStopQueryOrderRemaining(false)
                 CallerOrderListenerManager.invokeOrderStatus(false)
                 clearStation()
             }
 
-            TaxiPassengerOrderStatusEnum.JourneyCompleted -> {
+            TaxiOrderStatusEnum.JourneyCompleted -> {
                 AutopilotManager.clearAutopilotControlParameters()
                 //startOrStopQueryOrderRemaining(false)
                 clearStation()
             }
 
-            TaxiPassengerOrderStatusEnum.Cancel -> {
+            TaxiOrderStatusEnum.Cancel -> {
                 AutopilotManager.clearAutopilotControlParameters()
                 //startOrStopQueryOrderRemaining(false)
                 clearStation()
             }
 
-            TaxiPassengerOrderStatusEnum.None -> {
+            TaxiOrderStatusEnum.None -> {
                 //AutopilotManager.clearAutopilotControlParameters()
                 //startOrStopQueryOrderRemaining(false)
                 clearStation()

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/presenter/BaseTaxiPassengerPresenter.kt

@@ -9,7 +9,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 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.taxi.passenger.ui.model.order.TaxiPassengerOrderStatusEnum
+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
@@ -56,7 +56,7 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) :
     private fun updateOrderView(order: TaxiPassengerOrdersInServiceQueryRespBean.OrderBean?) {
         setItineraryVisibility()
         when (TaxiPassengerModel.curOrderStatus) {
-            TaxiPassengerOrderStatusEnum.OnTheWayToStart -> {
+            TaxiOrderStatusEnum.OnTheWayToStart -> {
                 // 10 接驾中
                 mView?.showOrHideCheckAndStartAutopilotView(3)
 
@@ -64,19 +64,19 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) :
                 overMapViewClear()
             }
 
-            TaxiPassengerOrderStatusEnum.ArriveAtStart -> {
+            TaxiOrderStatusEnum.ArriveAtStart -> {
                 // 20 司机到达上车点
                 mView?.showOrHideCheckAndStartAutopilotView(0)
                 overMapViewClear()
             }
 
-            TaxiPassengerOrderStatusEnum.UserArriveAtStart -> {
+            TaxiOrderStatusEnum.UserArriveAtStart -> {
                 // 30  乘客到达上车点
                 mView?.showOrHideCheckAndStartAutopilotView(1)
                 overMapViewClear()
             }
 
-            TaxiPassengerOrderStatusEnum.OnTheWayToEnd -> {
+            TaxiOrderStatusEnum.OnTheWayToEnd -> {
                 // 服务中（去往目的地）
                 mView?.showOrHideArrivedEndLayout(isShow = false)
 
@@ -85,13 +85,13 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) :
                 overMapViewShow()
             }
 
-            TaxiPassengerOrderStatusEnum.ArriveAtEnd -> {
+            TaxiOrderStatusEnum.ArriveAtEnd -> {
                 // 50 到达终点 乘客可以评价
                 mView?.showOrHideArrivedEndLayout(true)
                 overMapViewClear()
             }
 
-            TaxiPassengerOrderStatusEnum.JourneyCompleted -> {
+            TaxiOrderStatusEnum.JourneyCompleted -> {
                 // 60 行程完成
                 mView?.showOrHideCheckAndStartAutopilotView(3)
 
@@ -99,7 +99,7 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) :
                 overMapViewClear()
             }
 
-            TaxiPassengerOrderStatusEnum.Cancel -> {
+            TaxiOrderStatusEnum.Cancel -> {
                 // 70 取消订单
                 mView?.showOrHideCheckAndStartAutopilotView(3)
 
@@ -107,7 +107,7 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) :
                 overMapViewClear()
             }
 
-            TaxiPassengerOrderStatusEnum.None -> {
+            TaxiOrderStatusEnum.None -> {
                 // 00 默认状态，在不同任务之间切换时使用
                 mView?.showOrHideCheckAndStartAutopilotView(3)
 
@@ -129,14 +129,14 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) :
     fun setItineraryVisibility() {
         UiThreadHandler.post {
             when (TaxiPassengerModel.curOrderStatus) {
-                TaxiPassengerOrderStatusEnum.None,
-                TaxiPassengerOrderStatusEnum.OnTheWayToStart,
-                TaxiPassengerOrderStatusEnum.ArriveAtStart,
-                TaxiPassengerOrderStatusEnum.JourneyCompleted,
-                TaxiPassengerOrderStatusEnum.ArriveAtEnd,
-                TaxiPassengerOrderStatusEnum.Cancel -> mView?.showOrHideServingOrderFragment(false)
-                TaxiPassengerOrderStatusEnum.UserArriveAtStart,
-                TaxiPassengerOrderStatusEnum.OnTheWayToEnd -> mView?.showOrHideServingOrderFragment(true)
+                TaxiOrderStatusEnum.None,
+                TaxiOrderStatusEnum.OnTheWayToStart,
+                TaxiOrderStatusEnum.ArriveAtStart,
+                TaxiOrderStatusEnum.JourneyCompleted,
+                TaxiOrderStatusEnum.ArriveAtEnd,
+                TaxiOrderStatusEnum.Cancel -> mView?.showOrHideServingOrderFragment(false)
+                TaxiOrderStatusEnum.UserArriveAtStart,
+                TaxiOrderStatusEnum.OnTheWayToEnd -> mView?.showOrHideServingOrderFragment(true)
             }
         }
     }

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/ChekAndStartAutopilotViewModel.kt

@@ -1,7 +1,7 @@
 package com.mogo.och.unmanned.passenger.ui.checkstartautopilot
 
 import androidx.lifecycle.ViewModel
-import com.mogo.och.taxi.passenger.ui.model.order.TaxiPassengerOrderStatusEnum
+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
@@ -32,10 +32,10 @@ class ChekAndStartAutopilotViewModel : ViewModel(), OrderListener {
 
     override fun onCurrentOrderStatusChanged(order: BaseOrderBean?) {
         when (order?.orderStatus) {
-            TaxiPassengerOrderStatusEnum.ArriveAtStart.code -> {
+            TaxiOrderStatusEnum.ArriveAtStart.code -> {
                 // 显示手机号验证
             }
-            TaxiPassengerOrderStatusEnum.UserArriveAtStart.code -> {
+            TaxiOrderStatusEnum.UserArriveAtStart.code -> {
                 // 显示启动自驾
             }
             else -> {

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/orderinfo/OrderInfoViewModel.kt

@@ -6,7 +6,7 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 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.taxi.passenger.ui.model.order.TaxiPassengerOrderStatusEnum
+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
@@ -82,7 +82,7 @@ class OrderInfoViewModel: ViewModel(), IOCHTaxiPassengerOrderStatusCallback, Ord
             }
         }
         when (TaxiPassengerModel.curOrderStatus) {
-            TaxiPassengerOrderStatusEnum.OnTheWayToEnd -> {
+            TaxiOrderStatusEnum.OnTheWayToEnd -> {
 
             }
             else ->{