[6.2.4]merge

This commit is contained in:
zhongchao
2023-12-14 15:28:45 +08:00
73 changed files with 563 additions and 620 deletions

View File

@@ -0,0 +1,6 @@
package com.mogo.eagle.core.data.deva.chain
import com.mogo.eagle.core.data.app.AppConfigInfo
data class ChainCommon(val lat:Double, val lon:Double, val lineId:Long, val eagleVersionCode:Int = AppConfigInfo.appVersionCode) {
}

View File

@@ -22,14 +22,13 @@ class ChainConstant {
const val CHAIN_SOURCE_OCH = 13
//业务类型与下方文件名一一对应
const val CHAIN_TYPE_STATUS = 0 // 各个业务初始化信息,配置信息.链接状态,点击信息
const val CHAIN_TYPE_STATUS = 0 // 记录所有业务信息(正常调用,异常数据)
const val CHAIN_TYPE_GNSS = 1 // 工控定位数据
const val CHAIN_TYPE_SOCKET_AUTOPILOT = 2 // 包括自动驾驶状态,reportMsg,planning数据,全局路径数据,FM
const val CHAIN_TYPE_SOCKET_DATA_TRACKED = 3 // 感知数据,现阶段记录云端漫游
const val CHAIN_TYPE_SOCKET_TRAJECTORY = 4 // 前车引导线,用于调试
const val CHAIN_TYPE_SOCKET_VEHICLE = 5 // 底盘数据
const val CHAIN_TYPE_SOCKET_TRAFFIC_LIGHT = 6 // 多元红绿灯聚合数据
const val CHAIN_TYPE_V2X = 100 // V2X(V2I、V2N)
const val CHAIN_TYPE_ANR_LEAK = 300
const val CHAIN_TYPE_WEAK_NETWORK = 400
const val CHAIN_TYPE_OCH = 500
@@ -42,7 +41,6 @@ class ChainConstant {
const val CHAIN_LINK_LOG_ADAS_TRAJECTORY = "-adasTrajectory"
const val CHAIN_LINK_LOG_ADAS_VEHICLE = "-adasVehicle"
const val CHAIN_LINK_LOG_ADAS_TRAFFIC_LIGHT = "-UnionTrafficLight"
const val CHAIN_LINK_LOG_V2X = "-eagleCloudWSV2X"
const val CHAIN_LINK_LOG_RECORD_ANR = "-eagleRecordANR"
const val CHAIN_LINK_LOG_RECORD_WEAK_NETWORK = "-eagleRecordWeakNetwork"
const val CHAIN_LINK_LOG_OCH = "-eagleOch"
@@ -102,8 +100,8 @@ class ChainConstant {
const val CHAIN_CODE_HTTP_DNS_CITY_CODE = "CHAIN_CODE_HTTP_DNS_CITY_CODE"
const val CHAIN_CODE_HTTP_DNS_ERROR_REASON = "CHAIN_CODE_HTTP_DNS_ERROR_REASON"
const val CHAIN_CODE_DATA_CENTER = "CHAIN_CODE_DATA_CENTER"
const val CHAIN_CODE_V2X_MSG = "CHAIN_CODE_V2X_MSG"
const val CHAIN_CODE_MSG_BOX = "CHAIN_CODE_MSG_BOX"
const val CHAIN_CODE_HD_MAP_CALL = "CHAIN_CODE_HD_MAP_CALL"
const val CHAIN_CODE_HD_MAP_ROAD_CROSS = "CHAIN_CODE_HD_MAP_ROAD_CROSS"
const val CHAIN_CODE_HD_MAP_ICON_SET = "CHAIN_CODE_HD_MAP_ICON_SET"

View File

@@ -40,7 +40,7 @@ public class MarkerUserInfo implements Serializable {
int year = cal.get(Calendar.YEAR);
//2020-30=1990
double ageDiffer = year - getAgeNumber();
double ageDiffer = (double) (year - getAgeNumber());
String ageStr = "" + ageDiffer;
char[] ageChars = ageStr.toCharArray();