[charter]

[3.2.0]
[add orderNo change]

OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt

@@ -841,7 +841,9 @@ object CharterPassengerModel {
                                             )
                                             broadcastList["${siteId}$endKey"] = true
                                             // 给司机端
+
                                             val msg = ChangeDestMsg(
+                                                order.orderNo?:":",
                                                 lineId.toInt(),
                                                 order.lineName?:"",
                                                 order.startSiteId?:0,

OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt

@@ -217,7 +217,9 @@ class BusPassengerFunctionOrderPresenter(view: M1OrderLineFragment?) :
         }
 
         tempCheckSite?.let { siteInfo ->
+            val orderNo = CharterPassengerModel.getCurrentOrderInfo()?.orderNo ?: ""
             val msg = ChangeDestMsg(
+                orderNo,
                 siteInfo.lineId!!.toInt(),
                 siteInfo.lineName!!,
                 currentSite!!.siteId!!.toInt(),

OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt

@@ -430,6 +430,7 @@ class DriverM1Model {
         if (currentChangeDestMsg == null){
             mCurrentOrder?.let {
                 currentChangeDestMsg = ChangeDestMsg(
+                    mCurrentOrder!!.orderNo,
                     mCurrentOrder!!.lineId
                     ,mCurrentOrder!!.lineName
                     , mCurrentOrder!!.startSiteId

OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DataBean.kt

@@ -17,6 +17,7 @@ data class LoginCacheStatus(
     ): BaseDPMsg(DPMsgType.TYPE_LOGIN_STATUS.type)
 
 data class ChangeDestMsg(
+    var orderNo: String,// 订单号
     var lineId: Int, //线路id
     var lineName: String = "", //线路名称
     var startSiteId: Int= 0,  //当前站点