diff --git a/.idea/misc.xml b/.idea/misc.xml index c453c35421..c5ecb8cf8a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -13,7 +13,8 @@ - + + diff --git a/gradle.properties b/gradle.properties index b466002c7b..9695df7068 100644 --- a/gradle.properties +++ b/gradle.properties @@ -181,7 +181,7 @@ MOGO_AICLOUD_SERVICES_APK_VERSION=1.0.0-SNAPSHOT # mogoAiCloud sdk services MOGO_AICLOUD_SERVICES_SDK_VERSION=1.0.0-SNAPSHOT # 自研地图 -MAP_SDK_VERSION=1.0.0-vr-8.5.77 +MAP_SDK_VERSION=1.0.1-vr-1.0.2 ## 产品库必备配置,产品库自动对versionCode和versionName版本进行升级 diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt index 50bc4cdcb4..6106f83e99 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt @@ -11,6 +11,7 @@ import com.mogo.map.marker.MogoMarkerOptions import com.mogo.module.common.MogoApisHandler import com.mogo.module.common.constants.DataTypes import com.mogo.module.common.drawer.bean.TrafficData +import com.mogo.module.common.enums.TrafficTypeEnum import com.mogo.utils.WorkThreadHandler import java.util.concurrent.ConcurrentHashMap @@ -132,19 +133,21 @@ object TrafficMarkerDrawer { ) ) - // 修改颜色 - when (trafficData.threatLevel) { - 1 -> { - mMarkersCaches[trafficData.uuid]?.setAnchorColor("#D8D8D8FF") - } - 2 -> { - mMarkersCaches[trafficData.uuid]?.setAnchorColor("#FFD53EFF") - } - 3 -> { - mMarkersCaches[trafficData.uuid]?.setAnchorColor("#FF3C45FF") - } - else -> { - mMarkersCaches[trafficData.uuid]?.setAnchorColor("#D8D8D8FF") + if (trafficData.type != TrafficTypeEnum.TYPE_TRAFFIC_ID_SPECIAL_VEHICLE) { + // 修改颜色 + when (trafficData.threatLevel) { + 1 -> { + mMarkersCaches[trafficData.uuid]?.setAnchorColor("#D8D8D8FF") + } + 2 -> { + mMarkersCaches[trafficData.uuid]?.setAnchorColor("#FFD53EFF") + } + 3 -> { + mMarkersCaches[trafficData.uuid]?.setAnchorColor("#FF3C45FF") + } + else -> { + mMarkersCaches[trafficData.uuid]?.setAnchorColor("#D8D8D8FF") + } } } @@ -173,19 +176,21 @@ object TrafficMarkerDrawer { options.resName(mMarkerCachesResMd5Values[resIdVal]) .icon3DRes(resId) - // 修改颜色 - when (trafficData.threatLevel) { - 1 -> { - mMarkersCaches[trafficData.uuid]?.setAnchorColor("#D8D8D8FF") - } - 2 -> { - mMarkersCaches[trafficData.uuid]?.setAnchorColor("#FFD53EFF") - } - 3 -> { - mMarkersCaches[trafficData.uuid]?.setAnchorColor("#FF3C45FF") - } - else -> { - mMarkersCaches[trafficData.uuid]?.setAnchorColor("#D8D8D8FF") + if (trafficData.type != TrafficTypeEnum.TYPE_TRAFFIC_ID_SPECIAL_VEHICLE) { + // 修改颜色 + when (trafficData.threatLevel) { + 1 -> { + mMarkersCaches[trafficData.uuid]?.setAnchorColor("#D8D8D8FF") + } + 2 -> { + mMarkersCaches[trafficData.uuid]?.setAnchorColor("#FFD53EFF") + } + 3 -> { + mMarkersCaches[trafficData.uuid]?.setAnchorColor("#FF3C45FF") + } + else -> { + mMarkersCaches[trafficData.uuid]?.setAnchorColor("#D8D8D8FF") + } } } diff --git a/modules/mogo-module-common/src/main/res-warning/drawable/bg_warning_bg.xml b/modules/mogo-module-common/src/main/res-warning/drawable/bg_warning_bg.xml index 7ba3f1ef29..a828c9070f 100644 --- a/modules/mogo-module-common/src/main/res-warning/drawable/bg_warning_bg.xml +++ b/modules/mogo-module-common/src/main/res-warning/drawable/bg_warning_bg.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/res/raw/special_vehicle.n3d b/modules/mogo-module-common/src/main/res/raw/special_vehicle.n3d index 1df2a36738..d0695fa945 100644 Binary files a/modules/mogo-module-common/src/main/res/raw/special_vehicle.n3d and b/modules/mogo-module-common/src/main/res/raw/special_vehicle.n3d differ diff --git a/modules/mogo-module-hmi/src/main/res/layout/view_traffic_light_vr.xml b/modules/mogo-module-hmi/src/main/res/layout/view_traffic_light_vr.xml index 2708c7df45..e0383fa74f 100644 --- a/modules/mogo-module-hmi/src/main/res/layout/view_traffic_light_vr.xml +++ b/modules/mogo-module-hmi/src/main/res/layout/view_traffic_light_vr.xml @@ -6,9 +6,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/bg_waring_traffic_light_vr" - android:paddingStart="18px" + android:paddingStart="10px" android:paddingTop="10px" - android:paddingEnd="18px" + android:paddingEnd="10px" android:paddingBottom="10px" android:visibility="gone" tools:visibility="visible"> diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt index c561b82c8a..22f0cce6ca 100644 --- a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt +++ b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt @@ -240,7 +240,7 @@ class MogoPrivateObuManager private constructor() { * @see com.zhidao.support.obu.constants.ObuConstants.USE_CASE_ID */ override fun onCvxV2vThreatIndInfo(info: CvxV2vThreatIndInfo?) { - Logger.e(MogoObuConst.TAG_MOGO_OBU, "onCvxV2vThreatIndInfo ------> $info") + Logger.d(MogoObuConst.TAG_MOGO_OBU, "onCvxV2vThreatIndInfo ------> $info") info?.let { //预警信息,预警类型 threat_level 3 info.threat_info?.let {