[3.2.0] 1、M1司机端/乘客屏修改 writeVersion 2、增加靠边停车失败提示

OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt

@@ -7,23 +7,18 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.ActivityUtils
 import com.mogo.eagle.core.utilcode.util.GsonUtils
-import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.bus.passenger.R
 import com.mogo.och.bus.passenger.bean.response.OrderInfoResponse
 import com.mogo.och.bus.passenger.model.CharterPassengerModel
-import com.mogo.och.bus.passenger.net.BusPassengerModelLoopManager
-import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionOrderPresenter
 import com.mogo.och.common.module.bean.dpmsg.*
 import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager
 import com.mogo.och.common.module.biz.constant.OchCommonConst
 import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorManager
 import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorStatusManager
 import com.mogo.och.common.module.utils.DateTimeUtil
-import com.mogo.och.common.module.utils.RxUtils
 import com.mogo.och.common.module.utils.SoundPoolHelper
 import com.mogo.och.common.module.voice.VoiceNotice
-import com.mogo.tts.base.IMogoTTSCallback
 
 object DriverMessage: IReceivedMsgListener {
     override fun onReceivedMsg(type: Int, byteArray: ByteArray) {
@@ -67,7 +62,7 @@ object DriverMessage: IReceivedMsgListener {
                         ) as ChangeDestMsg
                         if (msg.isConfirmed&&msg.arriveStatus== OrderInfoResponse.ARRIVED) {
                             CallerLogger.d(SceneConstant.M_BUS_P + BaseDPMsg.TAG, "接受数据：到站${msg}")
-                            CharterPassengerModel.arrivedDeskSuccess(msg.writtenVersion?:0,false)
+                            CharterPassengerModel.arrivedDeskSuccess(msg.writeVersion?:0,false)
                         }
                     }
                     else -> {}

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

@@ -465,6 +465,7 @@ class DriverM1Model {
                     ,mCurrentOrder!!.writeVersion)
             }
         }
+        currentChangeDestMsg?.writeVersion = mCurrentOrder!!.writeVersion
         sendMsgToClient(currentChangeDestMsg)
     }
 

OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/net/DriverM1ServiceManager.kt

@@ -77,11 +77,11 @@ object DriverM1ServiceManager {
             ?.subscribe(OchCommonSubscribeImpl(context!!, callback, "changeDest"))
     }
 
-    fun arriveDest(context: Context,lindId: Long ,writtenVersion:Long
+    fun arriveDest(context: Context,lindId: Long ,writeVersion:Long
                    ,callback: OchCommonServiceCallback<BaseData>?){
         mDriverM1ServiceApi.arriveDest(MoGoAiCloudClientConfig.getInstance().serviceAppId,
             MoGoAiCloudClientConfig.getInstance().token,
-            ArriveDestRequest(MoGoAiCloudClientConfig.getInstance().sn,lindId,writtenVersion)
+            ArriveDestRequest(MoGoAiCloudClientConfig.getInstance().sn,lindId,writeVersion)
         ).transformTry()
             .subscribe(OchCommonSubscribeImpl(context!!, callback, "arriveDest"))
     }

OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt

@@ -174,6 +174,14 @@ class DriverM1Presenter(view: DriverM1Fragment?) :
                     OPERATION_ROAD_SIDE_TYPE
                 )
             }
+            StopSideStatusManager.Status.EndingFaile,
+                    StopSideStatusManager.Status.NOSTART-> {
+                DriverM1Model.get().pushOperationalToMsgBox(
+                    DateTimeUtil.getCurrentTimeStamp(),
+                    "靠边停车失败",
+                    OPERATION_ROAD_SIDE_TYPE
+                )
+            }
         }
     }
 

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

@@ -31,7 +31,7 @@ data class ChangeDestMsg(
     var destSiteName: String = "",
     var isConfirmed: Boolean = false, //司机端是否同意
     var arriveStatus:Int?, //1:未到达 2:到达
-    var writtenVersion:Long?, //版本标记
+    var writeVersion:Long?, //版本标记
     var lineSiteList: MutableList<LineSite>? = null
 ): BaseDPMsg(DPMsgType.TYPE_CHANGE_DEST.type)