diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceFilterHelper.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceFilterHelper.kt index 13c4c0f747..881e35fb41 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceFilterHelper.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceFilterHelper.kt @@ -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 "" } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt index d58e416597..ddc371b711 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt @@ -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 diff --git a/core/mogo-core-res/src/main/res/raw/sanjiaozhui.nt3d b/core/mogo-core-res/src/main/res/raw/sanjiaozhui.nt3d index e0251bd11d..1128662175 100644 Binary files a/core/mogo-core-res/src/main/res/raw/sanjiaozhui.nt3d and b/core/mogo-core-res/src/main/res/raw/sanjiaozhui.nt3d differ diff --git a/gradle/bytex/bytex_lancetx.gradle b/gradle/bytex/bytex_lancetx.gradle index fcb77e1c5d..ac56f4968c 100644 --- a/gradle/bytex/bytex_lancetx.gradle +++ b/gradle/bytex/bytex_lancetx.gradle @@ -1,6 +1,6 @@ apply plugin: 'LancetX' LancetX { - enable true + enable false enableInDebug true blackList = [ "com.mogo.launcher.lancet.jank", diff --git a/gradle/bytex/bytex_matrix.gradle b/gradle/bytex/bytex_matrix.gradle index 05e07ead89..e7d52f4de5 100644 --- a/gradle/bytex/bytex_matrix.gradle +++ b/gradle/bytex/bytex_matrix.gradle @@ -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" } diff --git a/gradle/bytex/bytex_thread_opt.gradle b/gradle/bytex/bytex_thread_opt.gradle index 54e13f1319..200115b131 100644 --- a/gradle/bytex/bytex_thread_opt.gradle +++ b/gradle/bytex/bytex_thread_opt.gradle @@ -1,6 +1,6 @@ apply plugin: 'bytex.threadOpt' thread_opt { - enable true + enable false enableInDebug true logLevel "DEBUG" trace_enable !rootProject.isReleaseBuild() diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt index 2384d01dbc..42f8b2a77c 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt @@ -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="