Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local
This commit is contained in:
@@ -96,6 +96,7 @@ class ChainConstant {
|
||||
const val CHAIN_CODE_MAIN_BLOCK = "CHAIN_CODE_MAIN_BLOCK"
|
||||
const val CHAIN_CODE_DISPATCH_RECEIVE = "CHAIN_CODE_DISPATCH_RECEIVE"
|
||||
const val CHAIN_CODE_DISPATCH_START = "CHAIN_CODE_DISPATCH_START"
|
||||
const val CHAIN_CODE_REDIS_DATA_LOAD = "CHAIN_CODE_REDIS_DATA_LOAD"
|
||||
|
||||
const val CHAIN_CODE_CLOUD_INIT = "CHAIN_CODE_CLOUD_INIT"
|
||||
const val CHAIN_CODE_CLOUD_PASSPORT_TOKEN = "CHAIN_CODE_CLOUD_PASSPORT_TOKEN"
|
||||
|
||||
@@ -832,7 +832,7 @@ enum class EventTypeEnumNew(
|
||||
}
|
||||
TYPE_SOCKET_ROAD_CONGESTION.poiType -> R.raw.v2x_yongdu
|
||||
TYPE_SOCKET_ROAD_PEOPLE_CROSS.poiType -> if (FunctionBuildConfig.skinMode != 0) TrafficTypeEnum.TYPE_TRAFFIC_ID_PEOPLE.traffic3DIconId else TrafficTypeEnum.TYPE_TRAFFIC_ID_PEOPLE.traffic3DNightIconId
|
||||
TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE.poiType -> if (FunctionBuildConfig.skinMode != 0) TrafficTypeEnum.TYPE_TRAFFIC_ID_TA_CHE.traffic3DIconId else TrafficTypeEnum.TYPE_TRAFFIC_ID_TA_CHE.traffic3DNightIconId
|
||||
TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE.poiType -> if (FunctionBuildConfig.skinMode != 0) TrafficTypeEnum.TYPE_TRAFFIC_ID_TA_CHE_RETROGRADE.traffic3DIconId else TrafficTypeEnum.TYPE_TRAFFIC_ID_TA_CHE_RETROGRADE.traffic3DNightIconId
|
||||
else -> 0
|
||||
}
|
||||
}
|
||||
|
||||
@@ -121,8 +121,18 @@ enum class TrafficTypeEnum(
|
||||
R.raw.v2x_shigu_sanjiaopai,
|
||||
R.raw.v2x_shigu_sanjiaopai,
|
||||
R.raw.v2x_shigu_sanjiaopai
|
||||
),
|
||||
|
||||
TYPE_TRAFFIC_ID_TA_CHE_RETROGRADE(
|
||||
100062,
|
||||
"他车逆行",
|
||||
R.raw.traffic_tachexiaoche_retrograde,
|
||||
R.raw.traffic_tachexiaoche_retrograde,
|
||||
R.raw.traffic_tachexiaoche_retrograde
|
||||
);
|
||||
|
||||
|
||||
|
||||
companion object {
|
||||
@JvmStatic
|
||||
fun getType(type: Int): TrafficTypeEnum {
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
package com.mogo.eagle.core.data.och
|
||||
|
||||
import com.mogo.eagle.core.data.map.MogoLocation
|
||||
|
||||
// type 0-> 起终点坐标 坐标index 0 起点 坐标index 1 终点
|
||||
data class OchInfo(var type: Int, var latLonList: List<MogoLocation>)
|
||||
Reference in New Issue
Block a user