From 124f3642cbe86cd1c96beedad6f8e1f95bf74293 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 15 Nov 2024 14:41:04 +0800
Subject: [PATCH] =?UTF-8?q?[6.7.3]=20[fix]=20[msgid+null=20=E5=A4=84?=
 =?UTF-8?q?=E7=90=86]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weaknet/bean/request/ShuttleEventRequest.kt   |  5 +++--
 .../weaknet/bean/response/BusRoutesResponse.kt    | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/request/ShuttleEventRequest.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/request/ShuttleEventRequest.kt
index 0e10757b59..c68457ddab 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/request/ShuttleEventRequest.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/request/ShuttleEventRequest.kt
@@ -17,7 +17,7 @@ data class ShuttleEventRequest(val requestId: String, val sn: String, val busine
             var tempEvent: Event?=null
             waitUpdateEvent.forEach {
                 tempEvent = Event(it.eventType,
-                    EventData(it.taskId,it.businessTime,it.writeVersion,it.siteId,it.seq,it.driverId)
+                    EventData(it.taskId,it.businessTime,it.writeVersion,it.siteId,it.seq,it.driverId,it.msgId)
                 )
                 eventList4Request.add(tempEvent!!)
             }
@@ -35,5 +35,6 @@ data class EventData(
     var writeVersion: Long?,
     var siteId: Long?,
     var seq: Int?,
-    var driverId:Long?
+    var driverId:Long?,
+    var msgId:String?
 )
\ No newline at end of file
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/BusRoutesResponse.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/BusRoutesResponse.kt
index 59ac0563bc..3ca25f85b0 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/BusRoutesResponse.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/BusRoutesResponse.kt
@@ -54,11 +54,16 @@ class BusRoutesResponse : BaseData() {
                 temp?.seq = (taskAndsite.seq ?: 0)
                 temp?.siteId = if (taskAndsite.siteId == null) 0 else taskAndsite.siteId!!.toInt()
                 if(!taskAndsite.videoList.isNullOrEmpty()){
-                    val list = GsonUtils.fromJson<List<SiteIntroduce>>(
-                        taskAndsite.videoList,
-                        object : TypeToken<List<SiteIntroduce?>?>() {}.type
-                    )
-                    temp?.videoList = list.toMutableList()
+                    try {
+                        val list = GsonUtils.fromJson<List<SiteIntroduce>>(
+                            taskAndsite.videoList,
+                            object : TypeToken<List<SiteIntroduce?>?>() {}.type
+                        )
+                        temp?.videoList = list.toMutableList()
+                    }catch (e:Exception){
+                        temp?.videoList = null
+                    }
+
                 }
                 result.add(temp!!)
                 // 正在进行中的任务