diff --git a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java index 876927e100..1b93808e8d 100644 --- a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java +++ b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java @@ -166,6 +166,9 @@ public class SmallMapDirectionView @Override public void onLocationChanged(@Nullable MogoLocation location) { //Logger.d(TAG, "onCarLocationChanged2 :" + location.getLatitude()+":"+location.getLongitude()); + if (location == null){ + return; + } LatLng currentLatLng = new LatLng(location.getLatitude(), location.getLongitude()); //更新车辆位置 if (mCarMarker != null) { 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 f3f7516287..6cb6aab617 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 @@ -16,10 +16,10 @@ enum class TrafficTypeEnum( ) { TYPE_TRAFFIC_ID_WEI_ZHI( - 0, + 100, "未知数据", - R.raw.special_vehicle, - R.raw.special_vehicle + R.raw.v2x_shigong_warning, + R.raw.v2x_shigong_warning ), TYPE_TRAFFIC_ID_PEOPLE( 1, diff --git a/gradle.properties b/gradle.properties index b13f1baab3..55039d2785 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,7 +37,7 @@ kapt.include.compile.classpath=false android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true -android.jetifier.blacklist=module-service-2.1.16.6.aar +android.jetifier.blacklist=module-service-2.1.16.8.aar ## maven 配置 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ @@ -89,102 +89,102 @@ applicationName=IntelligentPilot versionCode=80007 versionName=8.0.15 ################# 新架构模块Maven版本管理 ################# -MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.58.6 -MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.58.6 -MOGO_CORE_FUNCTION_HMI_VERSION=0.0.58.6 -MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.58.6 -MOGO_CORE_FUNCTION_MAP_VERSION=0.0.58.6 -MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.58.6 -MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.58.6 -MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.58.6 -MOGO_CORE_FUNCTION_SMP_VERSION=0.0.58.6 -MOGO_CORE_FUNCTION_V2X_VERSION=0.0.58.6 -MOGO_CORE_DATA_VERSION=0.0.58.6 -MOGO_CORE_FUNCTION_API_VERSION=0.0.58.6 -MOGO_CORE_FUNCTION_CALL_VERSION=0.0.58.6 -MOGO_CORE_RES_VERSION=0.0.58.6 -MOGO_CORE_UTILS_VERSION=0.0.58.6 -MOGO_CORE_NETWORK_VERSION=0.0.58.6 +MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.58.8 +MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.58.8 +MOGO_CORE_FUNCTION_HMI_VERSION=0.0.58.8 +MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.58.8 +MOGO_CORE_FUNCTION_MAP_VERSION=0.0.58.8 +MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.58.8 +MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.58.8 +MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.58.8 +MOGO_CORE_FUNCTION_SMP_VERSION=0.0.58.8 +MOGO_CORE_FUNCTION_V2X_VERSION=0.0.58.8 +MOGO_CORE_DATA_VERSION=0.0.58.8 +MOGO_CORE_FUNCTION_API_VERSION=0.0.58.8 +MOGO_CORE_FUNCTION_CALL_VERSION=0.0.58.8 +MOGO_CORE_RES_VERSION=0.0.58.8 +MOGO_CORE_UTILS_VERSION=0.0.58.8 +MOGO_CORE_NETWORK_VERSION=0.0.58.8 ################# 旧版本架构模块版本 ################# ## 工程内模块 -MOGO_COMMONS_VERSION=2.1.16.6 -MOGO_UTILS_VERSION=2.1.16.6 -MAP_AMAP_VERSION=2.1.16.6 -MAP_AUTONAVI_VERSION=2.1.16.6 -MOGO_MAP_VERSION=2.1.16.6 -MOGO_MAP_API_VERSION=2.1.16.6 -MOGO_SERVICE_VERSION=2.1.16.6 -MOGO_SERVICE_API_VERSION=2.1.16.6 -MOGO_CONNECTION_VERSION=2.1.16.6 -MOGO_MODULE_APPS_VERSION=2.1.16.6 -MOGO_MODULE_NAVI_VERSION=2.1.16.6 -MOGO_MODULE_SHARE_VERSION=2.1.16.6 -MOGO_MODULE_COMMON_VERSION=2.1.16.6 -MOGO_MODULE_MAIN_VERSION=2.1.16.6 -MOGO_MODULE_MAP_VERSION=2.1.16.6 -MOGO_MODULE_SERVICE_VERSION=2.1.16.6 -MOGO_MODULE_EXTENSIONS_VERSION=2.1.16.6 -MOGO_MODULE_SEARCH_VERSION=2.1.16.6 -MOGO_MODULE_BACK_VERSION=2.1.16.6 -MOGO_MODULE_V2X_VERSION=2.1.16.6 +MOGO_COMMONS_VERSION=2.1.16.8 +MOGO_UTILS_VERSION=2.1.16.8 +MAP_AMAP_VERSION=2.1.16.8 +MAP_AUTONAVI_VERSION=2.1.16.8 +MOGO_MAP_VERSION=2.1.16.8 +MOGO_MAP_API_VERSION=2.1.16.8 +MOGO_SERVICE_VERSION=2.1.16.8 +MOGO_SERVICE_API_VERSION=2.1.16.8 +MOGO_CONNECTION_VERSION=2.1.16.8 +MOGO_MODULE_APPS_VERSION=2.1.16.8 +MOGO_MODULE_NAVI_VERSION=2.1.16.8 +MOGO_MODULE_SHARE_VERSION=2.1.16.8 +MOGO_MODULE_COMMON_VERSION=2.1.16.8 +MOGO_MODULE_MAIN_VERSION=2.1.16.8 +MOGO_MODULE_MAP_VERSION=2.1.16.8 +MOGO_MODULE_SERVICE_VERSION=2.1.16.8 +MOGO_MODULE_EXTENSIONS_VERSION=2.1.16.8 +MOGO_MODULE_SEARCH_VERSION=2.1.16.8 +MOGO_MODULE_BACK_VERSION=2.1.16.8 +MOGO_MODULE_V2X_VERSION=2.1.16.8 # 探路 -MOGO_MODULE_TANLU_VERSION=2.1.16.6 +MOGO_MODULE_TANLU_VERSION=2.1.16.8 # 推送 -MOGO_MODULE_PUSH_VERSION=2.1.16.6 -MOGO_MODULE_PUSH_BASE_VERSION=2.1.16.6 -MOGO_MODULE_PUSH_NOOP_VERSION=2.1.16.6 +MOGO_MODULE_PUSH_VERSION=2.1.16.8 +MOGO_MODULE_PUSH_BASE_VERSION=2.1.16.8 +MOGO_MODULE_PUSH_NOOP_VERSION=2.1.16.8 # 探路上报和分享模块 -TANLULIB_VERSION=2.1.16.6 -MOGO_TANLU_API_VERSION=2.1.16.6 +TANLULIB_VERSION=2.1.16.8 +MOGO_TANLU_API_VERSION=2.1.16.8 #左侧面板模块 -MOGO_MODULE_LEFT_PANEL_VERSION=2.1.16.6 -MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.16.6 +MOGO_MODULE_LEFT_PANEL_VERSION=2.1.16.8 +MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.16.8 # 小控件 -MOGO_MODULE_WIDGETS_VERSION=2.1.16.6 +MOGO_MODULE_WIDGETS_VERSION=2.1.16.8 # obu -MOGO_MODULE_OBU_VERSION=2.1.16.6 -MOGO_MODULE_OBU_MOGO_VERSION=2.1.16.6 +MOGO_MODULE_OBU_VERSION=2.1.16.8 +MOGO_MODULE_OBU_MOGO_VERSION=2.1.16.8 # monitor -MOGO_MODULE_MONITOR_VERSION=2.1.16.6 +MOGO_MODULE_MONITOR_VERSION=2.1.16.8 # bugly -CRASHREPORT_VERSION=2.1.16.6 -CRASHREPORT_BUGLY_VERSION=2.1.16.6 -CRASHREPORT_NOOP_VERSION=2.1.16.6 -CRASHREPORT_UPGRADE_VERSION=2.1.16.6 +CRASHREPORT_VERSION=2.1.16.8 +CRASHREPORT_BUGLY_VERSION=2.1.16.8 +CRASHREPORT_NOOP_VERSION=2.1.16.8 +CRASHREPORT_UPGRADE_VERSION=2.1.16.8 ## tts -TTS_BASE_VERSION=2.1.16.6 -TTS_DI_VERSION=2.1.16.6 -TTS_ZHI_VERSION=2.1.16.6 -TTS_PAD_VERSION=2.1.16.6 -TTS_NOOP_VERSION=2.1.16.6 +TTS_BASE_VERSION=2.1.16.8 +TTS_DI_VERSION=2.1.16.8 +TTS_ZHI_VERSION=2.1.16.8 +TTS_PAD_VERSION=2.1.16.8 +TTS_NOOP_VERSION=2.1.16.8 # 自研地图 -MAP_CUSTOM_VERSION=2.1.16.6 -MOGO_MODULE_ADAS_VERSION=2.1.16.6 +MAP_CUSTOM_VERSION=2.1.16.8 +MOGO_MODULE_ADAS_VERSION=2.1.16.8 # 基础服务实现：passport、socket、location -MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.16.6 -MOGO_BASE_SERVICES_APK_VERSION=2.1.16.6 -MOGO_BASE_SERVICES_SDK_VERSION=2.1.16.6 -MOGO_MODULE_CHAT_VERSION=2.1.16.6 +MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.16.8 +MOGO_BASE_SERVICES_APK_VERSION=2.1.16.8 +MOGO_BASE_SERVICES_SDK_VERSION=2.1.16.8 +MOGO_MODULE_CHAT_VERSION=2.1.16.8 # 车聊聊 -MOGO_MODULE_CARCHATTING_VERSION=2.1.16.6 +MOGO_MODULE_CARCHATTING_VERSION=2.1.16.8 # 车聊聊接口 -MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.16.6 +MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.16.8 # 皮肤 -MOGO_SKIN_SUPPORT_VERSION=2.1.16.6 -MOGO_SKIN_LIGHT_VERSION=2.1.16.6 -MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.16.6 -MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.16.6 -SKIN_SUPPORT_VERSION=2.1.16.6 -SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.16.6 -SKIN_SUPPORT_CARDVIEW_VERSION=2.1.16.6 -SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.16.6 -SKIN_SUPPORT_DESIGN_VERSION=2.1.16.6 +MOGO_SKIN_SUPPORT_VERSION=2.1.16.8 +MOGO_SKIN_LIGHT_VERSION=2.1.16.8 +MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.16.8 +MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.16.8 +SKIN_SUPPORT_VERSION=2.1.16.8 +SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.16.8 +SKIN_SUPPORT_CARDVIEW_VERSION=2.1.16.8 +SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.16.8 +SKIN_SUPPORT_DESIGN_VERSION=2.1.16.8 # OCH -MOGO_OCH_VERSION=2.1.16.6-test +MOGO_OCH_VERSION=2.1.16.8-test MOGO_OCH_BUS_VERSION=2.0.66 MOGO_OCH_NOOP_VERSION=2.0.66 MOGO_OCH_TAXI_VERSION=2.0.66 # mogoAiCloud sdk services -MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.16.6 +MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.16.8 ################# 旧版本架构模块版本 ################# diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/IdentifyDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/IdentifyDataDrawer.java index 64a3d07820..0d9278c64d 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/IdentifyDataDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/IdentifyDataDrawer.java @@ -34,6 +34,11 @@ public class IdentifyDataDrawer { */ private final ConcurrentHashMap mDirtyPositions = new ConcurrentHashMap<>(); + /** + * 过滤后的数据集合 + */ + private final ArrayList mFilterTrafficData = new ArrayList<>(); + private IdentifyDataDrawer() { mContext = AbsMogoApplication.getApp(); addPreVehicleModel(); @@ -73,18 +78,21 @@ public class IdentifyDataDrawer { } // 循环将集合中的数据提取记录 - ArrayList trafficDataUuidList = new ArrayList<>(); - for (TrafficData trafficData : resultList) { - trafficDataUuidList.add(trafficData.getUuid()); - } - - // 找出上一针数据中已经不在本次数据中存在的数据 - for (String uuid : mMarkersCaches.keySet()) { - if (!trafficDataUuidList.contains(uuid)) { - mDirtyPositions.put(uuid, mMarkersCaches.get(uuid)); - } - } - +// ArrayList trafficDataUuidList = new ArrayList<>(); +// for (TrafficData trafficData : resultList) { +// // 过滤掉未知感知数据 +// if (trafficData.getType() == TrafficTypeEnum.TYPE_TRAFFIC_ID_WEI_ZHI) { +// //Logger.w(TAG, "未知感知类型数据，丢弃，不渲染"); +// continue; +// } +// trafficDataUuidList.add(trafficData.getUuid()); +// } +// // 找出上一针数据中已经不在本次数据中存在的数据 +// for (String uuid : mMarkersCaches.keySet()) { +// if (!trafficDataUuidList.contains(uuid)) { +// mDirtyPositions.put(uuid, mMarkersCaches.get(uuid)); +// } +// } // // 移除脏数据 // for (String uuid : mDirtyPositions.keySet()) { // MogoApisHandler.getInstance().getApis() @@ -97,10 +105,28 @@ public class IdentifyDataDrawer { MogoApisHandler.getInstance().getApis() .getMapServiceApi() .getMarkerManager(mContext) - .updateBatchMarkerPosition(resultList); + .updateBatchMarkerPosition(filterTrafficData(resultList)); } + /** + * 数据过滤器 + * + * @return 过滤后的数据集合 + */ + private ArrayList filterTrafficData(ArrayList trafficData) { + mFilterTrafficData.clear(); + for (TrafficData data : trafficData) { + // 过滤掉未知感知数据 + if (data.getType() == TrafficTypeEnum.TYPE_TRAFFIC_ID_WEI_ZHI) { + //Logger.w(TAG, "未知感知类型数据，丢弃，不渲染"); + continue; + } + mFilterTrafficData.add(data); + } + return mFilterTrafficData; + } + /** * 清除旧的 marker 数据