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

Merge branch 'dev_robo_240612_6.5.0_tmp' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robo_240612_6.5.0_tmp

Browse Source
This commit is contained in:
aibingbing
2024-06-27 16:30:29 +08:00
parent cd29088ed2 cf15735d93
commit b6ccf3c8f4
3 changed files with 182 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
View File

@@ -55,7 +55,7 @@
android:id="@+id/speedView"
android:layout_width="@dimen/dp_240"
android:layout_height="@dimen/dp_120"
android:layout_marginTop="@dimen/dp_100"
android:layout_marginTop="@dimen/dp_110"
android:layout_marginStart="@dimen/dp_50"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -66,7 +66,7 @@
android:layout_width="@dimen/dp_120"
android:layout_height="@dimen/dp_120"
android:layout_marginStart="@dimen/dp_60"
android:layout_marginTop="100dp"
android:layout_marginTop="110dp"
android:background="@drawable/taxi_p_bg_roma_selector"
app:layout_constraintStart_toEndOf="@+id/speedView"
app:layout_constraintTop_toTopOf="parent"
@@ -78,18 +78,44 @@
android:layout_width="@dimen/dp_334"
android:layout_height="@dimen/dp_120"
android:layout_marginStart="@dimen/dp_50"
android:layout_marginTop="100dp"
android:layout_marginTop="110dp"
app:roma_distance_bg="@drawable/taxi_p_roma_distance_bg"
app:layout_constraintLeft_toRightOf="@+id/romaPView"
app:layout_constraintTop_toTopOf="parent"
app:roma_change_dis_color="true" />
<!-- 红绿灯 -->
<com.mogo.eagle.core.function.hmi.ui.widget.SingleTrafficLightView
android:id="@+id/traffic_light_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_93"
android:layout_marginEnd="@dimen/dp_40"
android:visibility="gone"
app:layout_constraintEnd_toStartOf="@+id/rbv_setting_music"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:traffic_light_user="traffic_light_taxi_p" />
<!--转向灯-->
<com.mogo.eagle.core.function.hmi.ui.vehicle.TurnLightViewStatus
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_110"
android:layout_marginEnd="@dimen/dp_40"
app:layout_constraintRight_toLeftOf="@id/traffic_light_view"
app:layout_constraintTop_toTopOf="parent"
app:user="taxi_p" />
<com.mogo.och.taxi.passenger.ui.bar.RightBarView
android:id="@+id/rbv_setting_music"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="@dimen/dp_40"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="@dimen/dp_110"
android:layout_width="wrap_content"
android:layout_height="match_parent"/>
android:layout_height="wrap_content"/>
<com.mogo.och.taxi.passenger.ui.bar.LeftBarView
android:id="@+id/lbv_go2_center"
@@ -103,8 +129,8 @@
<com.mogo.och.taxi.passenger.ui.music.MusicView
android:id="@+id/mv_music_info"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="@dimen/dp_52"
android:layout_marginEnd="@dimen/dp_130"
android:visibility="gone"
android:clickable="true"
@@ -116,34 +142,11 @@
android:layout_width="@dimen/dp_858"
android:layout_height="@dimen/dp_537"
android:layout_marginEnd="@dimen/dp_130"
android:layout_marginTop="@dimen/dp_60"
android:visibility="gone"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<!-- 红绿灯 -->
<com.mogo.eagle.core.function.hmi.ui.widget.SingleTrafficLightView
android:id="@+id/traffic_light_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_83"
android:layout_marginRight="@dimen/dp_40"
android:visibility="gone"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:traffic_light_user="traffic_light_taxi_p" />
<!--转向灯-->
<com.mogo.eagle.core.function.hmi.ui.vehicle.TurnLightViewStatus
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_100"
android:layout_marginEnd="@dimen/dp_40"
app:layout_constraintRight_toLeftOf="@id/traffic_light_view"
app:layout_constraintTop_toTopOf="parent"
app:user="taxi_p" />
<!-- 路程信息 -->
<com.mogo.och.taxi.passenger.ui.orderinfo.ItineraryView
android:id="@+id/itinerary"

59
OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
View File

@@ -54,7 +54,7 @@
android:id="@+id/speedView"
android:layout_width="@dimen/dp_240"
android:layout_height="@dimen/dp_120"
android:layout_marginTop="@dimen/dp_100"
android:layout_marginTop="@dimen/dp_110"
android:layout_marginStart="@dimen/dp_50"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -66,7 +66,7 @@
android:layout_width="@dimen/dp_120"
android:layout_height="@dimen/dp_120"
android:layout_marginStart="@dimen/dp_60"
android:layout_marginTop="100dp"
android:layout_marginTop="110dp"
android:background="@drawable/taxt_u_p_roma_bg_selector"
app:layout_constraintStart_toEndOf="@+id/speedView"
app:layout_constraintTop_toTopOf="parent"
@@ -78,18 +78,44 @@
android:layout_width="@dimen/dp_334"
android:layout_height="@dimen/dp_120"
android:layout_marginStart="@dimen/dp_50"
android:layout_marginTop="100dp"
android:layout_marginTop="110dp"
app:roma_distance_bg="@drawable/taxi_u_p_roma_distance_bg"
app:layout_constraintLeft_toRightOf="@+id/romaPView"
app:layout_constraintTop_toTopOf="parent"
app:roma_change_dis_color="true" />
<!-- 红绿灯 -->
<com.mogo.eagle.core.function.hmi.ui.widget.SingleTrafficLightView
android:id="@+id/traffic_light_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_93"
android:layout_marginEnd="@dimen/dp_40"
android:visibility="gone"
app:layout_constraintEnd_toStartOf="@+id/rbv_setting_music"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:traffic_light_user="traffic_light_taxi_p" />
<!--转向灯-->
<com.mogo.eagle.core.function.hmi.ui.vehicle.TurnLightViewStatus
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_110"
android:layout_marginEnd="@dimen/dp_40"
app:layout_constraintRight_toLeftOf="@id/traffic_light_view"
app:layout_constraintTop_toTopOf="parent"
app:user="taxi_p" />
<com.mogo.och.taxi.passenger.ui.bar.RightBarView
android:id="@+id/rbv_setting_music"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="@dimen/dp_110"
android:layout_marginEnd="@dimen/dp_40"
android:layout_width="wrap_content"
android:layout_height="match_parent"/>
android:layout_height="wrap_content"/>
<com.mogo.och.taxi.passenger.ui.bar.LeftBarView
android:id="@+id/lbv_go2_center"
@@ -104,9 +130,9 @@
<com.mogo.och.taxi.passenger.ui.music.MusicView
android:id="@+id/mv_music_info"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="@dimen/dp_130"
android:layout_marginTop="@dimen/dp_52"
android:visibility="gone"
android:clickable="true"
android:layout_width="@dimen/dp_746"
@@ -117,32 +143,11 @@
android:layout_width="@dimen/dp_858"
android:layout_height="@dimen/dp_537"
android:layout_marginEnd="@dimen/dp_130"
android:layout_marginTop="@dimen/dp_60"
android:visibility="gone"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<!-- 红绿灯 -->
<com.mogo.eagle.core.function.hmi.ui.widget.SingleTrafficLightView
android:id="@+id/traffic_light_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_83"
android:layout_marginEnd="@dimen/dp_40"
android:visibility="gone"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:traffic_light_user="traffic_light_taxi_p" />
<!--转向灯-->
<com.mogo.eagle.core.function.hmi.ui.vehicle.TurnLightViewStatus
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_100"
android:layout_marginEnd="@dimen/dp_40"
app:layout_constraintRight_toLeftOf="@id/traffic_light_view"
app:layout_constraintTop_toTopOf="parent"
app:user="taxi_p" />
<!-- 路程信息 -->
<com.mogo.och.unmanned.passenger.ui.orderinfo.ItineraryView

212
libraries/mogo-adas-data/src/main/proto/message_pad.proto
View File

@@ -18,6 +18,13 @@ enum MessageType
MsgTypeSweeperTaskIndexData = 0x00002; //清扫车指标数据 定频10hz
MsgTypeObuWarningData = 0x00003; //obu预警事件 不定频
MsgTypeCameraCalibCheckData30 = 0x01001; //相机标定检查视频, 10hz, jpeg. image_raw_30
MsgTypeCameraCalibCheckData60 = 0x01002; //相机标定检查视频, 10hz, jpeg. image_raw_60
MsgTypeCameraCalibCheckData120Front = 0x01003; //相机标定检查视频, 10hz, jpeg. image_raw_120
MsgTypeCameraCalibCheckData120Back = 0x01004; //相机标定检查视频, 10hz, jpeg. image_raw_back
MsgTypeCameraCalibCheckData120Left = 0x01005; //相机标定检查视频, 10hz, jpeg. image_raw_left
MsgTypeCameraCalibCheckData120Right = 0x01006; //相机标定检查视频, 10hz, jpeg. image_raw_right
MsgTypeTrajectory = 0x10000; //局部轨迹,车前引导线 定频10hz
MsgTypeTrackedObjects = 0x10001; //障碍物信息 定频10hz
MsgTypeGnssInfo = 0x10002; //惯导信息 定频20hz
@@ -37,6 +44,7 @@ enum MessageType
MsgTypeFMState = 0x10010; //FM状态 定频1hz bus和清扫车是MAP370开始支持，其他车型MAP360开始支持
MsgTypeFSM2024State = 0x10011; //20240531 FSM状态 定频10hz （telematics做状态变化判断，无变化10hz上报，有变化立即上报） BUS MAP440开始支持，其他车型暂未支持
MsgTypeLocState = 0x10012; //定位呈现状态透传 用于pad图标显示 1hz 所有车型MAP440开始支持
MsgTypeCloudRegulatoryWarning = 0x10013; //云控监管预警信息上报
//### 以下消息全部不定频 ###
MsgTypeBasicInfoReq = 0x10100; //自动驾驶设备基础信息请求
@@ -104,125 +112,125 @@ message ReceivedAck
// message definition for MsgTypeV2nNioGreenWavePassageEvent
message V2nCrossSpeed
{
//直行
uint32 speed_straight_min = 1;
uint32 speed_straight_max = 2;
//左转
uint32 speed_left_min = 3;
uint32 speed_left_max = 4;
//右转
uint32 speed_right_min = 5;
uint32 speed_right_max = 6;
//车道限速
uint32 max_speed = 7;
//限速来源 0融合 1默认
uint32 max_status = 8;
//路口经度
double lng = 9;
//路口纬度
double lat = 10;
//直行
uint32 speed_straight_min = 1;
uint32 speed_straight_max = 2;
//左转
uint32 speed_left_min = 3;
uint32 speed_left_max = 4;
//右转
uint32 speed_right_min = 5;
uint32 speed_right_max = 6;
//车道限速
uint32 max_speed = 7;
//限速来源 0融合 1默认
uint32 max_status = 8;
//路口经度
double lng = 9;
//路口纬度
double lat = 10;
}
// message definition for MsgTypeV2nNioCongestionEvent
message V2nCongestion
{
// 消息时间,发送消息时间戳，单位毫秒
uint64 msg_time = 1;
// 消息名称
string msg_name = 2;
// 数据源，0:路侧设备、1:人工上报、2:地图、3:三方数据源
uint32 data_source = 3;
// 路段拥堵详情
repeated CongestionInfo infos = 4;
// 消息时间,发送消息时间戳，单位毫秒
uint64 msg_time = 1;
// 消息名称
string msg_name = 2;
// 数据源，0:路侧设备、1:人工上报、2:地图、3:三方数据源
uint32 data_source = 3;
// 路段拥堵详情
repeated CongestionInfo infos = 4;
}
message Geo{
// 经度
double lon = 1;
// 维度
double lat = 2;
// 经度
double lon = 1;
// 维度
double lat = 2;
}
message EventLocationGeo{
//开始经度--队头
double startLng = 1;
//开始纬度--队头
double startLat = 2;
//结束经度 -- 队尾
double endLng = 3;
//结束纬度 --队尾
double endLat =4;
// 事件区域--- 车道中心线的坐标
repeated Geo regions = 5;
//开始经度--队头
double startLng = 1;
//开始纬度--队头
double startLat = 2;
//结束经度 -- 队尾
double endLng = 3;
//结束纬度 --队尾
double endLat =4;
// 事件区域--- 车道中心线的坐标
repeated Geo regions = 5;
}
message TimePeriod{
// 事件开始时间，UTC+0 时间戳，精确到毫秒
uint64 start_time = 1;
// 事件结束时间，UTC+0 时间戳，精确到毫秒，没有传 0
uint64 end_time = 2;
// 事件更新时间，UTC+0 时间戳，精确到毫秒，没有传 0
uint64 update_time = 3;
// 事件确认时间，UTC+0 时间戳，精确到毫秒，没有传 0
uint64 confirm_time = 4;
// 事件开始时间，UTC+0 时间戳，精确到毫秒
uint64 start_time = 1;
// 事件结束时间，UTC+0 时间戳，精确到毫秒，没有传 0
uint64 end_time = 2;
// 事件更新时间，UTC+0 时间戳，精确到毫秒，没有传 0
uint64 update_time = 3;
// 事件确认时间，UTC+0 时间戳，精确到毫秒，没有传 0
uint64 confirm_time = 4;
}
message CongestionInfo
{
// 事件状态，0:消散、1:生成
uint32 data_status = 1;
// 事件时间相关信息
TimePeriod time_period = 2;
// 事件发生位置的经纬度信息
EventLocationGeo event_location_geo = 3;
//事件发生的原始照片
repeated string img_file_key = 4;
// 事件类型, 101 施工、 102 三角牌, 103 静止车,104 拥堵
uint32 event_type = 5;
// 事件唯一性
string msg_uuid = 6;
// 拥堵等级 1，畅通，2，缓行，3，拥堵，4，严重拥堵
uint32 congestion_level = 7;
// 车道号
uint32 lane_no = 8;
// 拥堵细类 0，路段拥堵，1 路口拥堵
uint32 congestion_type = 9;
// 车道方向，正北是0，顺时针方向
double bearing = 10;
// 如果拥堵细类是路口，则有该路口中心点坐标
double lon = 11;
double lat = 12;
// 视频地址 2024-06-03新增字段
string video_url = 13;
// 来源ip 2024-06-03 新增字段
string camera_ip = 14;
// 事件状态，0:消散、1:生成
uint32 data_status = 1;
// 事件时间相关信息
TimePeriod time_period = 2;
// 事件发生位置的经纬度信息
EventLocationGeo event_location_geo = 3;
//事件发生的原始照片
repeated string img_file_key = 4;
// 事件类型, 101 施工、 102 三角牌, 103 静止车,104 拥堵
uint32 event_type = 5;
// 事件唯一性
string msg_uuid = 6;
// 拥堵等级 1，畅通，2，缓行，3，拥堵，4，严重拥堵
uint32 congestion_level = 7;
// 车道号
uint32 lane_no = 8;
// 拥堵细类 0，路段拥堵，1 路口拥堵
uint32 congestion_type = 9;
// 车道方向，正北是0，顺时针方向
double bearing = 10;
// 如果拥堵细类是路口，则有该路口中心点坐标
double lon = 11;
double lat = 12;
// 视频地址 2024-06-03新增字段
string video_url = 13;
// 来源ip 2024-06-03 新增字段
string camera_ip = 14;
}
enum EventType
{
CONVERSE_RUNNING = 0;//逆行/倒车
SLOW_RUNNING = 1;//慢行
SPEEDING_RUNNING = 2;//快行
EMERGENCY_BRAKING = 3;//紧急制动
ABNORMAL_PARKING = 4;//异常停车
NON_VEHICLE_INTRUSION = 5;//行人/非机动车闯入
CONVERSE_RUNNING = 0;//逆行/倒车
SLOW_RUNNING = 1;//慢行
SPEEDING_RUNNING = 2;//快行
EMERGENCY_BRAKING = 3;//紧急制动
ABNORMAL_PARKING = 4;//异常停车
NON_VEHICLE_INTRUSION = 5;//行人/非机动车闯入
}
// message definition for MsgTypeV2nNioCrossoverEvent / MsgTypeV2nNioOtherRetrogradeEvent
message Event
{
uint32 channelId = 1; //渠道来源，mogo默认10
uint64 rcuId = 2; //平台未维护，暂用基站号
EventType eventType = 3; //事件类别
uint32 confidence = 4; //事件置信度
uint32 gnssType = 5; //坐标系类型， 0:GCJ02坐标系，2:WGS84坐标系
double longitude = 6;
double latitude = 7;
uint64 timestamp = 8; //时间戳
string eventId = 9; // 事件id
string exts = 10; //扩展字段，传递相机ip，{"cameraIp":"172.18.7.40"}
uint32 targetIdsLen = 11; //事件关联的目标对象uuid个数
repeated string targetIds = 12; //事件关联的目标对象uuid列表
uint32 channelId = 1; //渠道来源，mogo默认10
uint64 rcuId = 2; //平台未维护，暂用基站号
EventType eventType = 3; //事件类别
uint32 confidence = 4; //事件置信度
uint32 gnssType = 5; //坐标系类型， 0:GCJ02坐标系，2:WGS84坐标系
double longitude = 6;
double latitude = 7;
uint64 timestamp = 8; //时间戳
string eventId = 9; // 事件id
string exts = 10; //扩展字段，传递相机ip，{"cameraIp":"172.18.7.40"}
uint32 targetIdsLen = 11; //事件关联的目标对象uuid个数
repeated string targetIds = 12; //事件关联的目标对象uuid列表
}
// message definition for MsgTypeTrajectory
@@ -240,6 +248,18 @@ message TrajectoryPoint
double reversedAccumulatedDis = 10; //从当前到终点的距离
}
// message definition for MsgTypeCloudRegulatoryWarning
message CloudRegulatoryWarning
{
repeated CloudRegulatoryWarningInner cloudRegulatoryWarnings = 1;
}
message CloudRegulatoryWarningInner
{
uint32 type = 1; //0:车辆位置异常 1:自动驾驶脱离 2:超速行驶 3:非机动车逆行
string desc = 2;
}
message Trajectory
{
repeated TrajectoryPoint points = 1;
@@ -291,9 +311,12 @@ message TrackedObject
repeated TrackedSource tracked_source = 14;
repeated Location polygon = 15;
geometry.Point center = 16;
AdditionalAttribute add_attribute = 17; // 事件类型
AdditionalAttribute add_attribute = 17; //事件类型
double angle = 18; //相对于自车x轴的角度，左正右负
reserved 19 to 100;
repeated string image_url = 19; //事件发生的原始照片
string video_url = 20; //事件发生的原始视频
string camera_ip = 21; //来源IP
reserved 22 to 100;
string strUuid = 101;//String类型车辆ID
}
@@ -775,6 +798,7 @@ message SetOneParam
// 15：座椅状态(int) 0:表示仅主驾位有人,1:表示仅副驾位有人,2:表示主驾和副驾同时有人,3:表示仅后排有人,4:表示主驾有人+后排有人,5:表示副驾有人+后排有人,6:表示主驾和副驾同时有人+后排有人,7: 所有座位都无人, 255:缺省
// 16: 超车的最大速度阈值(double, m/s) T1/T2: 范围[3, 12.5], 默认值10
// 17: 故障模拟指令(int) default:0, 1:线控失效
// 18: 碰撞上报(null)
string value = 2; // 转成字符串的值
}