yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0

Browse Source 
# Conflicts:
#	core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java
This commit is contained in:
wangmingjun
2023-02-20 10:39:15 +08:00
parent c90ad1a99f 51f3308cb2
commit 41e23861af
259 changed files with 1738 additions and 1849 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt
View File

@@ -22,10 +22,10 @@ import com.amap.api.maps.TextureMapView
import com.amap.api.maps.model.*
import com.mogo.eagle.core.data.map.Infrastructure
import com.mogo.eagle.core.data.map.MogoLocation
import com.mogo.eagle.core.data.v2x.V2XEvent
import com.mogo.eagle.core.data.v2x.V2XEventData
import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener
import com.mogo.eagle.core.function.api.v2x.IFuncBizProvider
import com.mogo.eagle.core.function.api.biz.IFuncBizProvider
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager.getGlobalPath
import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager
@@ -300,8 +300,8 @@ class OverMapView @JvmOverloads constructor(
geoHashInfMap = map
}
override fun onV2XEvents(v2xEvents: List<V2XEvent>?) {
showV2XEventMarkers(v2xEvents)
override fun onV2XEvents(v2XEventData: List<V2XEventData>?) {
showV2XEventMarkers(v2XEventData)
}
})
// 主动查一次全局路径规划的数据
@@ -389,11 +389,11 @@ class OverMapView @JvmOverloads constructor(
/**
* 显示V2X事件的Marker
*/
private fun showV2XEventMarkers(v2XEvents: List<V2XEvent>?) {
if (v2XEvents == null || v2XEvents.isEmpty()) return
private fun showV2XEventMarkers(v2XEventData: List<V2XEventData>?) {
if (v2XEventData == null || v2XEventData.isEmpty()) return
clearV2XMarkers()
val markerOptionsList = ArrayList<MarkerOptions>()
for (v2xEvent in v2XEvents) {
for (v2xEvent in v2XEventData) {
val center = v2xEvent.center
if (center != null) {
val markerOption = MarkerOptions()