[3.2.0] 包车司机同步报站屏信息修改

OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/ArriveDestRequest.kt

@@ -1,3 +1,3 @@
 package com.mogo.och.bus.passenger.bean.request
 
-data class ArriveDestRequest(val sn:String, val lineId:Long,val writtenVersion:Long)
+data class ArriveDestRequest(val sn:String, val lineId:Long,val writeVersion:Long)

OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/Station.kt

@@ -6,4 +6,4 @@ package com.magic.mogo.och.charter.bean
  */
 data class Station(var siteId: Int, var siteName: String, var seq: Int)
 
-data class ArriveDestRequest(val sn:String, val lineId:Long,val writtenVersion:Long)
+data class ArriveDestRequest(val sn:String, val lineId:Long,val writeVersion:Long)

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

@@ -235,6 +235,8 @@ class DriverM1Model {
                             }else{ //切换目的地
                                 showChangerDestCommitDialog(changeDestMsg)
                             }
+                        }else if (msg.type == DPMsgType.TYPE_TASK_DETAILS.type){
+                            updateToClientData()
                         }
                         d(SceneConstant.M_CHARTER_D,"onReceivedMsg = "+ GsonUtils.toJson(msg))
                     }catch (e: Exception){
@@ -405,20 +407,21 @@ class DriverM1Model {
         //到站接口请求
 
         mContext?.let {
-            DriverM1ServiceManager.arriveDest(
-                it, mCurrentOrder!!.lineId.toLong(),DateTimeUtil.getCurrentTimeStamp()
-                ,object :OchCommonServiceCallback<BaseData>{
-                    override fun onSuccess(data: BaseData?) {
-                        d(SceneConstant.M_CHARTER_D + TAG, "onArriveAt = " + GsonUtil.jsonFromObject(data))
-                        if (data?.code == 0){
-                            onArriveAtSuccess()
+            mCurrentOrder?.lineId?.let { it1 ->
+                DriverM1ServiceManager.arriveDest(
+                    it, it1.toLong(),DateTimeUtil.getCurrentTimeStamp(),object :OchCommonServiceCallback<BaseData>{
+                        override fun onSuccess(data: BaseData?) {
+                            d(SceneConstant.M_CHARTER_D + TAG, "onArriveAt = " + GsonUtil.jsonFromObject(data))
+                            if (data?.code == 0){
+                                onArriveAtSuccess()
+                            }
                         }
-                    }
 
-                    override fun onFail(code: Int, msg: String?) {
-                        d(SceneConstant.M_CHARTER_D + TAG, "onArriveAt = onFail= $code,$msg" )
-                    }
-                })
+                        override fun onFail(code: Int, msg: String?) {
+                            d(SceneConstant.M_CHARTER_D + TAG, "onArriveAt = onFail= $code,$msg" )
+                        }
+                    })
+            }
         }
     }
 
@@ -427,6 +430,20 @@ class DriverM1Model {
         CharterSendTripInfoManager.sendCharterTripInfo(ARRIVE_STATION,mCurrentOrder?.lineName!!
             ,mCurrentOrder?.startSiteName!!,mCurrentOrder?.siteName!!,false)
 
+        if (currentChangeDestMsg != null){
+            currentChangeDestMsg?.isConfirmed = true
+            currentChangeDestMsg?.arriveStatus = 2
+        }
+    }
+
+    private fun updateToClientData() {
+        if (mCurrentOrder == null) {
+            currentChangeDestMsg = ChangeDestMsg(-1,"",0
+                ,"",0,"",false,1
+                ,DateTimeUtil.getCurrentTimeStamp())
+            sendMsgToClient(currentChangeDestMsg)
+            return
+        }
         if (currentChangeDestMsg == null){
             mCurrentOrder?.let {
                 currentChangeDestMsg = ChangeDestMsg(
@@ -436,12 +453,11 @@ class DriverM1Model {
                     ,mCurrentOrder!!.startSiteName
                     ,mCurrentOrder!!.siteId
                     ,mCurrentOrder!!.siteName
-                    ,true
-                    ,2
-                    ,DateTimeUtil.getCurrentTimeStamp())
+                    ,false
+                    ,mCurrentOrder!!.arriveStatus
+                    ,mCurrentOrder!!.writeVersion)
             }
         }
-        currentChangeDestMsg?.arriveStatus = 2
         sendMsgToClient(currentChangeDestMsg)
     }
 
@@ -633,17 +649,20 @@ class DriverM1Model {
                     if (data.data.businessStatus == 2){//订单为空，则是要换车状态
                         if (TextUtils.isEmpty(data.data.orderNo)){//还未换车，显示还车状态
                             mOrderCallback?.updateReturnCarStatus(false)
-                            mCurrentOrder == null
+                            mCurrentOrder = null
                             sendCharterEndTripInfo()
                             startOrStopCheckCountDown(false)
+                            updateToClientData()
                         }
 //                        else{ // 订单不为空，有服务中订单，等待去查询订单
 //                            mOrderCallback?.updateReturnCarStatus(true)
 //                        }
                     }else{ //车辆无订单，闲置状态
+                        mOrderCallback?.updateReturnCarStatus(true)
                         clearAutopilotControlParameters()
                         mCurrentOrder = null
                         startOrStopCheckCountDown(false)
+                        updateToClientData()
                     }
                 }
 
@@ -679,6 +698,8 @@ class DriverM1Model {
 
                     mCurrentOrder = data.data
 
+                    updateToClientData()
+
                     mOrderCallback?.updateOrderUI(data.data)
                     // 包车时间倒计时校验开始
                     startOrStopCheckCountDown(true)