diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java index 4789fa73c3..ee1cf31676 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java @@ -216,37 +216,37 @@ class BaseDrawer { return Car3DModelColor.Normal.color; } // 距离策略 todo 此处两种策略是临时方案 -// double[] coordinates = getCurCoordinates(); -// double distance = CoordinateUtils.calculateLineDistance(lon, lat, coordinates[0], coordinates[1]) * 100; -// if (distance < 50) { -// return Car3DModelColor.Dangerous.color; -// } else if (distance < 100 && distance >= 50) { -// return Car3DModelColor.Warming.color; -// } -// -//// 他车车速和自车车速对比速度策略 -//// 自车速度 >= 50% 危险 -//// 10% < 自车速度 < 50% 警告 -// double curSpeed = getCurSpeed(); -// if (curSpeed > 0 && speed > curSpeed) { -// double rate = ((speed - curSpeed) / curSpeed) * 100; -// if (rate >= 50) { -// return Car3DModelColor.Dangerous.color; -// } else if (rate > 10 && rate < 50) { -// return Car3DModelColor.Warming.color; -// } -// } + double[] coordinates = getCurCoordinates(); + double distance = CoordinateUtils.calculateLineDistance(lon, lat, coordinates[0], coordinates[1]) * 100; + if (distance < 50) { + return Car3DModelColor.Dangerous.color; + } else if (distance < 100 && distance >= 50) { + return Car3DModelColor.Warming.color; + } + +// 他车车速和自车车速对比速度策略 +// 自车速度 >= 50% 危险 +// 10% < 自车速度 < 50% 警告 + double curSpeed = getCurSpeed(); + if (curSpeed > 0 && speed > curSpeed) { + double rate = ((speed - curSpeed) / curSpeed) * 100; + if (rate >= 50) { + return Car3DModelColor.Dangerous.color; + } else if (rate > 10 && rate < 50) { + return Car3DModelColor.Warming.color; + } + } // 默认颜色 - switch (fromType) { - case FROM_ADAS: - return Car3DModelColor.Normal_Visual.color; - case FROM_ROAD_UNIT: - return Car3DModelColor.Normal_Cloud.color; - default: - return Car3DModelColor.Normal.color; - } -// return Car3DModelColor.Normal.color; +// switch (fromType) { +// case FROM_ADAS: +// return Car3DModelColor.Normal_Visual.color; +// case FROM_ROAD_UNIT: +// return Car3DModelColor.Normal_Cloud.color; +// default: +// return Car3DModelColor.Normal.color; +// } + return Car3DModelColor.Normal.color; } /** diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java index 91123607f8..0516941c01 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java @@ -304,16 +304,16 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic double[] matchLonLat = getMatchLonLat(cloudRoadData.getUuid(), cloudRoadData.getWgslon(), cloudRoadData.getWgslat(), cloudRoadData.getHeading(), lastLon, lastLat); SocketDownData.CloudRoadDataProto.Builder builder = cloudRoadData.toBuilder(); -// builder.setWgslon(matchLonLat[0]); -// builder.setWgslat(matchLonLat[1]); - builder.setWgslon(56.0); - builder.setWgslat(57.0); + builder.setWgslon(matchLonLat[0]); + builder.setWgslat(matchLonLat[1]); +// builder.setWgslon(56.0); +// builder.setWgslat(57.0); - double lon = cloudRoadData.getWgslon(); - Log.d(TAG, "test lon : " + lon); +// double lon = cloudRoadData.getWgslon(); +// Log.d(TAG, "test lon : " + lon); -// cloudRoadData = builder.build(); + cloudRoadData = builder.build(); mLastPositions.put(uniqueKey, cloudRoadData);