[3.4.0-map-sdk] convert stopline

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/MoGoVisualAngleChangeProvider.kt

@@ -9,13 +9,13 @@ import androidx.lifecycle.Lifecycle.Event.ON_DESTROY
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.mogo.eagle.core.data.constants.MogoServicePaths
 import com.mogo.eagle.core.data.map.*
-import com.mogo.eagle.core.data.map.MapRoadInfo.StopLine
 import com.mogo.eagle.core.function.api.map.angle.*
 import com.mogo.eagle.core.function.api.map.angle.Scene
 import com.mogo.eagle.core.function.call.autopilot.*
 import com.mogo.eagle.core.function.call.map.*
 import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager.OnRoadListener
 import com.mogo.eagle.core.utilcode.kotlin.*
+import com.zhidaoauto.map.data.road.StopLine
 import com.zhidaoauto.map.sdk.open.tools.*
 import kotlinx.coroutines.*
 import kotlinx.coroutines.android.*
@@ -90,11 +90,11 @@ class MoGoVisualAngleChangeProvider: IMoGoVisualAngleChangeProvider {
 
 
         override fun onStopLineInfo(info: StopLine) {
-            Log.d(TAG, "-- onStopLineInfo --: ${info.distanceOfCarToStopLine}")
-            if (!hasCrossRoad && info.distanceOfCarToStopLine <= 30.0) {
+            Log.d(TAG, "-- onStopLineInfo --: ${info.distance}")
+            if (!hasCrossRoad && info.distance <= 30.0) {
                 hasCrossRoad = true
                 triggerRoadId.set(this.roadId.get())
-                distanceOfCarToStopLine.set(info.distanceOfCarToStopLine)
+                distanceOfCarToStopLine.set(info.distance)
                 triggerLocation.set(CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02())
                 changeAngle(CrossRoad(true))
             }

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MapRoadInfo.kt

@@ -1,36 +0,0 @@
-package com.mogo.eagle.core.data.map
-
-class MapRoadInfo {
-
-    class StopLine {
-        /**
-         * 停止线的长度
-         */
-        var distance: Double = 0.0
-
-        /**
-         * 车道ID
-         */
-        var laneId: List<String>? = null
-
-        /**
-         * 停止线上的点
-         */
-        var points: List<MogoLatLng> = emptyList()
-
-        /**
-         * 道路ID
-         */
-        var roadId: List<String>? = null
-
-        /**
-         * 瓦片ID
-         */
-        var tieId: String = ""
-
-        /**
-         * 自车到停止线的距离
-         */
-        var distanceOfCarToStopLine: Double = 0.0
-    }
-}

core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapRoadListenerManager.kt

@@ -1,6 +1,6 @@
 package com.mogo.eagle.core.function.call.map
 
-import com.mogo.eagle.core.data.map.MapRoadInfo.StopLine
+import com.zhidaoauto.map.data.road.StopLine
 import java.util.concurrent.ConcurrentHashMap
 
 object CallerMapRoadListenerManager {