diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_overmap.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_overmap.xml index f1981cb77e..f8f987224e 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_overmap.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_overmap.xml @@ -65,6 +65,7 @@ = 1000) { lostFrame(internal.toString()) identify.clearOldMarker() - preIdentify.clearOldMarker() } sendEmptyMessageDelayed(MSG_CHECK, 1000L) } MSG_DATA_TRACK -> { if (msg.obj is List<*>) { - val objectList = msg.obj as List? - val mapInstanceList = ArrayList() - mapInstanceList.add(MogoMap.DEFAULT) -// if (FunctionBuildConfig.isDrawDecIdentifyData) { -// mapInstanceList.add(MogoMap.SMALL_DES_MAP) -// } - if (FunctionBuildConfig.isDrawPreIdentifyData) { - mapInstanceList.add(MogoMap.SMALL_PRED_MAP) - } - identify.renderAdasRegResults(objectList, mapInstanceList) + identify.renderAdasRecognizedResult(msg.obj as List?) startTime = System.nanoTime() } } @@ -130,15 +88,6 @@ object IdentifyFactory : Identify, IMoGoObuStatusListener, IMoGoAutopilotCarConf } } - MSG_DATA_PRE_TRACK -> { - if (msg.obj is List<*>) { - val objectList = msg.obj as List -// preIdentify.renderPredictionResult(objectList, MogoMap.SMALL_PRED_MAP) -// preIdentify2.renderPredictionResult(objectList, MogoMap.SMALL_PRED_MAP2) -// preIdentify3.renderPredictionResult(objectList, MogoMap.SMALL_PRED_MAP3) - } - } - MSG_DATA_WARNING -> { if (msg.obj is List<*>) { identify.renderPlanningWarningObj(msg.obj as List?) @@ -158,21 +107,12 @@ object IdentifyFactory : Identify, IMoGoObuStatusListener, IMoGoAutopilotCarConf } MSG_DATA_CLEAR -> { - val mapInstanceList = ArrayList() - mapInstanceList.add(MogoMap.DEFAULT) - mapInstanceList.add(MogoMap.SMALL_PRED_MAP) - identify.clearOldMarkers(mapInstanceList) + identify.clearOldMarker() } MSG_DATA_AI_CLEAR -> { aiCloudIdentify!!.clearAiMarker(msg.data.getString("mapInstance")!!) } - - MSG_DATA_PRE_CLEAR -> { - preIdentify.clearPredictionMarker(MogoMap.SMALL_PRED_MAP) -// preIdentify2.clearPredictionMarker(MogoMap.SMALL_PRED_MAP2) -// preIdentify3.clearPredictionMarker(MogoMap.SMALL_PRED_MAP3) - } } } } @@ -184,13 +124,6 @@ object IdentifyFactory : Identify, IMoGoObuStatusListener, IMoGoAutopilotCarConf mDrawerHandler.sendMessage(message) } - override fun renderPredictionResult(predictionObjectList: List?) { - val message = Message.obtain() - message.what = MSG_DATA_PRE_TRACK - message.obj = predictionObjectList - mDrawerHandler.sendMessage(message) - } - override fun renderAiCloudResult( resultList: List, mapInstance: String @@ -222,12 +155,6 @@ object IdentifyFactory : Identify, IMoGoObuStatusListener, IMoGoAutopilotCarConf mDrawerHandler.sendMessage(message) } - override fun clearPredictionMarker(mapInstance: String) { - val message = Message.obtain() - message.what = MSG_DATA_PRE_CLEAR - mDrawerHandler.sendMessage(message) - } - override fun updateTrackerWarningInfo(trafficData: TrafficData) { super.updateTrackerWarningInfo(trafficData) val message = Message.obtain() diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/TravelRealityView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/TravelRealityView.kt index 10504d899b..8bd78e4c36 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/TravelRealityView.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/TravelRealityView.kt @@ -420,6 +420,13 @@ class TravelRealityView @JvmOverloads constructor( what = CLEAR_ALL_DATA nonFrequentHandler?.sendMessage(this) } + UiThreadHandler.post { + smallSiteMarkerList?.forEach { + it.destroy() + } + smallSiteMarkerList = null + clearPolyline() + } mSiteList.clear() }