[6.6.0]

[fea]
[添加部分日志]

OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/line/LineManager.kt

@@ -3,6 +3,7 @@ package com.mogo.och.common.module.manager.autopilot.line
 import com.mogo.commons.env.ProjectUtils
 import com.mogo.eagle.core.function.call.map.CallerMapGlobalTrajectoryDrawManager
 import com.mogo.eagle.core.function.call.order.CallerOrderListenerManager
+import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import com.mogo.och.common.module.utils.CallerBase
 import com.mogo.och.data.bean.BusStationBean
 import com.mogo.och.data.bean.ContraiInfo
@@ -34,6 +35,59 @@ object LineManager : CallerBase<ILineCallback>() {
      */
     var endStation: BusStationBean? = null
 
+    /**
+     * 设置站点信息
+     */
+    fun setStartAndEndStation(startStation: BusStationBean?,endStation: BusStationBean?){
+        this.startStation = startStation
+        this.endStation = endStation
+        OchChainLogManager.writeChainLogAutopilot("自驾参数","${startStation}---${endStation}")
+    }
+
+    fun getStations(function: (start:BusStationBean,end:BusStationBean) -> Unit){
+        startStation?.let { start->
+            endStation?.let { end ->
+                function.invoke(start,end)
+            }
+        }
+    }
+    fun getStationsWithContrai(function: (start:BusStationBean,end:BusStationBean,contrai: ContraiInfo) -> Unit){
+        startStation?.let { start->
+            endStation?.let { end ->
+                contraiInfo?.let {contrai->
+                    function.invoke(start,end,contrai)
+                }
+            }
+        }
+    }
+
+    fun getStationsWithLine(function: (start:BusStationBean,end:BusStationBean,lineInfo: LineInfo) -> Unit){
+        startStation?.let { start->
+            endStation?.let { end ->
+                lineInfos?.let {line->
+                    function.invoke(start,end, line)
+                }
+            }
+        }
+    }
+    fun getStationsWithLineAndContrai(function: (start:BusStationBean,end:BusStationBean,lineInfo: LineInfo,contrai: ContraiInfo) -> Unit){
+        startStation?.let { start->
+            endStation?.let { end ->
+                lineInfos?.let {line->
+                    contraiInfo?.let { contrai ->
+                        function.invoke(start,end, line,contrai)
+                    }
+                }
+            }
+        }
+    }
+
+    fun getStartStation(function: (start:BusStationBean) -> Unit){
+        startStation?.let { start ->
+            function.invoke(start)
+        }
+    }
+
     @JvmStatic
     fun setLineInfo(lineInfo: LineInfo?){
         if(lineInfo==null){

OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt

@@ -43,7 +43,7 @@ object OchChainLogManager {
     // 局域网内socket 连接状态流转
     const val EVENT_KEY_INFO_SCANNER = "analytics_event_och_scanner"
 
-    // 局域网内socket 连接状态流转
+    // 自动驾驶日志群
     const val EVENT_KEY_INFO_AUTOPILOT = "analytics_event_och_autopilot"
 
     const val EVENT_KEY_INFO_VOICE_TTS = "analytics_event_och_voice_tts"

OCH/common/data/src/main/java/com/mogo/och/data/bean/BusStationBean.java

@@ -144,6 +144,7 @@ public class BusStationBean {
         return "BusStationBean{" +
                 "siteId=" + siteId +
                 ", name='" + name + '\'' +
+                ", nameKr='" + nameKr + '\'' +
                 ", seq=" + seq +
                 ", gcjLon=" + gcjLon +
                 ", gcjLat=" + gcjLat +
@@ -151,8 +152,8 @@ public class BusStationBean {
                 ", lat=" + lat +
                 ", drivingStatus=" + drivingStatus +
                 ", leaving=" + leaving +
+                ", introduction='" + introduction + '\'' +
+                ", isPlayTts=" + isPlayTts +
                 '}';
     }
-
-
 }