diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackObj.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackObj.java index a5a74dadd5..512ef7bc19 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackObj.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackObj.java @@ -107,18 +107,18 @@ public class TrackObj { private void calHeading() { //更正数据,速度小于LIMIT_SPEED使用上一帧数据 - if (relativeStatic()) { - if (roadAngle != 0.0) { - CenterLine centerLine = CallerMapUIServiceManager.INSTANCE.getMapUIController().getCenterLineInfo(lon, lat, -1); - if (centerLine != null && centerLine.getAngle() != 0) { - cacheData = cacheData.toBuilder().setHeading(centerLine.getAngle()).build(); - } else { - cacheData = cacheData.toBuilder().setHeading(circleQueue.getLastFrame().getHeading()).build(); - } - } else { - cacheData = cacheData.toBuilder().setHeading(circleQueue.getLastFrame().getHeading()).build(); - } - } +// if (relativeStatic()) { +// if (roadAngle != 0.0) { +// CenterLine centerLine = CallerHDMapManager.INSTANCE.getCenterLineInfo(lon, lat, -1); +// if (centerLine != null && centerLine.getAngle() != 0) { +// cacheData = cacheData.toBuilder().setHeading(centerLine.getAngle()).build(); +// } else { +// cacheData = cacheData.toBuilder().setHeading(circleQueue.getLastFrame().getHeading()).build(); +// } +// } else { +// cacheData = cacheData.toBuilder().setHeading(circleQueue.getLastFrame().getHeading()).build(); +// } +// } } public double getRecentlyTime() { diff --git a/libraries/mogo-adas-data/src/main/proto/SocketDownDataProto3.proto b/libraries/mogo-adas-data/src/main/proto/SocketDownDataProto3.proto new file mode 100644 index 0000000000..b101f6234c --- /dev/null +++ b/libraries/mogo-adas-data/src/main/proto/SocketDownDataProto3.proto @@ -0,0 +1,78 @@ +syntax = "proto3"; +package mogo.yycp.service; +option java_package = "mogo.yycp.api.proto"; +option java_outer_classname = "SocketDownData"; +/* +message xxx { + // 字段规则:required -> 字段只能也必须出现 1 次 + // 字段规则:optional -> 字段可出现 0 次或1次 + // 字段规则:repeated -> 字段可出现任意多次(包括 0) + // 类型:int32、int64、sint32、sint64、string、32-bit .... + // 字段编号:0 ~ 536870911(除去 19000 到 19999 之间的数字) + 字段规则 类型 名称 = 字段编号; +} +*/ +//返回车机主实体 +message SocketDownDataProto { + uint64 seq = 1; + uint32 msgType = 2; + string sn = 3; + LauncherSnapshotProto data = 4; + uint64 utcTime = 5; + uint64 upUtcTime = 6; + string cityCode = 7; +} + +//LauncherSnapshot数据响应VO +message LauncherSnapshotProto { + //总数据集合 RoadDataVo + repeated CloudRoadDataProto allList = 1; + //前方50米数据集合 RoadDataVo + repeated CloudRoadDataProto nearList = 2; + //摄像头 RoadDataVo + CloudRoadDataProto camera = 3; + string msgId = 4; + uint64 time = 5; + //过期时间 + uint64 expire = 6; +} +//RoadDataVo +message CloudRoadDataProto { + /**物体类型 1-人 2-自行车 3-小轿车 4-摩托车 5-红绿灯 6-bus 8-truck 9-路边摄像头*/ + uint32 type = 1; + /**数据来源 1,"自车数据" 2,"ADAS数据" 3,"路测设备识别数据" */ + uint32 fromType = 2; + /** + * 车机上行pgs坐标给lat,lon两个成员变量 + * + * 在下发车机时计算高德经纬度 + * 1.将gps(lat,lon)给wgslat,wgalon + * 2.高德算法算出高德经纬度,给lat,lon + */ + double lat = 3; //gps->gd + double lon = 4; //gps->gd + double wgslat = 5; //原gps + double wgslon = 6; //原gps + //车机sn + string sn = 7; + //车辆UUID + string uuid = 8; + /** 车牌号 */ + string cardId = 9; + /**速度*/ + double speed = 10; + /**方向*/ + double heading = 11; + /** 系统时间 */ + uint64 systemTime = 12; + /** 星历时间 */ + uint64 satelliteTime = 13; + /**红绿灯状态 1红 2绿 3黄*/ + uint32 lightStatus = 14; + /**红绿灯剩余时间 读秒*/ + uint32 lightLeftTime = 15; + /**视频流直播地址*/ + string rtmpUrl = 16; + /**距离*/ + double distance = 17; +}