From 6106228186581e47a8f9d5437a8ad18ec04b8fd8 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Fri, 24 Feb 2023 16:01:18 +0800
Subject: [PATCH] =?UTF-8?q?[charter]=20m1=E5=8F=B8=E4=B9=98=E9=80=9A?=
 =?UTF-8?q?=E4=BF=A1=E7=BB=93=E6=9E=84=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/common/module/bean/dpmsg/BaseDPMsg.kt   |  7 +++++++
 .../common/module/bean/{ => dpmsg}/ChangeDestMsg.kt  | 10 +++++-----
 .../mogo/och/common/module/bean/dpmsg/DPMsgType.kt   | 12 ++++++++++++
 3 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/BaseDPMsg.kt
 rename OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/{ => dpmsg}/ChangeDestMsg.kt (54%)
 create mode 100644 OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DPMsgType.kt

diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/BaseDPMsg.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/BaseDPMsg.kt
new file mode 100644
index 0000000000..ca7ead50d8
--- /dev/null
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/BaseDPMsg.kt
@@ -0,0 +1,7 @@
+package com.mogo.och.common.module.bean.dpmsg
+
+/**
+ * @author: wangmingjun
+ * @date: 2023/2/24
+ */
+open class BaseDPMsg(var type: Int) // 0: 常规 1：确认路线/站点 2：开/关车门 3：结束订单
\ No newline at end of file
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/ChangeDestMsg.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/ChangeDestMsg.kt
similarity index 54%
rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/ChangeDestMsg.kt
rename to OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/ChangeDestMsg.kt
index 051408dc1f..48ce9faf09 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/ChangeDestMsg.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/ChangeDestMsg.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.bean
+package com.mogo.och.common.module.bean.dpmsg
 
 /**
  * @author: wangmingjun
@@ -6,10 +6,10 @@ package com.mogo.och.common.module.bean
  */
 data class ChangeDestMsg(
     var lineId: Int, //线路id
-    var lineName: String, //线路名称
+    var lineName: String = "", //线路名称
     var startSiteId: Int,  //当前站点
-    var startSiteName: String,
+    var startSiteName: String = "",
     var destSiteId: Int, //目的地
-    var destSiteName: String,
+    var destSiteName: String = "",
     var isConfirmed: Boolean = false //司机端是否同意
-)
+): BaseDPMsg(DPMsgType.TYPE_CHANGE_DEST.type)
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
new file mode 100644
index 0000000000..40f54f7cad
--- /dev/null
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DPMsgType.kt
@@ -0,0 +1,12 @@
+package com.mogo.och.common.module.bean.dpmsg
+
+/**
+ * @author: wangmingjun
+ * @date: 2023/2/24
+ */
+enum class DPMsgType(val type: Int) {
+    TYPE_COMMON(0), //常规
+    TYPE_CHANGE_DEST(1),// 变更目的地确认
+    TYPE_OPEN_CLOSE_DOOR(2),//开关门
+    TYPE_ORDER_CLOSED(3) // 订单结束
+}
\ No newline at end of file