From ef966a1e73a06e48939e1e8d9ade312f4ae2b259 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 21 Nov 2024 15:36:12 +0800 Subject: [PATCH] =?UTF-8?q?[6.8.0]=20[fea]=20[=E6=97=A5=E5=BF=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/och/weaknet/model/LineModel.kt | 2 ++ .../src/main/java/com/mogo/och/weaknet/model/TicketModel.kt | 2 +- .../src/main/java/com/mogo/eagle/core/data/och/OchInfo.kt | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt index 15c40c8764..ed0dea66e3 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt @@ -414,6 +414,7 @@ object LineModel { if(isClear) { val ochInfo = OchInfo(1, mutableListOf()) ochInfo.siteMarkerList = mutableListOf() + OchChainLogManager.writeChainLog("地图","站点信息:${ochInfo}") CallerDataCenterBizListener.invokeOchInfo(ochInfo) }else{ val siteList = mutableListOf() @@ -446,6 +447,7 @@ object LineModel { if(start!=null&&end!=null){ val ochInfo = OchInfo(1, mutableListOf(start.toMogoLocation(),end.toMogoLocation())) ochInfo.siteMarkerList = siteList + OchChainLogManager.writeChainLog("地图","站点信息:${ochInfo}") CallerDataCenterBizListener.invokeOchInfo(ochInfo) } } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt index 815c1d3640..bced2561fa 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt @@ -138,7 +138,7 @@ object TicketModel { ) OchChainLogManager.writeChainLog( "核销人数", - "任务:${currentTask.taskId} zhan'dian" + "任务:${currentTask.taskId} 站点:${firstStation.siteId}_${firstStation.name}" ) } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/och/OchInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/och/OchInfo.kt index 79700fb092..cf1100434f 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/och/OchInfo.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/och/OchInfo.kt @@ -7,4 +7,8 @@ import com.mogo.eagle.core.data.map.SiteMarkerBean // type 1-> 起终点+站点 data class OchInfo(var type: Int, var latLonList: List?) { var siteMarkerList: List? = null// 起终点+站点 + override fun toString(): String { + return "OchInfo(type=$type, latLonList=$latLonList, siteMarkerList=$siteMarkerList)" + } + } \ No newline at end of file