Merge branch 'release_robobus-d_230413_3.1.0.1'

# Conflicts: # OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java # OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java # OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.java # core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.kt # gradle.properties
2023-04-23 14:28:19 +08:00
parent 4cc8a10f3d 0c4d329626
commit d32d904239
732 changed files with 15968 additions and 23238 deletions
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/UrlConfig.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/UrlConfig.kt
@@ -16,5 +16,9 @@ data class UrlConfig(
    @SerializedName("eagle_mis_url")
    val eagleMisUrl: String,
    @SerializedName("eagle_dns_url")
-    val eagleDnsUrl: String
+    val eagleDnsUrl: String,
+    @SerializedName("bind_driver_qr_url")
+    val bindDriverQRUrl: String,
+    @SerializedName("chart_socket_url")
+    val chartSocketUrl: String
 )
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt
@@ -47,7 +47,7 @@ open class AutopilotStatusInfo : Serializable, Cloneable {
    var satelliteTime = 0.0

    /**
-     * 自动驾驶状态 0是不可用 1是ready 2是自动驾驶start
+     * 自动驾驶状态 0是不可用 1是ready 2是自动驾驶start 7:平行驾驶中
     */
    var state = 0

--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/dispatch/DispatchAdasAutoPilotLocReceiverBean.java
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/dispatch/DispatchAdasAutoPilotLocReceiverBean.java
@@ -29,7 +29,31 @@ public class DispatchAdasAutoPilotLocReceiverBean {
    private long systemTime;
    private List<MogoLatLng> stopsList;

-    public DispatchAdasAutoPilotLocReceiverBean(int source, int type, String poiId, double startLat, double startLon, String startLocAddress, double endLat, double endLon, String endLocAddress, String taskTime, String flightInfo, String taskInfo, long systemTime, List<MogoLatLng> stopsList) {
+    private long taskId; //任务调度记录的ID
+    private int lineId; //路线Id
+    private String lineName; //路线名称
+
+    private String trajUrl;
+    private String trajMd5;
+    private String stopUrl;
+    private String stopMd5;
+    private long timestamp;
+    private String vehicleModel;
+    private String trajUrl_dpqp;//轨迹文件下载的cos url，默认“”
+    private String trajMd5_dpqp;//轨迹文件md5，默认“”
+    private String stopUrl_dpqp;//打点文件下载的cos url，默认“”
+    private String stopMd5_dpqp;//轨迹文件md5，默认“”
+    private long timestamp_dpqp;//上传轨迹完成时间戳(ms)：用于MEC本地手动导入轨迹验证时不会被云端轨迹覆盖
+
+    public DispatchAdasAutoPilotLocReceiverBean(int source, int type, String poiId, double startLat,
+                                                double startLon, String startLocAddress, double endLat,
+                                                double endLon, String endLocAddress, String taskTime,
+                                                String flightInfo, String taskInfo, long systemTime,
+                                                List<MogoLatLng> stopsList, long taskId, int lineId,
+                                                String lineName, String trajUrl, String trajMd5,
+                                                String stopUrl, String stopMd5, long timestamp,
+                                                String vehicleModel, String trajUrl_dpqp, String trajMd5_dpqp,
+                                                String stopUrl_dpqp, String stopMd5_dpqp, long timestamp_dpqp) {
        this.source = source;
        this.type = type;
        this.poiId = poiId;
@@ -44,6 +68,43 @@ public class DispatchAdasAutoPilotLocReceiverBean {
        this.taskInfo = taskInfo;
        this.systemTime = systemTime;
        this.stopsList = stopsList;
+        this.taskId = taskId;
+        this.lineId = lineId;
+        this.lineName = lineName;
+        this.trajUrl = trajUrl;
+        this.trajMd5 = trajMd5;
+        this.stopUrl = stopUrl;
+        this.stopMd5 = stopMd5;
+        this.timestamp = timestamp;
+        this.vehicleModel = vehicleModel;
+        this.trajUrl_dpqp = trajUrl_dpqp;
+        this.trajMd5_dpqp = trajMd5_dpqp;
+        this.stopUrl_dpqp = stopUrl_dpqp;
+        this.stopMd5_dpqp = stopMd5_dpqp;
+        this.timestamp_dpqp = timestamp_dpqp;
+    }
+
+    public DispatchAdasAutoPilotLocReceiverBean(int source, int type, String poiId, double startLat, double startLon, String startLocAddress,
+                                                double endLat, double endLon, String endLocAddress, String taskTime, String flightInfo,
+                                                String taskInfo, long systemTime, List<MogoLatLng> stopsList,
+                                                long taskId, int lineId, String lineName) {
+        this.source = source;
+        this.type = type;
+        this.poiId = poiId;
+        this.startLat = startLat;
+        this.startLon = startLon;
+        this.startLocAddress = startLocAddress;
+        this.endLat = endLat;
+        this.endLon = endLon;
+        this.endLocAddress = endLocAddress;
+        this.taskTime = taskTime;
+        this.flightInfo = flightInfo;
+        this.taskInfo = taskInfo;
+        this.systemTime = systemTime;
+        this.stopsList = stopsList;
+        this.taskId = taskId;
+        this.lineId = lineId;
+        this.lineName = lineName;
    }

    public int getSource() {
@@ -158,6 +219,118 @@ public class DispatchAdasAutoPilotLocReceiverBean {
        this.stopsList = stopsList;
    }

+    public long getTaskId(){
+        return taskId;
+    }
+
+    public void setTaskId(long taskId){
+        this.taskId = taskId;
+    }
+
+    public int getLineId(){
+        return lineId;
+    }
+
+    public void setLineId(int lineId){
+        this.lineId =lineId;
+    }
+
+    public String getLineName(){
+        return lineName;
+    }
+
+    public void setLineName(String lineName){
+        this.lineName = lineName;
+    }
+
+    public String getTrajUrl() {
+        return trajUrl;
+    }
+
+    public void setTrajUrl(String trajUrl) {
+        this.trajUrl = trajUrl;
+    }
+
+    public String getTrajMd5() {
+        return trajMd5;
+    }
+
+    public void setTrajMd5(String trajMd5) {
+        this.trajMd5 = trajMd5;
+    }
+
+    public String getStopUrl() {
+        return stopUrl;
+    }
+
+    public void setStopUrl(String stopUrl) {
+        this.stopUrl = stopUrl;
+    }
+
+    public String getStopMd5() {
+        return stopMd5;
+    }
+
+    public void setStopMd5(String stopMd5) {
+        this.stopMd5 = stopMd5;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public String getVehicleModel() {
+        return vehicleModel;
+    }
+
+    public void setVehicleModel(String vehicleModel) {
+        this.vehicleModel = vehicleModel;
+    }
+
+    public String getTrajUrl_dpqp() {
+        return trajUrl_dpqp;
+    }
+
+    public void setTrajUrl_dpqp(String trajUrl_dpqp) {
+        this.trajUrl_dpqp = trajUrl_dpqp;
+    }
+
+    public String getTrajMd5_dpqp() {
+        return trajMd5_dpqp;
+    }
+
+    public void setTrajMd5_dpqp(String trajMd5_dpqp) {
+        this.trajMd5_dpqp = trajMd5_dpqp;
+    }
+
+    public String getStopUrl_dpqp() {
+        return stopUrl_dpqp;
+    }
+
+    public void setStopUrl_dpqp(String stopUrl_dpqp) {
+        this.stopUrl_dpqp = stopUrl_dpqp;
+    }
+
+    public String getStopMd5_dpqp() {
+        return stopMd5_dpqp;
+    }
+
+    public void setStopMd5_dpqp(String stopMd5_dpqp) {
+        this.stopMd5_dpqp = stopMd5_dpqp;
+    }
+
+    public long getTimestamp_dpqp() {
+        return timestamp_dpqp;
+    }
+
+    public void setTimestamp_dpqp(long timestamp_dpqp) {
+        this.timestamp_dpqp = timestamp_dpqp;
+    }
+
    @Override
    public String toString() {
        return "DispatchAdasAutoPilotLocReceiverBean{" +
@@ -175,6 +348,20 @@ public class DispatchAdasAutoPilotLocReceiverBean {
                ", taskInfo='" + taskInfo + '\'' +
                ", systemTime=" + systemTime +
                ", stopsList=" + stopsList +
+                ", taskId=" + taskId +
+                ", lineId=" + lineId +
+                ", lineName='" + lineName + '\'' +
+                ", trajUrl='" + trajUrl + '\'' +
+                ", trajMd5='" + trajMd5 + '\'' +
+                ", stopUrl='" + stopUrl + '\'' +
+                ", stopMd5='" + stopMd5 + '\'' +
+                ", timestamp=" + timestamp +
+                ", vehicleModel='" + vehicleModel + '\'' +
+                ", trajUrl_dpqp='" + trajUrl_dpqp + '\'' +
+                ", trajMd5_dpqp='" + trajMd5_dpqp + '\'' +
+                ", stopUrl_dpqp='" + stopUrl_dpqp + '\'' +
+                ", stopMd5_dpqp='" + stopMd5_dpqp + '\'' +
+                ", timestamp_dpqp=" + timestamp_dpqp +
                '}';
    }
 }
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/dispatch/ReportDispatchResult.java
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/dispatch/ReportDispatchResult.java
@@ -4,10 +4,12 @@ public class ReportDispatchResult {

    private String sn;
    private int dispatchResult;
+    private long taskId;

-    public ReportDispatchResult(String sn, int dispatchResult) {
+    public ReportDispatchResult(String sn, int dispatchResult,long taskId) {
        this.sn = sn;
        this.dispatchResult = dispatchResult;
+        this.taskId = taskId;
    }

    public String getSn() {
@@ -26,11 +28,20 @@ public class ReportDispatchResult {
        this.dispatchResult = dispatchResult;
    }

+    public long getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(long taskId) {
+        this.taskId = taskId;
+    }
+
    @Override
    public String toString() {
        return "ReportDispatchResult{" +
                "sn='" + sn + '\'' +
-                ", dispatchResult=" + dispatchResult +
+                ", dispatchResult=" + dispatchResult + '\''+
+                ", taskId=" + taskId +
                '}';
    }
 }
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
@@ -105,6 +105,16 @@ object FunctionBuildConfig {
    @JvmField
    var appIdentityMode = "Taxi_Driver_Base"

+    /**
+     * 临时配置json
+     * 广告json
+     *
+     */
+    @Volatile
+    @JvmField
+    var tempConfig = ""
+
+
    /**
     * 配置连接工控机的IP地址
     * 小巴车 192.168.8.102
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt
@@ -108,24 +108,28 @@ enum class EventTypeEnumNew(

    //接管
    TAKE_OVER_EVENT(
-        "20000", "注意周围、立即接管", "注意周围、立即接管", R.drawable.icon_warning_take_over,
+        "20000", "接管", "注意周围、立即接管", R.drawable.icon_warning_take_over,
        "注意周围、立即接管", "自动驾驶退出请立即接管"
    ),

+    //弱网接管
+    NETWORK_WEAK_EVENT("20001", "接管", "注意周围、立即接管", R.drawable.icon_warning_take_over,
+        "注意周围、立即接管", "平行驾驶遇弱网已退出，注意随时接管"),
+
    // 前方静止or慢速车辆报警
-    ALERT_FRONT_CAR("99999"),
+    ALERT_FRONT_CAR("99999","前方预警"),

    // 限行管理
    ALERT_TRAFFIC_CONTROL("99998"),

    // 红绿灯事件、是建议以多少速度驶过
-    ALERT_TRAFFIC_LIGHT_SUGGEST("99997"),
+    ALERT_TRAFFIC_LIGHT_SUGGEST("99997","红绿灯"),

    // 红绿灯事件、一种是绿灯不足3秒
-    ALERT_TRAFFIC_LIGHT_WARNING("99996"),
+    ALERT_TRAFFIC_LIGHT_WARNING("99996","红绿灯"),

    // 故障车辆
-    ALERT_CAR_TROUBLE_WARNING("20007"),
+    ALERT_CAR_TROUBLE_WARNING("20007","故障车辆"),

    // 疲劳驾驶
    ALERT_FATIGUE_DRIVING("99993"),
@@ -219,28 +223,28 @@ enum class EventTypeEnumNew(
    //---------弱势交通参与者 obu and cloud start ------>
    TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES(
        1001.toString(),
-        "弱势交通参与者碰撞预警",
+        "碰撞预警",
        poiTypeSrcVr = R.drawable.icon_warning_v2x_motorcycle_collision,
        content = "注意摩托车",
        tts = "注意摩托车"
    ),
    TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES(
        1002.toString(),
-        "弱势交通参与者碰撞预警",
+        "碰撞预警",
        poiTypeSrcVr = R.drawable.icon_warning_v2x_motobike,
        content = "注意非机动车",
        tts = "注意非机动车"
    ),
    TYPE_USECASE_ID_VRUCW_PERSON(
        1003.toString(),
-        "弱势交通参与者碰撞预警",
+        "碰撞预警",
        poiTypeSrcVr = R.drawable.icon_warning_v2x_pedestrian_crossing,
        content = "注意行人",
        tts = "注意行人"
    ),
    TYPE_ERROR_WEAKNESS(
        1006.toString(),
-        "未知/错误/异常",
+        "未知障碍物",
        poiTypeSrcVr = R.drawable.icon_warning_v2x_abnormal_vehicle,
        content = "前方有未知障碍物",
        tts = "前方有未知障碍物"
@@ -397,7 +401,7 @@ enum class EventTypeEnumNew(
    ),
    TYPE_NO_PASSING(
        51.toString(),
-        "不通",
+        "道路不通",
        poiTypeSrcVr = R.drawable.v2x_icon_fenglu_vr,
        content = "前方%s米不通",
        tts = "前方%s米不通"
@@ -470,7 +474,7 @@ enum class EventTypeEnumNew(

    TYPE_SOCKET_ROAD_JINGZHI(
        "100251",
-        "前方%s米静止障碍物占道",
+        "静止障碍物占道",
        poiTypeSrcVr = R.drawable.v2x_icon_jingzhi_zhangai,
        content = "前方%s米静止障碍物占道",
        tts = "前方%s米静止障碍物占道"
@@ -478,7 +482,7 @@ enum class EventTypeEnumNew(

    TYPE_SOCKET_ROAD_SHIGU(
        "100321",
-        "前方%s米道路事故",
+        "道路事故",
        poiTypeSrcVr = R.drawable.v2x_icon_shigu_sanjiaopai,
        content = "前方%s米道路事故",
        tts = "前方%s米道路事故"
@@ -486,7 +490,7 @@ enum class EventTypeEnumNew(

    TYPE_SOCKET_ROAD_SHIGONG(
      "100061",
-      "前方%s米道路施工",
+      "道路施工",
      poiTypeSrcVr = R.drawable.v2x_icon_shigong_zhandao,
      content = "前方%s米道路施工",
      tts = "前方%s米道路施工"
@@ -500,10 +504,10 @@ enum class EventTypeEnumNew(
        tts = ""
    ),

-    TYPE_VIP_IDENTIFICATION_PASS("20022", "", "", R.drawable.icon_warning_v2x_vip_turn_light, "VIP车辆优先通行，已为您变为绿灯", "VIP车辆优先通行，已为您变为绿灯"),
-    TYPE_VIP_IDENTIFICATION_EXTEND("20023", "", "", R.drawable.icon_warning_v2x_vip_turn_light, "VIP车辆优先通行，已为您延长绿灯", "VIP车辆优先通行，已为您延长绿灯"),
-    TYPE_VIP_ERROR_IDENTIFICATION("20024", "", "", R.drawable.icon_warning_v2x_vip_turn_light, "请求失败，", "请求失败,稍后重试"),
-    TYPE_OPTIMAL_ROUTE_RECOMMEND("2000", "", "", R.drawable.icon_warning_v2x_optimal_route, "为您推荐最优路线", "已为您选择最优路线");
+    TYPE_VIP_IDENTIFICATION_PASS("20022", "VIP通行", "", R.drawable.icon_warning_v2x_vip_turn_light, "VIP车辆优先通行，已为您变为绿灯", "VIP车辆优先通行，已为您变为绿灯"),
+    TYPE_VIP_IDENTIFICATION_EXTEND("20023", "VIP通行", "", R.drawable.icon_warning_v2x_vip_turn_light, "VIP车辆优先通行，已为您延长绿灯", "VIP车辆优先通行，已为您延长绿灯"),
+    TYPE_VIP_ERROR_IDENTIFICATION("20024", "VIP通行", "", R.drawable.icon_warning_v2x_vip_turn_light, "请求失败，", "请求失败,稍后重试"),
+    TYPE_OPTIMAL_ROUTE_RECOMMEND("2000", "路线推荐", "", R.drawable.icon_warning_v2x_optimal_route, "为您推荐最优路线", "已为您选择最优路线");


    companion object {
@@ -706,6 +710,311 @@ enum class EventTypeEnumNew(
            }
        }

+        @JvmStatic
+        fun getEventTitle(poiType: String?): String{
+            return when(poiType){
+                //交通检查
+                TRAFFIC_CHECK.poiType ->{
+                    TRAFFIC_CHECK.poiTypeStr
+                }
+                //封路
+                ROAD_CLOSED.poiType ->{
+                    ROAD_CLOSED.poiTypeStr
+                }
+                //施工
+                FOURS_ROAD_WORK.poiType ->{
+                    FOURS_ROAD_WORK.poiTypeStr
+                }
+                //道路施工
+                TYPE_SOCKET_ROAD_SHIGONG.poiType ->{
+                    TYPE_SOCKET_ROAD_SHIGONG.poiTypeStr
+                }
+                //静止障碍物占道
+                TYPE_SOCKET_ROAD_JINGZHI.poiType ->{
+                    TYPE_SOCKET_ROAD_JINGZHI.poiTypeStr
+                }
+                //道路事故
+                TYPE_SOCKET_ROAD_SHIGU.poiType ->{
+                    TYPE_SOCKET_ROAD_SHIGU.poiTypeStr
+                }
+                //交通拥堵
+                TYPE_SOCKET_ROAD_CONGESTION.poiType ->{
+                    TYPE_SOCKET_ROAD_CONGESTION.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.poiTypeStr
+                }
+                //重大事故
+                FOURS_ACCIDENT_01.poiType ->{
+                    FOURS_ACCIDENT_01.poiTypeStr
+                }
+                //特大事故
+                FOURS_ACCIDENT_02.poiType ->{
+                    FOURS_ACCIDENT_02.poiTypeStr
+                }
+                //较大事故
+                FOURS_ACCIDENT_03.poiType ->{
+                    FOURS_ACCIDENT_03.poiTypeStr
+                }
+                //一般事故
+                FOURS_ACCIDENT_04.poiType ->{
+                    FOURS_ACCIDENT_04.poiTypeStr
+                }
+                //轻微事故
+                FOURS_ACCIDENT_05.poiType ->{
+                    FOURS_ACCIDENT_05.poiTypeStr
+                }
+                //事故
+                FOURS_LIVING.poiType ->{
+                    FOURS_LIVING.poiTypeStr
+                }
+                //红绿灯数据
+                ALERT_TRAFFIC_LIGHT_SUGGEST.poiType ->{
+                    ALERT_TRAFFIC_LIGHT_SUGGEST.poiTypeStr
+                }
+                //红绿灯数据
+                ALERT_TRAFFIC_LIGHT_WARNING.poiType ->{
+                    ALERT_TRAFFIC_LIGHT_WARNING.poiTypeStr
+                }
+                //前方静止or慢速车辆报警
+                ALERT_FRONT_CAR.poiType ->{
+                    ALERT_FRONT_CAR.poiTypeStr
+                }
+                // 故障车辆
+                ALERT_CAR_TROUBLE_WARNING.poiType ->{
+                    ALERT_CAR_TROUBLE_WARNING.poiTypeStr
+                }
+                //VIP车辆优先通行，已为您变为绿灯
+                TYPE_VIP_IDENTIFICATION_PASS.poiType ->{
+                    TYPE_VIP_IDENTIFICATION_PASS.poiTypeStr
+                }
+                //VIP车辆优先通行，已为您延长绿灯
+                TYPE_VIP_IDENTIFICATION_EXTEND.poiType ->{
+                    TYPE_VIP_IDENTIFICATION_EXTEND.poiTypeStr
+                }
+                //VIP变灯请求失败
+                TYPE_VIP_ERROR_IDENTIFICATION.poiType ->{
+                    TYPE_VIP_ERROR_IDENTIFICATION.poiTypeStr
+                }
+                //最优路线
+                TYPE_OPTIMAL_ROUTE_RECOMMEND.poiType ->{
+                    TYPE_OPTIMAL_ROUTE_RECOMMEND.poiTypeStr
+                }
+                //绿波通行
+                TYPE_USECASE_ID_IVP_GREEN.poiType ->{
+                    TYPE_USECASE_ID_IVP_GREEN.poiTypeStr
+                }
+                //闯红灯预警
+                TYPE_USECASE_ID_IVP_RED.poiType ->{
+                    TYPE_USECASE_ID_IVP_RED.poiTypeStr
+                }
+                //鬼探头类型
+                GHOST_PROBE.poiType ->{
+                    GHOST_PROBE.poiTypeStr
+                }
+                //接管
+                TAKE_OVER_EVENT.poiType ->{
+                    TAKE_OVER_EVENT.poiTypeStr
+                }
+                //弱网接管
+                NETWORK_WEAK_EVENT.poiType ->{
+                    NETWORK_WEAK_EVENT.poiTypeStr
+                }
+                //机动车
+                TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.poiType ->{
+                    TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.poiTypeStr
+                }
+                //碰撞预警
+                TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.poiType ->{
+                    TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.poiTypeStr
+                }
+                //碰撞预警
+                TYPE_USECASE_ID_VRUCW_PERSON.poiType ->{
+                    TYPE_USECASE_ID_VRUCW_PERSON.poiTypeStr
+                }
+                //未知障碍物
+                TYPE_ERROR_WEAKNESS.poiType ->{
+                    TYPE_ERROR_WEAKNESS.poiTypeStr
+                }
+                //学校
+                TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType ->{
+                    TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiTypeStr
+                }
+                //禁止停车
+                TYPE_USECASE_ID_ROAD_NO_PARKING.poiType ->{
+                    TYPE_USECASE_ID_ROAD_NO_PARKING.poiTypeStr
+                }
+                //超速行驶
+                TYPE_USECASE_ID_SLW.poiType ->{
+                    TYPE_USECASE_ID_SLW.poiTypeStr
+                }
+                //拥堵
+                TYPE_USECASE_ID_TJW.poiType ->{
+                    TYPE_USECASE_ID_TJW.poiTypeStr
+                }
+                //车辆故障
+                TYPE_USECASE_ID_BREAKDOWN_WARNING.poiType ->{
+                    TYPE_USECASE_ID_BREAKDOWN_WARNING.poiTypeStr
+                }
+                //道路积水
+                FOURS_PONDING.poiType ->{
+                    FOURS_PONDING.poiTypeStr
+                }
+                //异常停车
+                TYPE_USECASE_ID_ROAD_PARKING.poiType ->{
+                    TYPE_USECASE_ID_ROAD_PARKING.poiTypeStr
+                }
+                //逆行车辆
+                TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.poiType ->{
+                    TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.poiTypeStr
+                }
+                //急转弯
+                TYPE_ID_SHAPR_TURNS.poiType ->{
+                    TYPE_ID_SHAPR_TURNS.poiTypeStr
+                }
+                //桥梁
+                TYPE_ID_BRIDGE.poiType ->{
+                    TYPE_ID_BRIDGE.poiTypeStr
+                }
+                //行人
+                TYPE_ID_PEDESTRIAN.poiType ->{
+                    TYPE_ID_PEDESTRIAN.poiTypeStr
+                }
+                //路滑
+                TYPE_ID_SLIPPERY_ROAD.poiType ->{
+                    TYPE_ID_SLIPPERY_ROAD.poiTypeStr
+                }
+                //隧道
+                TYPE_ID_TUNNEL.poiType ->{
+                    TYPE_ID_TUNNEL.poiTypeStr
+                }
+                //渡轮
+                TYPE_ID_FERRY.poiType ->{
+                    TYPE_ID_FERRY.poiTypeStr
+                }
+                //路面不平
+                TYPE_ID_UNEVEN_ROAD.poiType ->{
+                    TYPE_ID_UNEVEN_ROAD.poiTypeStr
+                }
+                //非机动车
+                TYPE_ID_NON_MOTOR_VEHICLE.poiType ->{
+                    TYPE_ID_NON_MOTOR_VEHICLE.poiTypeStr
+                }
+                //障碍
+                TYPE_ID_OBSTACLE.poiType ->{
+                    TYPE_ID_OBSTACLE.poiTypeStr
+                }
+                //施工
+                TYPE_FOURS_ROAD_WORK.poiType ->{
+                    TYPE_FOURS_ROAD_WORK.poiTypeStr
+                }
+                //车队
+                TYPE_VEHICLE_QUEUE.poiType ->{
+                    TYPE_VEHICLE_QUEUE.poiTypeStr
+                }
+                //道路不通
+                TYPE_NO_PASSING.poiType ->{
+                    TYPE_NO_PASSING.poiTypeStr
+                }
+                //禁止掉头
+                TYPE_NO_TURNING_AROUND.poiType ->{
+                    TYPE_NO_TURNING_AROUND.poiTypeStr
+                }
+                //禁止停车
+                TYPE_USECASE_ID_ROAD_NO_PARKING.poiType ->{
+                    TYPE_USECASE_ID_ROAD_NO_PARKING.poiTypeStr
+                }
+                //禁止鸣笛
+                TYPE_USECASE_ID_ROAD_NO_TOOTING.poiType ->{
+                    TYPE_USECASE_ID_ROAD_NO_TOOTING.poiTypeStr
+                }
+                //超速
+                TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiType ->{
+                    TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiTypeStr
+                }
+                //公交提醒
+                TYPE_USECASE_ID_BUS_WARNING.poiType ->{
+                    TYPE_USECASE_ID_BUS_WARNING.poiTypeStr
+                }
+                //右侧变窄/车道数减少
+                TYPE_USECASE_ID_NARROW_RIGHT.poiType ->{
+                    TYPE_USECASE_ID_NARROW_RIGHT.poiTypeStr
+                }
+                //加油站
+                TYPE_USECASE_ID_GAS_STATION.poiType ->{
+                    TYPE_USECASE_ID_GAS_STATION.poiTypeStr
+                }
+                //学校
+                TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType ->{
+                    TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiTypeStr
+                }
+                //交通事故
+                TYPE_USECASE_ID_ACCIDENT.poiType ->{
+                    TYPE_USECASE_ID_ACCIDENT.poiTypeStr
+                }
+                //紧急制动预警
+                TYPE_USECASE_ID_EBW.poiType ->{
+                    TYPE_USECASE_ID_EBW.poiTypeStr
+                }
+                //前向碰撞预警
+                TYPE_USECASE_ID_FCW.poiType ->{
+                    TYPE_USECASE_ID_FCW.poiTypeStr
+                }
+                //交叉路口碰撞预警
+                TYPE_USECASE_ID_ICW.poiType ->{
+                    TYPE_USECASE_ID_ICW.poiTypeStr
+                }
+                //车辆失控预警
+                TYPE_USECASE_ID_CLW.poiType ->{
+                    TYPE_USECASE_ID_CLW.poiTypeStr
+                }
+                //逆向超车预警
+                TYPE_USECASE_ID_DNPW.poiType ->{
+                    TYPE_USECASE_ID_DNPW.poiTypeStr
+                }
+                //异常车辆提醒
+                TYPE_USECASE_ID_AVW.poiType ->{
+                    TYPE_USECASE_ID_AVW.poiTypeStr
+                }
+                //盲区预警
+                TYPE_USECASE_ID_BSW.poiType ->{
+                    TYPE_USECASE_ID_BSW.poiTypeStr
+                }
+                //变道预警
+                TYPE_USECASE_ID_LCW.poiType ->{
+                    TYPE_USECASE_ID_LCW.poiTypeStr
+                }
+                //紧急车辆提醒
+                TYPE_USECASE_ID_EVW.poiType ->{
+                    TYPE_USECASE_ID_EVW.poiTypeStr
+                }
+                //左转辅助
+                TYPE_USECASE_ID_LTA.poiType ->{
+                    TYPE_USECASE_ID_LTA.poiTypeStr
+                }
+                else ->{
+                    "事件通知"
+                }
+            }
+        }
+
        @JvmStatic
        fun getUpdateIconRes(poiType: String?): Int {
            return when (poiType) {
@@ -818,6 +1127,10 @@ enum class EventTypeEnumNew(
                TAKE_OVER_EVENT.poiType -> {
                    R.drawable.icon_warning_take_over
                }
+                //弱网接管
+                NETWORK_WEAK_EVENT.poiType -> {
+                    R.drawable.icon_warning_take_over
+                }
                //机动车
                TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.poiType -> {
                    R.drawable.icon_warning_v2x_motorcycle_collision
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/temp/EventLogout.java
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/temp/EventLogout.java
@@ -5,6 +5,7 @@ public class EventLogout {
    private int messgaeType;
    public final static int LOGOUT_TYPE =  100001;
    public final static int PERSONAL_TYPE =  100002;
+    public final static int SHOW_QR_TYPE =  100003;

    public EventLogout(int messgaeType) {
        this.messgaeType = messgaeType;