[2.15.0-merge-master]

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/UrlConfig.kt

@@ -4,5 +4,21 @@ import com.google.gson.annotations.SerializedName
 
 data class UrlConfig(
     @SerializedName("och_url")
-    val ochUrl: String
+    val ochUrl: String,
+    @SerializedName("shuttle_url")
+    val shuttleUrl: String,
+    @SerializedName("passport_url")
+    val passportUrl: String,
+    @SerializedName("socket_base_url")
+    val socketBaseUrl: String,
+    @SerializedName("socket_tech_url")
+    val socketTechUrl: String,
+    @SerializedName("eagle_mis_url")
+    val eagleMisUrl: String,
+    @SerializedName("eagle_dns_url")
+    val eagleDnsUrl: String,
+    @SerializedName("bind_driver_qr_url")
+    val bindDriverQRUrl: String,
+    @SerializedName("chart_socket_url")
+    val chartSocketUrl: String
 )

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
 

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

@@ -13,7 +13,7 @@ class PncActionsHelper {
                 }
                 // 车道保持  driving_action： 1:车道保持状态，2:跟车状态
                 LANKE_KEEP_VALUE -> {
-                    if(driveAction == 2) "正在跟随车辆行驶" else ""
+                    if (driveAction == 2) "正在跟随车辆行驶" else ""
                 }
                 // 红绿灯通行状态  driving_action：1 表示停止动作；driving_action:2 表示通行动作
                 TRAFFIC_LIGHT_VALUE -> {
@@ -79,6 +79,18 @@ class PncActionsHelper {
                 PULL_OVER_VALUE -> {
                     if (driveAction == 1) "正在进站" else if (driveAction == 2) "正在等待进站" else ""
                 }
+                // 同 AUTO_LANE_CHANGE_LEFT_VALUE 、AUTO_LANE_CHANGE_RIGHT_VALUE
+                AUTO_LANE_CHANGE_LEFT_V2N_VALUE, AUTO_LANE_CHANGE_RIGHT_V2N_VALUE -> {
+                    if (driveAction == 2) "正在绕过前方道路事件" else ""
+                }
+                // 同 LANE_AVOID_LEFT_VALUE 、LANE_AVOID_RIGHT_VALUE
+                LANE_AVOID_LEFT_V2N_VALUE, LANE_AVOID_RIGHT_V2N_VALUE -> {
+                    if (driveAction == 2) "正在避让前方道路事件" else ""
+                }
+                // 正在等待变道避让施工场景  driving_action：1 表示正在等待；driving_action:2 表示等待超时请求平行驾驶；
+                WAITING_V2N_VALUE -> {
+                    if (driveAction == 1) "正在尝试绕过前方道路事件" else if (driveAction == 2) "正在请求远程协助" else ""
+                }
                 else -> ""
             }
         }

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

@@ -100,6 +100,16 @@ object FunctionBuildConfig {
     @JvmField
     var appIdentityMode = "Taxi_Driver_Base"
 
+    /**
+     * 临时配置json
+     * 广告json
+     *
+     */
+    @Volatile
+    @JvmField
+    var tempConfig = ""
+
+
     /**
      * 配置连接工控机的IP地址
      * 小巴车 192.168.8.102

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

@@ -35,6 +35,12 @@ public class MogoServicePaths {
     @Deprecated
     public static final String PATH_FLOAT_VIEW_MANAGER = "/floatview/api";
 
+    /**
+     * Status View
+     */
+    @Keep
+    public static final String PATH_STATUS_VIEW_MANAGER = "/statusview/api";
+
     /**
      * obu-mogo 模块
      */
@@ -93,6 +99,7 @@ public class MogoServicePaths {
     @Keep
     public static final String PATH_DATA_CENTER_MODULE = "/data_center/api";
 
+
     @Keep
     public static final String PATH_VISUAL_ANGLE = "/map/angle_change";
 

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/DataSourceType.kt

@@ -0,0 +1,9 @@
+package com.mogo.eagle.core.data.msgbox
+
+enum class DataSourceType {
+    DEFAULT,
+    OBU,
+    TELEMATIC,
+    AICLOUD,
+    SUMMARY// V2X事件汇总
+}

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/telematic/TelematicConstant.kt

@@ -0,0 +1,12 @@
+package com.mogo.eagle.core.data.telematic
+
+/**
+ * @author: wangmingjun
+ * @date: 2023/3/3
+ * 供网约车司乘屏通信使用
+ */
+class TelematicConstant {
+    companion object {
+        const val BUSINESS_STRING = 100
+    }
+}

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;