[charter]

[3.2.0]
[定义到站和结束订单的局域网结构]

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

@@ -10,5 +10,7 @@ enum class DPMsgType(val type: Int) {
     TYPE_OPEN_CLOSE_DOOR(2),//开关门
     TYPE_ORDER_CLOSED(3), // 订单结束
     TYPE_TASK_DETAILS(4), //路线任务详情
-    TYPE_LOGIN_STATUS(5) //login status
+    TYPE_LOGIN_STATUS(5), //login status
+    TYPE_ARRIVEDEST_STATUS(6), //到站通知 status
+    TYPE_ORDER_CLOSED_BY_M1_STATUS(7) //到站通知 status
 }

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

@@ -28,6 +28,22 @@ data class ChangeDestMsg(
     var writtenVersion:Long?, //版本标记
 ): BaseDPMsg(DPMsgType.TYPE_CHANGE_DEST.type)
 
+data class ArriveDestMsg(
+    var orderNo: String, //订单id
+    var lineId: Int, //线路id
+    var lineName: String = "", //线路名称
+    var startSiteId: Int= 0,  //当前站点
+    var startSiteName: String = "",
+    var destSiteId: Int= 0, //目的地
+    var destSiteName: String = "",
+    var arriveStatus:Int?, //1:未到达 2:到达
+    var writtenVersion:Long?, //版本标记
+): BaseDPMsg(DPMsgType.TYPE_ARRIVEDEST_STATUS.type)
+
+data class EndOrderMsg(
+    var orderNo: String, //订单id
+): BaseDPMsg(DPMsgType.TYPE_ORDER_CLOSED_BY_M1_STATUS.type)
+
 data class DPCommonOperationMsg(
     var msg: String
 ): BaseDPMsg(DPMsgType.TYPE_COMMON.type)