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

Merge branch 'dev_minibus-d_230425_3.2.0' into merge320tomaster

Browse Source
This commit is contained in:
yangyakun
2023-06-12 16:45:02 +08:00
parent 8d87ad160c af033bd736
commit 566f493203
1091 changed files with 23936 additions and 15523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt
View File

@@ -85,6 +85,8 @@ object AppConfigInfo {
var teleTimeStamp = 0L
var obuInfo:String = ""
override fun toString(): String {
return "<font color='red' size='30'>-------------------应用信息--------------------</font><br/>" +
"应用名称：${appName}<br/>" +
@@ -98,6 +100,7 @@ object AppConfigInfo {
"MAP-OPT-SDK版本：${mapSdkOptVersion}<br/>" +
"ADAS-SDK版本：${adasSdkVersion}<br/>" +
"OBU-SDK版本：${obuSdkVersion}<br/>" +
"OBU-INFO版本：${obuInfo}<br/>" +
"<font color='red' size='30'>------------------鉴权信息---------------------</font><br/>" +
"数字版权ID：${widevineIDMd5}<br/>" +
"PAD唯一标志：${uniqueDeviceId}<br/>" +

19
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt
View File

@@ -56,21 +56,6 @@ open class AutopilotStatusInfo : Serializable, Cloneable {
*/
var reason: String? = null
/**
* 摄像头状态 1代表开启，0代表关闭
*/
var camera = 0
/**
* 雷达状态 1代表开启，0代表关闭
*/
var radar = 0
/**
* RTK状态 1代表开启，0代表关闭
*/
var rtk = 0
/**
* 底盘的自动驾驶状态 0非自动驾驶，1自动驾驶
*/
@@ -89,8 +74,8 @@ open class AutopilotStatusInfo : Serializable, Cloneable {
return "connectIP=$connectIP, connectPort=$connectPort, " +
"connectStatus=$connectStatus, connectDescribe=$connectStatusDescribe, version=$version, dockVersion=$dockVersion," +
" locationStatus=$locationStatus), locationLat=$locationLat, locationLon=$locationLon," +
" satelliteTime=$satelliteTime, state=$state, reason=$reason, camera=$camera," +
" radar=$radar, rtk=$rtk, pilotmode=$pilotmode, ipcConnStatus=$ipcConnStatus, autopilotControlParameters=$autopilotControlParameters"
" satelliteTime=$satelliteTime, state=$state, reason=$reason, " +
" pilotmode=$pilotmode, ipcConnStatus=$ipcConnStatus, autopilotControlParameters=$autopilotControlParameters"
}
public override fun clone(): AutopilotStatusInfo {

36
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/pnc/PncActionsHelper.kt
View File

@@ -35,6 +35,42 @@ class PncActionsHelper {
LANE_AVOID_LEFT_VALUE, LANE_AVOID_RIGHT_VALUE -> {
if (driveAction == 2) "正在避让障碍物" else ""
}
AUTO_LANE_CHANGE_LEFT_RSI_VALUE -> {
if (driveAction == 2) "正在向左变道避让前方道路施工" else if (driveAction == 3) "变道取消" else ""
}
AUTO_LANE_CHANGE_RIGHT_RSI_VALUE -> {
if (driveAction == 2) "正在向右变道避让前方道路施工" else if (driveAction == 3) "变道取消" else ""
}
LANE_AVOID_LEFT_RSI_VALUE -> {
if (driveAction == 2) "正在向左绕行避让前方道路施工" else if (driveAction == 3) "绕行取消" else ""
}
LANE_AVOID_RIGHT_RSI_VALUE -> {
if (driveAction == 2) "正在向右绕行避让前方道路施工" else if (driveAction == 3) "绕行取消" else ""
}
AUTO_LANE_CHANGE_LEFT_RSM_VALUE -> {
if (driveAction == 2) "正在向左变道避让前方静止障碍物" else if (driveAction == 3) "变道取消" else ""
}
AUTO_LANE_CHANGE_RIGHT_RSM_VALUE -> {
if (driveAction == 2) "正在向右变道避让前方静止障碍物" else if (driveAction == 3) "变道取消" else ""
}
LANE_AVOID_LEFT_RSM_VALUE -> {
if (driveAction == 2) "正在向左绕行避让前方静止障碍物" else if (driveAction == 3) "绕行取消" else ""
}
LANE_AVOID_RIGHT_RSM_VALUE -> {
if (driveAction == 2) "正在向右绕行避让前方静止障碍物" else if (driveAction == 3) "绕行取消" else ""
}
AUTO_LANE_CHANGE_LEFT_RSI_TRIANGLE_VALUE -> {
if (driveAction == 2) "正在向左变道避让前方道路事故" else if (driveAction == 3) "变道取消" else ""
}
AUTO_LANE_CHANGE_RIGHT_RSI_TRIANGLE_VALUE -> {
if (driveAction == 2) "正在向右变道避让前方道路事故" else if (driveAction == 3) "变道取消" else ""
}
LANE_AVOID_LEFT_RSI_TRIANGLE_VALUE -> {
if (driveAction == 2) "正在向左绕行避让前方道路事故" else if (driveAction == 3) "绕行取消" else ""
}
LANE_AVOID_RIGHT_RSI_TRIANGLE_VALUE -> {
if (driveAction == 2) "正在向右绕行避让前方道路事故" else if (driveAction == 3) "绕行取消" else ""
}
// 起步状态 driving_action：1 表示正常启动；driving_action:2 表示择机起步；
START_UP_VALUE -> {
if (driveAction == 1) "正在出站" else if (driveAction == 2) "正在等待出站" else ""

2
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/CloudPoiManager.java
View File

@@ -50,8 +50,6 @@ public class CloudPoiManager {
R.drawable.module_common_icon_map_marker_road_block_up2, R.drawable.module_common_icon_map_marker_road_block_up2_white, "拥堵"));
poiWrapper.put(EventTypeEnumNew.FOURS_PONDING.getPoiType(), new PoiWrapper(EventTypeEnumNew.FOURS_PONDING.getPoiType(),
R.drawable.module_common_icon_map_marker_pondingl2, R.drawable.module_common_icon_map_marker_pondingl2_white, "积水"));
poiWrapper.put(EventTypeEnumNew.FOURS_FOG.getPoiType(), new PoiWrapper(EventTypeEnumNew.FOURS_FOG.getPoiType(),
R.drawable.module_common_ic_rc_dark_frog2, R.drawable.module_common_ic_rc_dark_frog2_white, "浓雾"));
poiWrapper.put(EventTypeEnumNew.FOURS_ICE.getPoiType(), new PoiWrapper(EventTypeEnumNew.FOURS_ICE.getPoiType(),
R.drawable.module_common_ic_rc_freeze2, R.drawable.module_common_ic_rc_freeze2_white, "结冰"));
poiWrapper.put(EventTypeEnumNew.FOURS_ACCIDENT.getPoiType(), new PoiWrapper(EventTypeEnumNew.FOURS_ACCIDENT.getPoiType(),

38
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
View File

@@ -61,18 +61,13 @@ object FunctionBuildConfig {
var isBeautyMode = true
/**
* 是否绘制云端感知物
* 开启roma自由/循迹路线
* 0:自由模式
* 1:循迹模式
*/
@Volatile
@JvmField
var isDrawAiCloudFusion = true
/**
* 是否开启roma
*/
@Volatile
@JvmField
var isRomaMode = false
var romaModeStyle = 0
/**
* 是否开启感知物替换颜色功能
@@ -202,6 +197,13 @@ object FunctionBuildConfig {
@JvmField
var isReportWarning = true
/**
* 是否是V2N新链路(云->工控机->App)
*/
@Volatile
@JvmField
var isNewV2NData = false
/**
* 是否开启PNC障碍物颜色提醒
*/
@@ -222,4 +224,22 @@ object FunctionBuildConfig {
@Volatile
@JvmField
var unableLaunchAutopilotGear: Set<Chassis.GearPosition>? = null
/**
* 当前应用是否支持patch升级
*/
@Volatile
@JvmField
var isSupportPatchUpgrade = true
/**
* 是否开启V2N场景进PNC的开关，开关默认关闭
*/
@Volatile
@JvmField
var isV2NPnc = false
@Volatile
@JvmField
var isPassStartAutopilotCommand = true
}

11
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt
View File

@@ -71,11 +71,18 @@ object HmiBuildConfig {
var isShowObuV2iView = true
/**
* 是否展示obu通过工控机展示的v2i
* 是否展示绿波通行
*/
@JvmField
@Volatile
var isShowObuToDcV2iView = true
var isShowGreenWaveView = false
/**
* 是否展示闯红灯预警
*/
@JvmField
@Volatile
var isShowRunRedLightView = false
}

8
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java
View File

@@ -101,8 +101,12 @@ public class MogoServicePaths {
@Keep
public static final String PATH_IDENTIFY = "/map/identify";
public static final String PATH_VISUAL_ANGLE = "/map/angle_change";
@Keep
public static final String PATH_VISUAL_ANGLE = "/map/angle_change";
public static final String PATH_PATCH_UPGRADE = "/patch/api";
@Keep
public static final String PATH_UPGRADE_TYPE_API = "/upgrade/type/api";
}

154
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/bindingcar/AppInfo.java
View File

@@ -1,6 +1,9 @@
package com.mogo.eagle.core.data.deva.bindingcar;
import com.google.gson.annotations.SerializedName;
import java.io.Serializable;
import java.util.Objects;
/**
* @author lixiaopeng
@@ -19,6 +22,9 @@ public class AppInfo implements Serializable {
private String endTime;
private String appFileName;
@SerializedName("patchInfoView")
public PatchInfo patchInfo;
public String getAppUrl() {
return appUrl;
}
@@ -111,7 +117,155 @@ public class AppInfo implements Serializable {
", installType='" + installType + '\'' +
", beginTime='" + beginTime + '\'' +
", endTime='" + endTime + '\'' +
", patchInfo=" + patchInfo +
", appFileName='" + appFileName + '\'' +
'}';
}
public static class PatchInfo implements Serializable {
private Integer sourceId;
private String sourceMd5;
private String sourceVersion;
private Integer targetId;
private String targetMd5;
private String targetVersion;
private String patchName;
private String patchLocalPath;
private String patchMd5;
private String patchDownloadUrl;
private Integer patchSize;
private Integer patchStatus;
public Integer getSourceId() {
return sourceId;
}
public void setSourceId(Integer sourceId) {
this.sourceId = sourceId;
}
public String getSourceMd5() {
return sourceMd5;
}
public void setSourceMd5(String sourceMd5) {
this.sourceMd5 = sourceMd5;
}
public String getSourceVersion() {
return sourceVersion;
}
public void setSourceVersion(String sourceVersion) {
this.sourceVersion = sourceVersion;
}
public Integer getTargetId() {
return targetId;
}
public void setTargetId(Integer targetId) {
this.targetId = targetId;
}
public String getTargetMd5() {
return targetMd5;
}
public void setTargetMd5(String targetMd5) {
this.targetMd5 = targetMd5;
}
public String getTargetVersion() {
return targetVersion;
}
public void setTargetVersion(String targetVersion) {
this.targetVersion = targetVersion;
}
public String getPatchName() {
return patchName;
}
public void setPatchName(String patchName) {
this.patchName = patchName;
}
public String getPatchLocalPath() {
return patchLocalPath;
}
public void setPatchLocalPath(String patchLocalPath) {
this.patchLocalPath = patchLocalPath;
}
public String getPatchMd5() {
return patchMd5;
}
public void setPatchMd5(String patchMd5) {
this.patchMd5 = patchMd5;
}
public String getPatchDownloadUrl() {
return patchDownloadUrl;
}
public void setPatchDownloadUrl(String patchDownloadUrl) {
this.patchDownloadUrl = patchDownloadUrl;
}
public Integer getPatchSize() {
return patchSize;
}
public Integer getPatchStatus() {
return patchStatus;
}
@Override
public String toString() {
return "PatchInfo{" +
"sourceId=" + sourceId +
", sourceMd5='" + sourceMd5 + '\'' +
", sourceVersion='" + sourceVersion + '\'' +
", targetId=" + targetId +
", targetMd5='" + targetMd5 + '\'' +
", targetVersion='" + targetVersion + '\'' +
", patchName='" + patchName + '\'' +
", patchLocalPath='" + patchLocalPath + '\'' +
", patchMd5='" + patchMd5 + '\'' +
", patchDownloadUrl='" + patchDownloadUrl + '\'' +
", patchSize=" + patchSize +
", patchStatus=" + patchStatus +
'}';
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
PatchInfo patchInfo = (PatchInfo) o;
return patchMd5.equals(patchInfo.patchMd5);
}
@Override
public int hashCode() {
return Objects.hash(patchMd5);
}
}
}

15
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt
View File

@@ -10,8 +10,12 @@ class ChainConstant {
const val CHAIN_LINK_ADAS = 1
// 鹰眼初始化流程顺序相关
const val CHAIN_LINK_INIT = 2
// Map交互
const val CHAIN_LINK_MAP = 3
// Native内存泄漏
const val CHAIN_LINK_LEAK = 10
// ANR
const val CHAIN_LINK_ANR = 11
const val CHAIN_LINK_LOG_CONNECT_STATUS = 0
const val CHAIN_LINK_LOG_WEB_SOCKET_GNSSINFO = 1
@@ -24,6 +28,8 @@ class ChainConstant {
const val CHAIN_LINK_LOG_WEB_SOCKET_PLANNING_ACTIONS = 8
const val CHAIN_LINK_LOG_NATIVE_LEAK = 100
const val CHAIN_LINK_LOG_CLOUD_V2N = 200
const val CHAIN_LINK_LOG_HD_MAP = 300
const val CHAIN_LINK_LOG_ANR = 400
const val CHAIN_LINK_LOG_ADAS_INIT = "-eagleInitStatus"
const val CHAIN_LINK_LOG_ADAS_GNSS = "-adasWsGnssInfo"
@@ -36,6 +42,8 @@ class ChainConstant {
const val CHAIN_LINK_LOG_ADAS_PLANNING_ACTIONS = "-adasWsPlanningActions"
const val CHAIN_LINK_LOG_RECORD_NATIVE_LEAK = "-eagleRecordNativeLeak"
const val CHAIN_LINK_LOG_CLOUD_WEB_SOCKET_V2N = "-eagleCloudWSV2N"
const val CHAIN_LINK_LOG_HD_MAP_BIZ = "-eagleHDMapBiz"
const val CHAIN_LINK_LOG_RECORD_ANR = "-eagleRecordANR"
const val CHAIN_ALIAS_CODE_MULTI_CONNECT = "CHAIN_ALIAS_CODE_MULTI_CONNECT"
const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_CAR_CONFIG = "CHAIN_ALIAS_CODE_CAR_CONFIG"
@@ -52,9 +60,13 @@ class ChainConstant {
const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_PLANNING_OBJECTS = "CHAIN_ALIAS_CODE_ADAS_MESSAGE_PLANNING_OBJECTS"
const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_PLANNING_ACTIONS = "CHAIN_ALIAS_CODE_ADAS_MESSAGE_PLANNING_ACTIONS"
const val CHAIN_ALIAS_CODE_ADAS_STATUS_QUERY_RESP = "CHAIN_ALIAS_CODE_ADAS_STATUS_QUERY_RESP"
const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_WARN = "PAD_ADAS_MESSAGE_AUTOPILOT_WARN"
const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_BIZ = "CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_BIZ"
const val CHAIN_ALIAS_CODE_RECORD_NATIVE_LEAK = "CHAIN_ALIAS_CODE_RECORD_NATIVE_LEAK"
const val CHAIN_ALIAS_CODE_RECORD_ANR = "CHAIN_ALIAS_CODE_RECORD_ANR"
const val CHAIN_ALIAS_CODE_HD_MAP_CALL = "CHAIN_ALIAS_CODE_HD_MAP_CALL"
const val CHAIN_ALIAS_CODE_HD_MAP_BIZ = "CHAIN_ALIAS_CODE_HD_MAP_BIZ"
const val CHAIN_ALIAS_CODE_INIT_ENV_RESTART = "CHAIN_ALIAS_CODE_INIT_ENV_RESTART"
const val CHAIN_ALIAS_CODE_APP_INFO_CONFIG_UPDATE = "CHAIN_ALIAS_CODE_APP_INFO_CONFIG_UPDATE"
@@ -64,6 +76,7 @@ class ChainConstant {
const val CHAIN_ALIAS_CODE_CLOUD_PASSPORT_ERROR = "CHAIN_ALIAS_CODE_CLOUD_PASSPORT_ERROR"
const val CHAIN_ALIAS_CODE_CLOUD_CONNECT_FAIL = "CHAIN_ALIAS_CODE_CLOUD_CONNECT_FAIL"
const val CHAIN_ALIAS_CODE_CLOUD_CONNECT_SUCCESS = "CHAIN_ALIAS_CODE_CLOUD_CONNECT_SUCCESS"
const val CHAIN_ALIAS_CODE_HTTP_DNS_CITY_CODE = "CHAIN_ALIAS_CODE_HTTP_DNS_CITY_CODE"
const val CHAIN_ALIAS_CODE_CLOUD_RECONNECT = "CHAIN_ALIAS_CODE_CLOUD_RECONNECT"
const val CHAIN_ALIAS_CODE_CLOUD_CONNECT_LOST = "CHAIN_ALIAS_CODE_CLOUD_CONNECT_LOST"
const val CHAIN_ALIAS_CODE_CLOUD_V2N = "CHAIN_ALIAS_CODE_CLOUD_V2N"

144
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt
View File

@@ -45,12 +45,6 @@ enum class EventTypeEnumNew(
"前方道路积水", "道路积水"
),
//浓雾
FOURS_FOG(
"10010", "出现浓雾", "浓雾预警", R.drawable.v2x_icon_nongwu_vr,
"前方出现浓雾", "出现浓雾"
),
//结冰
FOURS_ICE(
"10011", "路面结冰", "路面结冰", R.drawable.v2x_icon_jiebing_vr,
@@ -103,8 +97,8 @@ enum class EventTypeEnumNew(
ROAD_SLIPPERY("10021"),
//鬼探头类型
GHOST_PROBE("10024", "前方盲区行人预警", "前方盲区行人预警", R.drawable.icon_warning_v2x_pedestrian_crossing,
"前方盲区行人通行，请注意", "前方盲区即将有行人通过，请减速慢行"),
GHOST_PROBE("10024", "前方盲区路人预警", "前方盲区路人预警", R.drawable.icon_warning_v2x_pedestrian_crossing,
"前方盲区路人通行，请注意", "前方盲区即将有路人通过，请减速慢行"),
//接管
TAKE_OVER_EVENT(
@@ -225,29 +219,29 @@ enum class EventTypeEnumNew(
1001.toString(),
"碰撞预警",
poiTypeSrcVr = R.drawable.icon_warning_v2x_motorcycle_collision,
content = "注意摩托车",
tts = "注意摩托车"
content = "前方摩托车闯入",
tts = "前方摩托车闯入"
),
TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES(
1002.toString(),
"碰撞预警",
poiTypeSrcVr = R.drawable.icon_warning_v2x_motobike,
content = "注意非机动车",
tts = "注意非机动车"
content = "前方非机动车闯入",
tts = "前方非机动车闯入"
),
TYPE_USECASE_ID_VRUCW_PERSON(
1003.toString(),
"碰撞预警",
poiTypeSrcVr = R.drawable.icon_warning_v2x_pedestrian_crossing,
content = "注意行人",
tts = "注意行人"
content = "前方路人闯入",
tts = "前方路人闯入"
),
TYPE_ERROR_WEAKNESS(
1006.toString(),
"未知障碍物",
poiTypeSrcVr = R.drawable.icon_warning_v2x_abnormal_vehicle,
content = "前方有未知障碍物",
tts = "前方有未知障碍物"
content = "前方未知障碍物闯入",
tts = "前方未知障碍物闯入"
),
//---------弱势交通参与者 obu and cloud end -------->
@@ -256,8 +250,8 @@ enum class EventTypeEnumNew(
1666.toString(),
"闯红灯预警",
poiTypeSrcVr = R.drawable.icon_warning_v2x_traffic_lights_red,
content = "路口红灯，禁止通行",
tts = "路口红灯，禁止通行"
content = "前方路口有闯红灯风险",
tts = "蘑菇路侧提醒您，前方路口有闯红灯风险，建议降低车速"
),
TYPE_USECASE_ID_IVP_GREEN(
@@ -275,49 +269,49 @@ enum class EventTypeEnumNew(
"车辆故障",
poiTypeSrcVr = R.drawable.icon_warning_v2x_car_breakdown,
content = "前方%s米有故障车辆，影响路段%s米",
tts = "前方%s米有故障车辆，影响路段%s米"
tts = "蘑菇路侧提醒您，前方%s米有故障车辆，影响路段%s米"
),
TYPE_FOURS_PONDING( //积水
407.toString(),
"道路积水",
poiTypeSrcVr = R.drawable.v2x_icon_jishui_vr,
content = "前方%s米道路积水，影响路段%s米",
tts ="前方%s米道路积水，影响路段%s米"
tts ="蘑菇路侧提醒您，前方%s米道路积水，影响路段%s米"
),
TYPE_USECASE_ID_ROAD_PARKING( //异常停车
412.toString(),
"异常停车",
poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking,
content = "前方%s米异常停车，影响路段%s米",
tts = "前方%s米异常停车，影响路段%s米"
tts = "蘑菇路侧提醒您，前方%s米异常停车，影响路段%s米"
),
TYPE_USECASE_ID_TJW( //%d
707.toString(),
"拥堵",
poiTypeSrcVr = R.drawable.icon_warning_v2x_congestion,
content = "前方%s米拥堵，影响路段%s米",
tts = "前方%s米拥堵，影响路段%s米"
tts = "蘑菇路侧提醒您，前方%s米拥堵，影响路段%s米"
),
TYPE_USECASE_ID_SLW( //超速行驶
901.toString(),
"超速行驶",
poiTypeSrcVr = R.drawable.icon_warning_v2x_over_speed,
content = "前方%s米超速行驶，影响路段%s米",
tts = "前方%s米超速行驶，影响路段%s米"
tts = "蘑菇路侧提醒您，前方%s米超速行驶，影响路段%s米"
),
TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE( //车辆逆行
904.toString(),
"逆行车辆",
poiTypeSrcVr = R.drawable.icon_default,
content = "前方%s米逆行车辆，影响路段%s米",
tts = "前方%s米逆行车辆，影响路段%s米"
tts = "蘑菇路侧提醒您，前方%s米逆行车辆，影响路段%s米"
),
TYPE_USECASE_ID_ROAD_SPEED_LIMIT( //-->
6666.toString(),
"超速",
poiTypeSrcVr = R.drawable.icon_warning_v2x_over_speed,
content = "您已超速，请减速行驶",
tts = "您已超速，请减速行驶"
content = "当前路段限速 %s KM/H，已超速",
tts = "蘑菇路侧提醒您，当前路段限速 %s KM/H，已超速"
),
//------------道路危险情况预警 obu end ----------->
@@ -327,140 +321,154 @@ enum class EventTypeEnumNew(
"急转弯",
poiTypeSrcVr = R.drawable.icon_warning_v2x_turn_left_sharp,
content = "前方%s米急转弯",
tts = "前方%s米急转弯"
tts = "蘑菇路侧提醒您，前方%s米急转弯"
),
TYPE_ID_BRIDGE(
8.toString(),
"桥梁",
poiTypeSrcVr = R.drawable.icon_warning_v2x_hump_bridge,
content = "前方%s米桥梁",
tts = "前方%s米桥梁"
tts = "蘑菇路侧提醒您，前方%s米桥梁"
),
TYPE_ID_PEDESTRIAN(
10.toString(),
"行人",
"路人",
poiTypeSrcVr = R.drawable.icon_warning_v2x_pedestrian_crossing,
content = "前方%s米行人",
tts = "前方%s米行人"
content = "前方%s米路人",
tts = "蘑菇路侧提醒您，前方%s米路人"
),
TYPE_ID_SLIPPERY_ROAD(
17.toString(),
"路滑",
poiTypeSrcVr = R.drawable.v2x_icon_jiebing_vr,
content = "前方%s米路滑",
tts = "前方%s米路滑"
tts = "蘑菇路侧提醒您，前方%s米路滑"
),
TYPE_ID_TUNNEL(
21.toString(),
"隧道",
poiTypeSrcVr = R.drawable.icon_default,
content = "前方%s米隧道",
tts = "前方%s米隧道"
tts = "蘑菇路侧提醒您，前方%s米隧道"
),
TYPE_ID_FERRY(
22.toString(),
"渡轮",
poiTypeSrcVr = R.drawable.icon_default,
content = "前方%s米渡轮",
tts = "前方%s米渡轮"
tts = "蘑菇路侧提醒您，前方%s米渡轮"
),
TYPE_ID_UNEVEN_ROAD(
24.toString(),
"路面不平",
poiTypeSrcVr = R.drawable.icon_warning_road_hollow,
content = "前方%s米路面不平",
tts = "前方%s米路面不平"
tts = "蘑菇路侧提醒您，前方%s米路面不平"
),
TYPE_ID_NON_MOTOR_VEHICLE(
32.toString(),
"非机动车",
poiTypeSrcVr = R.drawable.icon_warning_v2x_motobike,
content = "前方%s米有非机动车",
tts = "前方%s米有非机动车"
tts = "蘑菇路侧提醒您，前方%s米有非机动车"
),
TYPE_ID_OBSTACLE(
36.toString(),
"障碍",
poiTypeSrcVr = R.drawable.icon_default,
content = "前方%s米障碍",
tts = "前方%s米障碍"
tts = "蘑菇路侧提醒您，前方%s米障碍"
),
TYPE_FOURS_ROAD_WORK(
38.toString(),
"施工",
poiTypeSrcVr = R.drawable.icon_warning_v2x_road_construction,
content = "前方%s米施工",
tts = "前方%s米施工"
tts = "蘑菇路侧提醒您，前方%s米施工"
),
TYPE_VEHICLE_QUEUE(
47.toString(),
"车队",
poiTypeSrcVr = R.drawable.icon_default,
content = "前方%s米车队",
tts = "前方%s米车队"
tts = "蘑菇路侧提醒您，前方%s米车队"
),
TYPE_NO_PASSING(
51.toString(),
"道路不通",
poiTypeSrcVr = R.drawable.v2x_icon_fenglu_vr,
content = "前方%s米不通",
tts = "前方%s米不通"
tts = "蘑菇路侧提醒您，前方%s米不通"
),
TYPE_NO_TURNING_AROUND(
75.toString(),
"禁止掉头",
poiTypeSrcVr = R.drawable.icon_default,
content = "前方%s米禁止掉头",
tts = "前方%s米禁止掉头"
tts = "蘑菇路侧提醒您，前方%s米禁止掉头"
),
TYPE_USECASE_ID_ROAD_NO_PARKING(
78.toString(),
"禁止停车",
poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking,
content = "前方%s米禁止停车",
tts = "前方%s米禁止停车"
content = "前方%s米有禁停路段",
tts = "蘑菇路侧提醒您，前方%s米有禁停路段"
),
TYPE_USECASE_ID_ROAD_NO_TOOTING(
80.toString(),
"禁止鸣笛",
poiTypeSrcVr = R.drawable.icon_warning_v2x_no_tooting,
content = "前方%s米禁止鸣笛",
tts = "前方%s米禁止鸣笛"
tts = "蘑菇路侧提醒您，前方%s米禁止鸣笛"
),
TYPE_USECASE_ID_BUS_WARNING(
123.toString(),
"公交提醒",
poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar,
content = "前方%s米公交提醒",
tts = "前方%s米公交提醒"
tts = "蘑菇路侧提醒您，前方%s米公交提醒"
),
TYPE_USECASE_ID_NARROW_RIGHT(
163.toString(),
"右侧变窄/车道数减少",
poiTypeSrcVr = R.drawable.icon_default,
content = "前方%s米右侧变窄/车道数减少",
tts = "前方%s米右侧变窄/车道数减少"
tts = "蘑菇路侧提醒您，前方%s米右侧变窄/车道数减少"
),
TYPE_USECASE_ID_GAS_STATION(
201.toString(),
"加油站",
poiTypeSrcVr = R.drawable.icon_warning_gas_station,
content = "前方%s米加油站",
tts = "前方%s米加油站"
tts = "蘑菇路侧提醒您，前方%s米加油站"
),
TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL(
242.toString(),
"学校",
poiTypeSrcVr = R.drawable.icon_warning_v2x_school,
content = "前方%s米学校",
tts = "前方%s米学校"
tts = "蘑菇路侧提醒您，前方%s米学校"
),
TYPE_USECASE_ID_ACCIDENT(
244.toString(),
"交通事故",
poiTypeSrcVr = R.drawable.v2x_icon_jiaotongshigu_vr,
content = "前方%s米交通事故",
tts = "前方%s米交通事故"
tts = "蘑菇路侧提醒您，前方%s米交通事故"
),
TYPE_ATTENTION_CONFLUENCE(
44.toString(),
"前方车辆汇流",
poiTypeSrcVr = R.drawable.icon_warning_v2x_attention_confluence,
content = "前方%s米注意车辆汇流",
tts = "蘑菇路侧提醒您，前方%s米注意车辆汇流"
),
TYPE_PEDESTRIAN_CROSSING(
114.toString(),
"人行横道",
poiTypeSrcVr = R.drawable.icon_warning_v2x_person,
content = "前方%s米人行横道",
tts = "蘑菇路侧提醒您，前方%s米人行横道"
),
//------------车内标牌 obu end -------------->
@@ -524,7 +532,6 @@ enum class EventTypeEnumNew(
FOURS_ROAD_WORK.poiType -> FOURS_ROAD_WORK.poiTypeStr
FOURS_BLOCK_UP.poiType -> FOURS_BLOCK_UP.poiTypeStr
FOURS_PONDING.poiType -> FOURS_PONDING.poiTypeStr
FOURS_FOG.poiType -> FOURS_FOG.poiTypeStr
FOURS_ICE.poiType -> FOURS_ICE.poiTypeStr
FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType,
@@ -545,7 +552,6 @@ enum class EventTypeEnumNew(
FOURS_ROAD_WORK.poiType -> FOURS_ROAD_WORK.poiTypeStrVr
FOURS_BLOCK_UP.poiType -> FOURS_BLOCK_UP.poiTypeStrVr
FOURS_PONDING.poiType -> FOURS_PONDING.poiTypeStrVr
FOURS_FOG.poiType -> FOURS_FOG.poiTypeStrVr
FOURS_ICE.poiType -> FOURS_ICE.poiTypeStrVr
FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType,
@@ -566,7 +572,6 @@ enum class EventTypeEnumNew(
FOURS_ROAD_WORK.poiType -> "施工"
FOURS_BLOCK_UP.poiType -> "道路拥堵"
FOURS_PONDING.poiType -> "道路积水"
FOURS_FOG.poiType -> "出现浓雾"
FOURS_ICE.poiType -> "路面结冰"
FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType, FOURS_ACCIDENT_02.poiType,
FOURS_ACCIDENT_03.poiType, FOURS_ACCIDENT_04.poiType, FOURS_ACCIDENT_05.poiType -> "交通事故"
@@ -582,7 +587,6 @@ enum class EventTypeEnumNew(
FOURS_ROAD_WORK.poiType -> FOURS_ROAD_WORK.poiTypeSrcVr
FOURS_BLOCK_UP.poiType -> FOURS_BLOCK_UP.poiTypeSrcVr
FOURS_PONDING.poiType -> FOURS_PONDING.poiTypeSrcVr
FOURS_FOG.poiType -> FOURS_FOG.poiTypeSrcVr
FOURS_ICE.poiType -> FOURS_ICE.poiTypeSrcVr
FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType,
@@ -602,7 +606,7 @@ enum class EventTypeEnumNew(
return when (poiType) {
FOURS_BLOCK_UP.poiType, FOURS_LIVING.poiType-> if (isVrMode) R.drawable.bg_v2x_event_type_orange_vr else R.drawable.bg_v2x_event_type_orange
TRAFFIC_CHECK.poiType, ROAD_CLOSED.poiType, FOURS_ROAD_WORK.poiType,
FOURS_PONDING.poiType, FOURS_FOG.poiType, FOURS_ICE.poiType, FOURS_ACCIDENT.poiType,
FOURS_PONDING.poiType, FOURS_ICE.poiType, FOURS_ACCIDENT.poiType,
FOURS_ACCIDENT_01.poiType, FOURS_ACCIDENT_02.poiType, FOURS_ACCIDENT_03.poiType,
FOURS_ACCIDENT_04.poiType, FOURS_ACCIDENT_05.poiType -> if (isVrMode) R.drawable.bg_v2x_event_type_red_vr else R.drawable.bg_v2x_event_type_read
else -> {
@@ -618,7 +622,7 @@ enum class EventTypeEnumNew(
R.drawable.bg_v2x_event_type_orange
TRAFFIC_CHECK.poiType, ROAD_CLOSED.poiType,
FOURS_ROAD_WORK.poiType, FOURS_PONDING.poiType,
FOURS_FOG.poiType, FOURS_ICE.poiType,
FOURS_ICE.poiType,
FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType,
FOURS_ACCIDENT_02.poiType, FOURS_ACCIDENT_03.poiType,
FOURS_ACCIDENT_04.poiType, FOURS_ACCIDENT_05.poiType ->
@@ -635,7 +639,7 @@ enum class EventTypeEnumNew(
return when (poiType) {
TRAFFIC_CHECK.poiType, ROAD_CLOSED.poiType,
FOURS_ROAD_WORK.poiType, FOURS_BLOCK_UP.poiType,
FOURS_PONDING.poiType, FOURS_FOG.poiType,
FOURS_PONDING.poiType,
FOURS_ICE.poiType, FOURS_ACCIDENT.poiType,
FOURS_ACCIDENT_01.poiType, FOURS_ACCIDENT_02.poiType,
FOURS_ACCIDENT_03.poiType, FOURS_ACCIDENT_04.poiType,
@@ -656,7 +660,6 @@ enum class EventTypeEnumNew(
FOURS_ROAD_WORK.poiType -> FOURS_ROAD_WORK.tts
FOURS_BLOCK_UP.poiType -> FOURS_BLOCK_UP.tts
FOURS_PONDING.poiType -> FOURS_PONDING.tts
FOURS_FOG.poiType -> FOURS_FOG.tts
FOURS_ICE.poiType -> FOURS_ICE.tts
FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType, FOURS_ACCIDENT_02.poiType,
FOURS_ACCIDENT_03.poiType, FOURS_ACCIDENT_04.poiType, FOURS_ACCIDENT_05.poiType -> FOURS_ACCIDENT.tts
@@ -676,7 +679,6 @@ enum class EventTypeEnumNew(
FOURS_ROAD_WORK.poiType -> FOURS_ROAD_WORK.content
FOURS_BLOCK_UP.poiType -> FOURS_BLOCK_UP.content
FOURS_PONDING.poiType -> FOURS_PONDING.content
FOURS_FOG.poiType -> FOURS_FOG.content
FOURS_ICE.poiType -> FOURS_ICE.content
FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType, FOURS_ACCIDENT_02.poiType,
FOURS_ACCIDENT_03.poiType, FOURS_ACCIDENT_04.poiType, FOURS_ACCIDENT_05.poiType ->
@@ -696,7 +698,6 @@ enum class EventTypeEnumNew(
FOURS_BLOCK_UP.poiType -> R.raw.v2x_yongdu
FOURS_ACCIDENT.poiType,FOURS_ACCIDENT_04.poiType -> R.raw.v2x_shigu
FOURS_LIVING.poiType -> R.raw.v2x_shishilukuang
FOURS_FOG.poiType -> R.raw.v2x_nongwu
TRAFFIC_CHECK.poiType -> R.raw.v2x_jiaotongjiancha
FOURS_ROAD_WORK.poiType -> R.raw.v2x_daolushigong
FOURS_ICE.poiType -> R.raw.v2x_daolujiebing
@@ -749,10 +750,6 @@ enum class EventTypeEnumNew(
FOURS_PONDING.poiType ->{
FOURS_PONDING.poiTypeStr
}
//浓雾
FOURS_FOG.poiType ->{
FOURS_FOG.poiTypeStr
}
//结冰
FOURS_ICE.poiType ->{
FOURS_ICE.poiTypeStr
@@ -893,7 +890,7 @@ enum class EventTypeEnumNew(
TYPE_ID_BRIDGE.poiType ->{
TYPE_ID_BRIDGE.poiTypeStr
}
//行人
//路人
TYPE_ID_PEDESTRIAN.poiType ->{
TYPE_ID_PEDESTRIAN.poiTypeStr
}
@@ -969,6 +966,15 @@ enum class EventTypeEnumNew(
TYPE_USECASE_ID_ACCIDENT.poiType ->{
TYPE_USECASE_ID_ACCIDENT.poiTypeStr
}
//注意合流
TYPE_ATTENTION_CONFLUENCE.poiType ->{
TYPE_ATTENTION_CONFLUENCE.poiTypeStr
}
//人行横道
TYPE_PEDESTRIAN_CROSSING.poiType ->{
TYPE_PEDESTRIAN_CROSSING.poiTypeStr
}
//紧急制动预警
TYPE_USECASE_ID_EBW.poiType ->{
TYPE_USECASE_ID_EBW.poiTypeStr
@@ -1043,10 +1049,6 @@ enum class EventTypeEnumNew(
FOURS_PONDING.poiType -> {
R.drawable.v2x_icon_jishui_vr
}
//浓雾
FOURS_FOG.poiType -> {
R.drawable.v2x_icon_nongwu_vr
}
//结冰
FOURS_ICE.poiType -> {
R.drawable.v2x_icon_jiebing_vr
@@ -1174,6 +1176,8 @@ enum class EventTypeEnumNew(
TYPE_USECASE_ID_GAS_STATION.poiType -> TYPE_USECASE_ID_GAS_STATION.poiTypeSrcVr
TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiTypeSrcVr
TYPE_USECASE_ID_ACCIDENT.poiType -> TYPE_USECASE_ID_ACCIDENT.poiTypeSrcVr
TYPE_ATTENTION_CONFLUENCE.poiType -> TYPE_ATTENTION_CONFLUENCE.poiTypeSrcVr
TYPE_PEDESTRIAN_CROSSING.poiType -> TYPE_PEDESTRIAN_CROSSING.poiTypeSrcVr
TYPE_USECASE_ID_EBW.poiType -> TYPE_USECASE_ID_EBW.poiTypeSrcVr
TYPE_USECASE_ID_FCW.poiType -> TYPE_USECASE_ID_FCW.poiTypeSrcVr
@@ -1255,6 +1259,8 @@ enum class EventTypeEnumNew(
TYPE_USECASE_ID_GAS_STATION.poiType -> TYPE_USECASE_ID_GAS_STATION.content
TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.content
TYPE_USECASE_ID_ACCIDENT.poiType -> TYPE_USECASE_ID_ACCIDENT.content
TYPE_ATTENTION_CONFLUENCE.poiType -> TYPE_ATTENTION_CONFLUENCE.content
TYPE_PEDESTRIAN_CROSSING.poiType -> TYPE_PEDESTRIAN_CROSSING.content
else -> TYPE_ERROR.content
}
@@ -1322,6 +1328,8 @@ enum class EventTypeEnumNew(
TYPE_USECASE_ID_GAS_STATION.poiType -> TYPE_USECASE_ID_GAS_STATION.tts
TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.tts
TYPE_USECASE_ID_ACCIDENT.poiType -> TYPE_USECASE_ID_ACCIDENT.tts
TYPE_ATTENTION_CONFLUENCE.poiType -> TYPE_ATTENTION_CONFLUENCE.tts
TYPE_PEDESTRIAN_CROSSING.poiType -> TYPE_PEDESTRIAN_CROSSING.tts
else -> TYPE_ERROR.tts
}

4
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeHelper.kt
View File

@@ -130,8 +130,8 @@ class EventTypeHelper {
fun getVRURI(data: ((appId: Int, tts: String, content: String) -> Unit)) {
data.invoke(
EventTypeEnumNew.TYPE_USECASE_ID_VRUCW_PERSON.poiType.toInt(),
"行人逆行预警",
"行人逆行预警"
"路人逆行预警",
"路人逆行预警"
)
}

21
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/multidisplay/TelematicConstant.kt Normal file
View File

@@ -0,0 +1,21 @@
package com.mogo.eagle.core.data.multidisplay
/**
* @author: wangmingjun
* @date: 2023/3/3
* 供网约车司乘屏通信使用
*/
class TelematicConstant {
companion object {
const val BUSINESS_STRING = 100
const val SHOW_TRAFFIC_LIGHT = 101
const val HIDE_TRAFFIC_LIGHT = 102
const val OPEN_ROMA_STATUS = 103
const val ROMA_UPDATE = 104
const val CONTROL_PASSENGER_DRIVER_MONITOR = 105
const val OBU_RUNREDLIGHT_WARNING = 200 //闯红灯预警开关
const val OBU_GREENWAVE_WARNING = 201 //绿波通行开关
}
}

2
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/obu/MogoObuConst.java
View File

@@ -16,7 +16,7 @@ public class MogoObuConst {
* 自研obu 默认ip obu的taxi和bus的ip已经全部统一成1网段ip
*/
public static String OBU_DEFAULT_IP = "192.168.1.199";
// public static String OBU_DEFAULT_IP = "192.168.0.53"; //obu室内环境
// public static String OBU_DEFAULT_IP = "192.168.0.242"; //obu室内环境
/**
* obu 升级tag