From 5ddbffd7f8104fd683259dde377cb0125996f0a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 14 Aug 2020 21:17:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=A0=E6=8E=89=E4=BA=86canLive=E7=9A=84?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/impl/MoGoV2XMarkerManager.java | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java index bef7d59ab0..6ab7028046 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java @@ -132,20 +132,17 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager { if (exploreWayList != null) { for (MarkerExploreWay markerExploreWay : exploreWayList) { - // 因为目前探路卡片不支持直播，所以这里做了过滤 @李小鹏 - if (!markerExploreWay.getCanLive()) { - if (EventTypeUtils.isRoadEvent(markerExploreWay.getPoiType())) { - MarkerLocation markerLocation = markerExploreWay.getLocation(); - // 记录道路事件 - V2XRoadEventEntity v2XRoadEventEntity = new V2XRoadEventEntity(); - v2XRoadEventEntity.setLocation(markerLocation); - // 探路目前只有上报拥堵 - v2XRoadEventEntity.setPoiType(markerExploreWay.getPoiType()); + if (EventTypeUtils.isRoadEvent(markerExploreWay.getPoiType())) { + MarkerLocation markerLocation = markerExploreWay.getLocation(); + // 记录道路事件 + V2XRoadEventEntity v2XRoadEventEntity = new V2XRoadEventEntity(); + v2XRoadEventEntity.setLocation(markerLocation); + // 探路目前只有上报拥堵 + v2XRoadEventEntity.setPoiType(markerExploreWay.getPoiType()); - v2XRoadEventEntity.setNoveltyInfo(markerExploreWay); - v2XRoadEventEntity.setExpireTime(20000); - mV2XRoadEventEntityArrayList.add(v2XRoadEventEntity); - } + v2XRoadEventEntity.setNoveltyInfo(markerExploreWay); + v2XRoadEventEntity.setExpireTime(20000); + mV2XRoadEventEntityArrayList.add(v2XRoadEventEntity); } } } From 6d24a57eaf7a150fc31058b4001b8e3319aed036 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 17 Aug 2020 11:14:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=20=E3=80=90?= =?UTF-8?q?=E6=99=BA=E6=85=A7=E9=A9=BE=E9=A9=B61.1.2=E3=80=91=E5=87=BA?= =?UTF-8?q?=E8=A1=8C=E5=8A=A8=E6=80=81=EF=BC=8C=E6=97=B6=E9=97=B4=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=B8=BA=E7=AC=AC=E4=BA=8C=E6=97=A5=EF=BC=8C=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=9C=AA=E6=B8=85=E7=A9=BA=20http:/?= =?UTF-8?q?/jira.zhidaohulian.com/browse/E85XJD-167?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/module/v2x/V2XModuleProvider.java | 3 --- .../mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java index ba01c75bbf..c966d01ef4 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java @@ -31,7 +31,6 @@ import com.mogo.module.v2x.scenario.scene.park.V2XIllegalParkScenario; import com.mogo.module.v2x.scenario.scene.park.V2XIllegalParkWindow; import com.mogo.module.v2x.utils.FatigueDrivingUtils; import com.mogo.module.v2x.utils.TimeUtils; -import com.mogo.module.v2x.utils.V2XSQLiteUtils; import com.mogo.module.v2x.utils.V2XUtils; import com.mogo.module.v2x.voice.V2XVoiceManager; import com.mogo.service.module.IMogoModuleLifecycle; @@ -156,8 +155,6 @@ public class V2XModuleProvider implements } // 刷新配置文件 refreshStrategyConfig(); - // 清除V2X事件数据库中过期的数据，数据有效期为24小时 - V2XSQLiteUtils.clearYesterdayScenarioHistoryData(); } /** diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java index f1ca65c970..9211a4f569 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java @@ -19,6 +19,7 @@ import com.mogo.module.v2x.manager.IMoGoV2XStatusChangedListener; import com.mogo.module.v2x.manager.V2XStatusDescriptor; import com.mogo.module.v2x.presenter.ScenarioHistoryPresenter; import com.mogo.module.v2x.utils.ThreadUtils; +import com.mogo.module.v2x.utils.V2XSQLiteUtils; import com.mogo.module.v2x.view.V2XListEmptyView; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.utils.GsonUtil; @@ -130,6 +131,8 @@ public class V2XScenarioHistoryFragment @Override public void onResume() { super.onResume(); + // 清除V2X事件数据库中过期的数据，数据有效期为24小时 + V2XSQLiteUtils.clearYesterdayScenarioHistoryData(); mPresenter.loadHistory(); } From aa0081990a65e5ba1a92ed97dd7013c47707a586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 17 Aug 2020 11:53:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E5=8C=B9=E9=85=8D=E7=AD=96=E7=95=A5=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/module/v2x/V2XConst.java | 1 + .../module/v2x/listener/V2XLocationListener.java | 2 ++ .../v2x/listener/V2XMessageListener_401012.java | 2 ++ .../com/mogo/module/v2x/utils/TrackUtils.java | 15 +++++++++++++++ 4 files changed, 20 insertions(+) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java index bb79de34e4..986804044a 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java @@ -60,6 +60,7 @@ public class V2XConst { public static final String V2X_ROAD_SHOW = "v2x_road_show"; public static final String V2X_ROAD_EVET = "v2x_road_event"; public static final String V2X_ROAD_EVET_HISTORY_BUTTON = "V2X_button_click"; + public static final String V2X_ROAD_PRODUCE = "v2x_road_produce"; /** * V2X 道路事件操作类型 */ diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java index 15654165b7..c70ac2c702 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java @@ -26,6 +26,7 @@ import com.mogo.module.v2x.utils.ADASUtils; import com.mogo.module.v2x.utils.DrivingDirectionUtils; import com.mogo.module.v2x.utils.LocationUtils; import com.mogo.module.v2x.utils.MarkerUtils; +import com.mogo.module.v2x.utils.TrackUtils; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.utils.GsonUtil; @@ -157,6 +158,7 @@ public class V2XLocationListener implements IMogoLocationListener, CarStatusList ); // Logger.w(MODULE_NAME, "V2X预警--前方数据距离:" + v2XRoadEventEntity.getDistance()); // 触发展示操作 + TrackUtils.trackV2xRoadProduceEvent(1); V2XMessageEntity v2XMessageEntity = new V2XMessageEntity<>(); v2XMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING); v2XMessageEntity.setContent(v2XRoadEventEntity); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java index 2c794c6e75..aeb1c8d287 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java @@ -17,6 +17,7 @@ import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.alarm.V2XAlarmServer; import com.mogo.module.v2x.utils.TimeConstants; import com.mogo.module.v2x.utils.TimeUtils; +import com.mogo.module.v2x.utils.TrackUtils; import com.mogo.module.v2x.utils.V2XUtils; import com.mogo.service.connection.IMogoOnMessageListener; import com.mogo.utils.logger.Logger; @@ -42,6 +43,7 @@ public class V2XMessageListener_401012 implements IMogoOnMessageListener properties = new HashMap<>(); + properties.put("type", type); + V2XServiceManager.getMogoAnalytics().track(V2XConst.V2X_ROAD_PRODUCE, properties); + } catch (Exception e) { + e.printStackTrace(); + } + } }