From 0fe15c01f983302e25df959ac51294d36e909512 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 4 May 2023 11:40:10 +0800
Subject: [PATCH] =?UTF-8?q?[charter]=20[3.2.0]=20[=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=88=B0=E7=AB=99=E5=92=8C=E7=BB=93=E6=9D=9F=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E5=B1=80=E5=9F=9F=E7=BD=91=E7=BB=93=E6=9E=84]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/common/module/bean/dpmsg/DPMsgType.kt    |  4 +++-
 .../och/common/module/bean/dpmsg/DataBean.kt     | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DPMsgType.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DPMsgType.kt
index e47d5900fd..a531fe2cc2 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DPMsgType.kt
+++ b/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
 }
\ No newline at end of file
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DataBean.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DataBean.kt
index 5cf9c2600c..81b6a30fa8 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DataBean.kt
+++ b/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)