From b43a4d17f35a5d627488ea1e36521f6f2f61a608 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 16 Oct 2024 19:06:19 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.0]=20[fea]=20[=E4=BC=A0=E9=80=92=E8=B5=B7?= =?UTF-8?q?=E5=A7=8B=E7=AB=99=E7=82=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/manager/autopilot/line/LineManager.kt | 6 ++++++ .../java/com/mogo/och/data/bean/BusStationBean.java | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/line/LineManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/line/LineManager.kt index 80e94d6caf..09a57f03ac 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/line/LineManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/line/LineManager.kt @@ -8,9 +8,11 @@ import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters.AutoPilotLi import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters.AutoPilotLonLat import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.map.MogoLocation +import com.mogo.eagle.core.data.och.OchInfo import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager +import com.mogo.eagle.core.function.call.datacenter.CallerDataCenterBizListener import com.mogo.eagle.core.function.call.map.CallerMapGlobalTrajectoryDrawManager import com.mogo.eagle.core.function.call.och.CallerEagleBaseFunctionCall4OchManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d @@ -77,6 +79,10 @@ object LineManager : CallerBase() { private var autopilotId: String by Delegates.observable("") { _, oldValue, newValue -> if (oldValue != newValue) { CallerEagleBaseFunctionCall4OchManager.setOchAutopilotOrderId(newValue) + getStations { start, end -> + CallerDataCenterBizListener.invokeOchInfo(OchInfo(0, mutableListOf(start.toMogoLocation(),end.toMogoLocation()))) + } + } } diff --git a/OCH/common/data/src/main/java/com/mogo/och/data/bean/BusStationBean.java b/OCH/common/data/src/main/java/com/mogo/och/data/bean/BusStationBean.java index cd622edac6..9eb42612bb 100644 --- a/OCH/common/data/src/main/java/com/mogo/och/data/bean/BusStationBean.java +++ b/OCH/common/data/src/main/java/com/mogo/och/data/bean/BusStationBean.java @@ -1,5 +1,9 @@ package com.mogo.och.data.bean; +import com.mogo.eagle.core.data.map.MogoLocation; + +import org.jetbrains.annotations.NotNull; + import java.util.List; import java.util.Objects; @@ -179,4 +183,12 @@ public class BusStationBean { ", videoList=" + videoList + '}'; } + + @NotNull + public MogoLocation toMogoLocation() { + MogoLocation result = new MogoLocation(); + result.setLatitude(gcjLat); + result.setLongitude(gcjLon); + return result; + } }