Merge branch 'dev_robotaxi-d_240401_6.4.0' into dev_robotaxi-d_240401_6.4.0_work_order

This commit is contained in:
xuxinchao
2024-04-18 19:58:27 +08:00
513 changed files with 7630 additions and 5896 deletions

View File

@@ -119,6 +119,12 @@ object FunctionBuildConfig {
@JvmField
var appIdentityMode = "Taxi_Driver_Base"
@Volatile
@JvmField
var supportBusiness = mutableListOf<String>()
/**
* 各车型宣传视频本地配置
* 广告json

View File

@@ -17,21 +17,6 @@ enum class TrafficTypeEnum(
var traffic3DIconId: Int,
var traffic3DNightIconId: Int
) {
TYPE_TRAFFIC_ID_501(
501,
"未知数据",
R.raw.traffic_xiankuang,
R.raw.traffic_xiankuang,
R.raw.traffic_xiankuang
),
TYPE_TRAFFIC_ID_502(
502,
"未知数据",
R.raw.traffic_xiankuang,
R.raw.traffic_xiankuang,
R.raw.traffic_xiankuang
),
TYPE_TRAFFIC_ID_WEI_ZHI(
100,
"未知数据",
@@ -95,12 +80,12 @@ enum class TrafficTypeEnum(
R.raw.special_vehicle,
R.raw.special_vehicle
),
TYPE_TRAFFIC_ID_DAO_LU_SHI_GONG(
TYPE_TRAFFIC_ID_CONE(
12,
"道路施工",
R.raw.v2x_shigong_warning,
R.raw.v2x_shigong_warning,
R.raw.v2x_shigong_warning
"三角锥",
R.raw.sanjiaozhui,
R.raw.sanjiaozhui,
R.raw.sanjiaozhui
),
TYPE_TRAFFIC_ID_LUCE_TA_CHE(
103,
@@ -122,6 +107,20 @@ enum class TrafficTypeEnum(
R.raw.lucedaba,
R.raw.lucedaba,
R.raw.lucedaba
),
TYPE_TRAFFIC_ID_DAO_LU_SHI_GONG(
501,
"道路施工",
R.raw.v2x_shigong_warning,
R.raw.v2x_shigong_warning,
R.raw.v2x_shigong_warning
),
TYPE_TRAFFIC_ID_DAO_LU_SHI_GU(
502,
"道路事故",
R.raw.v2x_shigu_sanjiaopai,
R.raw.v2x_shigu_sanjiaopai,
R.raw.v2x_shigu_sanjiaopai
);
companion object {
@@ -134,6 +133,7 @@ enum class TrafficTypeEnum(
TYPE_TRAFFIC_ID_TA_CHE.type -> TYPE_TRAFFIC_ID_TA_CHE
TYPE_TRAFFIC_ID_MOTO.type -> TYPE_TRAFFIC_ID_MOTO
TYPE_TRAFFIC_ID_BUS.type -> TYPE_TRAFFIC_ID_BUS
TYPE_TRAFFIC_ID_CONE.type -> TYPE_TRAFFIC_ID_CONE
TYPE_TRAFFIC_ID_TRUCK.type -> TYPE_TRAFFIC_ID_TRUCK
TYPE_TRAFFIC_ID_CAMERA.type -> TYPE_TRAFFIC_ID_CAMERA
TYPE_TRAFFIC_ID_SPECIAL_VEHICLE.type -> TYPE_TRAFFIC_ID_SPECIAL_VEHICLE
@@ -153,6 +153,7 @@ enum class TrafficTypeEnum(
TYPE_TRAFFIC_ID_TA_CHE.type -> R.raw.taxi_traffic_tachexiaoche
TYPE_TRAFFIC_ID_MOTO.type -> R.raw.taxi_traffic_motuoche
TYPE_TRAFFIC_ID_BUS.type -> R.raw.taxi_traffic_daba
TYPE_TRAFFIC_ID_CONE.type -> R.raw.sanjiaozhui
TYPE_TRAFFIC_ID_TRUCK.type -> R.raw.taxi_traffic_daba
TYPE_TRAFFIC_ID_CAMERA.type -> R.raw.shexiangtou
TYPE_TRAFFIC_ID_SPECIAL_VEHICLE.type -> R.raw.special_vehicle
@@ -170,6 +171,7 @@ enum class TrafficTypeEnum(
TYPE_TRAFFIC_ID_TA_CHE.type -> R.raw.traffic_tachexiaoche_day
TYPE_TRAFFIC_ID_MOTO.type -> R.raw.traffic_motuoche_day
TYPE_TRAFFIC_ID_BUS.type -> R.raw.traffic_daba_day
TYPE_TRAFFIC_ID_CONE.type -> R.raw.sanjiaozhui
TYPE_TRAFFIC_ID_TRUCK.type -> R.raw.traffic_daba_day
TYPE_TRAFFIC_ID_CAMERA.type -> R.raw.shexiangtou
TYPE_TRAFFIC_ID_SPECIAL_VEHICLE.type -> R.raw.special_vehicle
@@ -190,6 +192,7 @@ enum class TrafficTypeEnum(
TYPE_TRAFFIC_ID_TA_CHE.type -> R.raw.taxi_traffic_tachexiaoche
TYPE_TRAFFIC_ID_MOTO.type -> R.raw.taxi_traffic_motuoche
TYPE_TRAFFIC_ID_BUS.type -> R.raw.taxi_traffic_daba
TYPE_TRAFFIC_ID_CONE.type -> R.raw.sanjiaozhui
TYPE_TRAFFIC_ID_TRUCK.type -> R.raw.taxi_traffic_daba
TYPE_TRAFFIC_ID_CAMERA.type -> R.raw.shexiangtou
TYPE_TRAFFIC_ID_SPECIAL_VEHICLE.type -> R.raw.special_vehicle
@@ -207,6 +210,7 @@ enum class TrafficTypeEnum(
TYPE_TRAFFIC_ID_TA_CHE.type -> R.raw.traffic_tachexiaoche
TYPE_TRAFFIC_ID_MOTO.type -> R.raw.traffic_motuoche
TYPE_TRAFFIC_ID_BUS.type -> R.raw.traffic_daba
TYPE_TRAFFIC_ID_CONE.type -> R.raw.sanjiaozhui
TYPE_TRAFFIC_ID_TRUCK.type -> R.raw.traffic_daba
TYPE_TRAFFIC_ID_CAMERA.type -> R.raw.shexiangtou
TYPE_TRAFFIC_ID_SPECIAL_VEHICLE.type -> R.raw.special_vehicle