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

Merge branch 'dev_robotaxi-d-app-module_280_220608_2.8.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_280_220608_2.8.0

Browse Source
This commit is contained in:
xinfengkun
2022-06-24 14:11:17 +08:00
parent 9e04754720 8af7319f47
commit 1471bed2af
3 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/identify/IdentifyOriginDataDrawer.kt
View File

@@ -13,6 +13,7 @@ import mogo.telematics.pad.MessagePad.TrackedObject
import java.util.* import java.util.*
import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentHashMap
import java.util.function.Consumer import java.util.function.Consumer
import kotlin.collections.ArrayList
/** /**
* @author xiaoyuzhou * @author xiaoyuzhou
@@ -52,37 +53,36 @@ class IdentifyOriginDataDrawer : Identify {
//todo reset color //todo reset color
override fun renderPlanningWarningObj(planningObjects: List<MessagePad.PlanningObject>?) { override fun renderPlanningWarningObj(planningObjects: List<MessagePad.PlanningObject>?) {
// if (planningObjects == null) { // todo test code 用于模拟感知物
// if (colorTrafficData.size == 0) { // val resultList: ArrayList<TrackedObject> = ArrayList()
// return // val obj = TrackedObject.newBuilder().setUuid(67025).setLongitude(112.57413261072935).setLatitude(26.821571389153718).setHeading(329.9748205834151).setSpeed(0.0).setType(3).build()
// } // resultList.add(obj)
// colorTrafficData.forEach { // renderAdasRecognizedResult(resultList)
// val cacheData = mMarkersCaches[it] //todo 是否要直接绘制 还是等下一帧
// if (cacheData != null) { if (planningObjects == null) {
// mMarkersCaches[it] = cacheData.toBuilder().setColor("#D8D8D8FF").build() if (colorTrafficData.size == 0) {
// } return
// } }
// colorTrafficData.clear() colorTrafficData.forEach {
// return val cacheData = mMarkersCaches[it] //todo 是否要直接绘制 还是等下一帧
// } if (cacheData != null) {
// val tempTrafficData = ArrayList<TrackedObject>() mMarkersCaches[it] = cacheData.toBuilder().setColor("#D8D8D8FF").build()
// planningObjects.forEach { }
// val trackId = it.uuid.toString() }
// val cacheData = mMarkersCaches[trackId] colorTrafficData.clear()
// if (cacheData != null) { return
// colorTrafficData.add(trackId) }
// when (it.type) { val tempTrafficData = ArrayList<TrackedObject>()
// 0 -> { planningObjects.forEach {
// tempTrafficData.add(cacheData.toBuilder().setColor("#FF3C45FF").build()) val trackId = it.uuid.toString()
// } val cacheData = mMarkersCaches[trackId]
// 1 -> { if (cacheData != null) {
// tempTrafficData.add(cacheData.toBuilder().setColor("#FFD53EFF").build()) colorTrafficData.add(trackId)
// } tempTrafficData.add(cacheData.toBuilder().setColor("#FFD53EFF").build())
// } }
// } MogoMarkerManager.getInstance(AbsMogoApplication.getApp())
// MogoMarkerManager.getInstance(AbsMogoApplication.getApp()) .updateBatchMarkerPosition(tempTrafficData)
// .updateBatchMarkerPosition(tempTrafficData) }
// }
} }
/** /**

3
libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java
View File

@@ -130,6 +130,9 @@ public class ObjectUtils {
markerOptions.setRotateAngle((float) trafficData.getHeading()); markerOptions.setRotateAngle((float) trafficData.getHeading());
markerOptions.setLat(trafficData.getLatitude()); markerOptions.setLat(trafficData.getLatitude());
markerOptions.setLon(trafficData.getLongitude()); markerOptions.setLon(trafficData.getLongitude());
if(trafficData.getColor()!=null && !trafficData.getColor().isEmpty()){
markerOptions.setColor(trafficData.getColor());
}
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }

10
modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java
View File

@@ -376,9 +376,9 @@ public class RouteOverlayDrawer {
isExcept = true; isExcept = true;
} }
long drawEnd = SystemClock.elapsedRealtime(); long drawEnd = SystemClock.elapsedRealtime();
Log.d("Route", "draw cost:" + (drawEnd - drawStart) + "ms and isExcept:" + isExcept + "::removeCount:" + removeCount + "::total:" + total); // Log.d("Route", "draw cost:" + (drawEnd - drawStart) + "ms and isExcept:" + isExcept + "::removeCount:" + removeCount + "::total:" + total);
} catch (Throwable t) { } catch (Throwable t) {
Log.d("Route","error:" + Log.getStackTraceString(t)); // Log.d("Route","error:" + Log.getStackTraceString(t));
} finally { } finally {
try { try {
if (isExcept) { if (isExcept) {
@@ -394,7 +394,7 @@ public class RouteOverlayDrawer {
} }
} }
} catch (Throwable t) { } catch (Throwable t) {
Log.d("Route", "error2:" + Log.getStackTraceString(t)); // Log.d("Route", "error2:" + Log.getStackTraceString(t));
} }
} }
} }
@@ -431,10 +431,10 @@ public class RouteOverlayDrawer {
// 计算车辆与点之间的夹角 // 计算车辆与点之间的夹角
long diffAngle = DrivingDirectionUtils.getDegreeOfCar2Poi2( long diffAngle = DrivingDirectionUtils.getDegreeOfCar2Poi2(
car_lon, car_lat, lon, lat, car_head); car_lon, car_lat, lon, lat, car_head);
Log.d("Route", "isPointOnCarFront: angle->" + diffAngle); // Log.d("Route", "isPointOnCarFront: angle->" + diffAngle);
return diffAngle; return diffAngle;
} finally { } finally {
Log.d("Route", "isPointOnCarFront cost:" + (SystemClock.elapsedRealtime() - start) + "ms"); // Log.d("Route", "isPointOnCarFront cost:" + (SystemClock.elapsedRealtime() - start) + "ms");
} }
} }
} }