yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.4.0] wait

Browse Source
This commit is contained in:
EmArrow
2024-04-08 17:59:32 +08:00
parent bcf36bb8ed
commit e12b17f9d3
7 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceFilterHelper.kt
View File

@@ -13,7 +13,7 @@ object TrackerSourceFilterHelper {
@SuppressLint("NewApi")
fun filterData(data: TrackedObject): Boolean {
if (!FunctionBuildConfig.isDrawUnknownIdentifyData && (data.type == TrafficTypeEnum.TYPE_TRAFFIC_ID_WEI_ZHI.type
|| data.type == TrafficTypeEnum.TYPE_TRAFFIC_ID_501.type || data.type == TrafficTypeEnum.TYPE_TRAFFIC_ID_502.type)
|| data.type == TrafficTypeEnum.TYPE_TRAFFIC_ID_DAO_LU_SHI_GONG.type || data.type == TrafficTypeEnum.TYPE_TRAFFIC_ID_DAO_LU_SHI_GU.type)
) {
return true
}
@@ -51,6 +51,7 @@ object TrackerSourceFilterHelper {
var color = ""
if (!FunctionBuildConfig.isDrawUnknownIdentifyData
&& data.type == TrafficTypeEnum.TYPE_TRAFFIC_ID_WEI_ZHI.type
&& data.type == TrafficTypeEnum.TYPE_TRAFFIC_ID_CONE.type
) {
return ""
}

44
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt
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

BIN
core/mogo-core-res/src/main/res/raw/sanjiaozhui.nt3d
View File

Binary file not shown.

2
gradle/bytex/bytex_lancetx.gradle
View File

@@ -1,6 +1,6 @@
apply plugin: 'LancetX'
LancetX {
enable true
enable false
enableInDebug true
blackList = [
"com.mogo.launcher.lancet.jank",

2
gradle/bytex/bytex_matrix.gradle
View File

@@ -2,7 +2,7 @@ if (!rootProject.isReleaseBuild()) {
apply plugin: 'bytex.matrix'
matrix {
trace {
enable = true //if you don't want to use trace canary, set false
enable = false //if you don't want to use trace canary, set false
baseMethodMapFile = "${project.buildDir}/matrix_output/customMethodMapping.txt"
blackListFile = "${project.projectDir}/matrixTrace/blackMethodList.txt"
}

2
gradle/bytex/bytex_thread_opt.gradle
View File

@@ -1,6 +1,6 @@
apply plugin: 'bytex.threadOpt'
thread_opt {
enable true
enable false
enableInDebug true
logLevel "DEBUG"
trace_enable !rootProject.isReleaseBuild()

4
libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt
View File

@@ -750,6 +750,10 @@ class AMapViewWrapper(mMapView: MapAutoView) : IMogoMapView, IMogoMapUIControlle
TrafficTypeEnum.TYPE_TRAFFIC_ID_BUS,
"添加感知模型到地图中……preVehicleStrBus="
)
addPreVehicleModelWeiZhi(
TrafficTypeEnum.TYPE_TRAFFIC_ID_CONE,
"添加感知模型到地图中……preVehicleStrCone="
)
addPreVehicleModelWeiZhi(
TrafficTypeEnum.TYPE_TRAFFIC_ID_TRUCK,
"添加感知模型到地图中……preVehicleStrTruck="