Merge branch 'dev_robotaxi-d-app-module_290_220715_2.9.0_interface_subscribe' into dev_robotaxi-d-app-module_2100_220816_2.10.0

This commit is contained in:
zhongchao
2022-08-16 17:49:24 +08:00
52 changed files with 1907 additions and 133 deletions

View File

@@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.map.identify
import android.os.Handler
import android.os.Message
import android.util.Log
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.mogo.thread.WorkThreadHandler
@@ -20,7 +21,7 @@ object IdentifyFactory : Identify {
private var identify: Identify? = null
init {
identify = if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
identify = if (FunctionBuildConfig.isBeautyMode) {
UserIdentify.beautifyDataDrawer
} else {
DriverIdentify.originDataDrawer
@@ -36,6 +37,17 @@ object IdentifyFactory : Identify {
object : Handler(WorkThreadHandler.newInstance("IdentifyFactoryDrawer").looper) {
override fun handleMessage(msg: Message) {
super.handleMessage(msg)
if(!FunctionBuildConfig.isBeautyMode){
if(identify is IdentifyBeautifyDataDrawer){
identify!!.clearOldMarker()
identify = DriverIdentify.originDataDrawer
}
}else{
if(identify is IdentifyOriginDataDrawer){
identify!!.clearOldMarker()
identify = UserIdentify.beautifyDataDrawer
}
}
when(msg.what){
MSG_DATA_TRACK -> {
if(msg.obj is List<*>){

View File

@@ -154,11 +154,11 @@ class IdentifyOriginDataDrawer : Identify, IMoGoAutopilotStatusListener {
//首次过来的数据不添加,首次未添加的感知物在调用完绘制方法后再塞入cache map
val cacheData = mMarkersCaches[uuid]
if (cacheData != null) {
if (data.speed < 0.5) {
temp = data.toBuilder().setHeading(cacheData.heading)
.setLongitude(cacheData.longitude)
.setLatitude(cacheData.latitude).build()
}
// if (data.speed < 0.5) {
// temp = data.toBuilder().setHeading(cacheData.heading)
// .setLongitude(cacheData.longitude)
// .setLatitude(cacheData.latitude).build()
// }
if (colorTrafficData.containsKey(uuid)) {
val planningTrack = colorTrafficData[uuid]
if (!timeOut(planningTrack!!.time)) {