diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/ShuttleEventRequest.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/ShuttleEventRequest.kt index 65a424b4d3..fa6106075b 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/ShuttleEventRequest.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/ShuttleEventRequest.kt @@ -2,6 +2,7 @@ package com.mogo.och.weaknet.bean import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.network.utils.digest.DigestUtils +import com.mogo.och.common.module.biz.login.LoginStatusManager import com.mogo.och.weaknet.database.bean.EventDataBean /** @@ -10,16 +11,22 @@ import com.mogo.och.weaknet.database.bean.EventDataBean * * 根据车机行驶线路站点信息 */ -data class ShuttleEventRequest(val requestId: String, val sn: String, val businessType: Int,val eventList:MutableList,var driverId:Long=0){ +data class ShuttleEventRequest(val requestId: String, val sn: String, val businessType: Int,val eventList:MutableList){ companion object{ val businessTypeShuttle = 11 fun transformDb2Net(waitUpdateEvent: List): ShuttleEventRequest { val md5Hex = DigestUtils.md5Hex(waitUpdateEvent.toString()) val eventList4Request = mutableListOf() var tempEvent:Event?=null + var driverId = 0L + LoginStatusManager.getLoginInfo()?.let { + if(it.driverId>0){ + driverId = it.driverId + } + } waitUpdateEvent.forEach { tempEvent = Event(it.eventType, - EventData(it.taskId,it.businessTime,it.writeVersion,it.siteId,it.seq) + EventData(it.taskId,it.businessTime,it.writeVersion,it.siteId,it.seq,driverId) ) eventList4Request.add(tempEvent!!) } @@ -35,5 +42,6 @@ data class EventData( var businessTime: Long?, var writeVersion: Long?, var siteId: Long?, - var seq: Int? + var seq: Int?, + var driverId:Long? ) \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/EventModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/EventModel.kt index 9ab732e274..d902d53bfc 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/EventModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/EventModel.kt @@ -61,11 +61,6 @@ object EventModel : EventRepository.EventCallback { } OchChainLogManager.writeChainLogDb("上报event","开始上报:${Thread.currentThread().name}") val transformDb2Net = ShuttleEventRequest.transformDb2Net(waitUpdateEvent) - LoginStatusManager.getLoginInfo()?.let { - if(it.driverId>0){ - transformDb2Net.driverId = it.driverId - } - } OrderServiceManager.reportCabinEvent(AbsMogoApplication.getApp()!!,transformDb2Net,object :OchCommonServiceCallback{ override fun onSuccess(data: BaseData?) { waitUpdateEvent.forEach {