From 9da8b0c4615b5f253814773aed387ee836546bb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 18 Aug 2021 17:11:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=89=B9=E6=AE=8A=E8=BD=A6?= =?UTF-8?q?=E8=BE=86=EF=BC=8C=E4=B8=8D=E8=BF=9B=E8=A1=8C=E4=B8=8A=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 3 +- gradle.properties | 2 +- .../common/drawer/TrafficMarkerDrawer.kt | 57 ++++++++++-------- .../res-warning/drawable/bg_warning_bg.xml | 2 +- .../src/main/res/raw/special_vehicle.n3d | Bin 1058408 -> 1058408 bytes .../main/res/layout/view_traffic_light_vr.xml | 4 +- .../module/obu/mogo/MogoPrivateObuManager.kt | 2 +- 7 files changed, 38 insertions(+), 32 deletions(-) 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 1df2a36738bc73a888c0446964ae10a85f04c60a..d0695fa94542452a07115c0e2955f20e4ab804d4 100644 GIT binary patch delta 39659 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 delta 39659 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 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 {