From 7290d41b2b72239796cec1a87dee59508f9d799b Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Wed, 31 Mar 2021 15:48:49 +0800 Subject: [PATCH] opt --- .../zhidao/roadcondition/net/HttpClient.kt | 1 - .../mogo/module/v2x/MoGoV2XServicePaths.java | 6 ++ .../java/com/mogo/module/v2x/V2XConst.java | 5 + .../mogo/module/v2x/V2XModuleProvider.java | 2 +- .../mogo/module/v2x/V2XServiceManager.java | 12 +++ .../com/mogo/module/v2x/V2XWaringManager.java | 16 ++- .../v2x/entity/model/CloundWarningInfo.java | 4 +- .../IMoGoPersonWarnPolylineManager.java | 27 +++++ .../v2x/manager/IMoGoWarnPolylineManager.java | 2 +- .../impl/MoGoPersonWarnPolylineManager.java | 84 ++++++++++++++++ .../impl/MoGoV2XCloundDataManager.java | 99 +++++++++++++++---- .../manager/impl/MoGoWarnPolylineManager.java | 5 +- .../receiver/AdasDataBroadcastReceiver.java | 4 +- .../v2x/receiver/SceneBroadcastReceiver.java | 1 - 14 files changed, 229 insertions(+), 39 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/IMoGoPersonWarnPolylineManager.java create mode 100644 modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoPersonWarnPolylineManager.java diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/net/HttpClient.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/net/HttpClient.kt index 81d6b3bac9..376c6dd254 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/net/HttpClient.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/net/HttpClient.kt @@ -80,7 +80,6 @@ class HttpClient private constructor(baseUrl: String) { if (httpDns != null) { builder.dns(Dns { hostname: String? -> val addresses = httpDns.lookup(hostname) -// Log.d("liyz", "addresses 1 = $addresses") if (addresses != null && !addresses.isEmpty()) { return@Dns addresses } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/MoGoV2XServicePaths.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/MoGoV2XServicePaths.java index 6fe683f7e8..483ac4e448 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/MoGoV2XServicePaths.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/MoGoV2XServicePaths.java @@ -37,6 +37,12 @@ public class MoGoV2XServicePaths { @Keep public static final String PATH_V2X_WARN_POLYLINE_MANAGER = "/v2xWarnPolylineManager/api"; + /** + * V2X 二轮车和行人连接线 + */ + @Keep + public static final String PATH_V2X_PERSON_WARN_POLYLINE_MANAGER = "/v2xPersonWarnPolylineManager/api"; + /** * V2X 云端数据处理 */ 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 a610ab58d9..4d03e6cf94 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 @@ -145,4 +145,9 @@ public class V2XConst { * */ public static final String V2X_FRONT_WARNING_MARKER = "V2X_FRONT_WARNING_MARKER"; + /** + * V2X预警日志tag + */ + public static final String LOG_NAME_WARN = "liyz"; + } 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 417e971ee9..f6178c986d 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 @@ -303,7 +303,7 @@ public class V2XModuleProvider implements V2XServiceManager.getV2XMarkerService().startAutoRefresh(); // 锁车就是将地图视图移植中心点，因为行驶中的车和地图要相对的跟随 V2XServiceManager.getMapUIController().recoverLockMode(); - Log.d("liyz", "V2XModuleProvider ------> "); + Log.d(V2XConst.LOG_NAME_WARN, "V2XModuleProvider ------> "); //注册adas数据通道 V2XWaringManager.getInstance().registerAdasSocketMessage(mContext); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java index 1622399387..2df6f55679 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java @@ -16,6 +16,7 @@ import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.drawer.AdasRecognizedResultDrawer; import com.mogo.module.service.MarkerServiceHandler; import com.mogo.module.v2x.alarm.V2XCalculateServer; +import com.mogo.module.v2x.manager.IMoGoPersonWarnPolylineManager; import com.mogo.module.v2x.manager.IMoGoV2XCloundDataManager; import com.mogo.module.v2x.manager.IMoGoV2XMarkerManager; import com.mogo.module.v2x.manager.IMoGoV2XPolylineManager; @@ -112,6 +113,7 @@ public class V2XServiceManager { private static IMoGoV2XPolylineManager moGoV2XPolylineManager; private static IMoGoV2XStatusManager moGoV2XStatusManager; private static IMoGoWarnPolylineManager moGoWarnPolylineManager; + private static IMoGoPersonWarnPolylineManager moGoPersonWarnPolylineManager; private static IMoGoV2XCloundDataManager moGoV2XCloundDataManager; private V2XServiceManager() { @@ -167,6 +169,7 @@ public class V2XServiceManager { moGoV2XPolylineManager = (IMoGoV2XPolylineManager) ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_POLYLINE_MANAGER).navigation(context); moGoWarnPolylineManager = (IMoGoWarnPolylineManager) ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_WARN_POLYLINE_MANAGER).navigation(context); moGoV2XCloundDataManager = (IMoGoV2XCloundDataManager) ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_WARN_CLOUND_DATA_MANAGER).navigation(context); + moGoPersonWarnPolylineManager = (IMoGoPersonWarnPolylineManager) ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_PERSON_WARN_POLYLINE_MANAGER).navigation(context); moGoV2XStatusManager = (IMoGoV2XStatusManager) ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_STATUS_MANAGER).navigation(context); } @@ -339,4 +342,13 @@ public class V2XServiceManager { public static void setMoGoV2XCloundDataManager(IMoGoV2XCloundDataManager moGoV2XCloundDataManager) { V2XServiceManager.moGoV2XCloundDataManager = moGoV2XCloundDataManager; } + + public static IMoGoPersonWarnPolylineManager getMoGoPersonWarnPolylineManager() { + return moGoPersonWarnPolylineManager; + } + + public static void setMoGoPersonWarnPolylineManager(IMoGoPersonWarnPolylineManager moGoPersonWarnPolylineManager) { + V2XServiceManager.moGoPersonWarnPolylineManager = moGoPersonWarnPolylineManager; + } + } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XWaringManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XWaringManager.java index 38682e7778..a5b28a5b8b 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XWaringManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XWaringManager.java @@ -24,7 +24,6 @@ import static com.mogo.module.v2x.V2XServiceManager.getContext; public class V2XWaringManager { List lonLats = new ArrayList<>(); - List resultList = new ArrayList<>(); private Context mContext; private static V2XWaringManager mV2XWaringManager; @@ -51,7 +50,7 @@ public class V2XWaringManager { * 注册长链接消息处理 */ public void registerAdasSocketMessage(Context context) { - Logger.d("liyz", "开始注册Socket通道...."); + Logger.d(V2XConst.LOG_NAME_WARN, "开始注册Socket通道...."); mContext = context; //根据云端，绘制自车和交点，以及行人或二轮车与交点的绘制 @@ -64,7 +63,7 @@ public class V2XWaringManager { * 反注册消息通道，不再进行接受 */ public void unregisterAdasSocketMessage() { - Logger.w("liyz", "反注册Socket通道...."); + Logger.w(V2XConst.LOG_NAME_WARN, "反注册Socket通道...."); if (v2XWarnMessageListener != null) { V2XServiceManager .getMoGoSocketManager() @@ -94,9 +93,7 @@ public class V2XWaringManager { * 处理adas返回的数据 */ private void handleAdasData() { - Log.d("liyz", "V2XWaringManager ---- handleAdasData ---0-- "); - //清理 - V2XServiceManager.getMoGoWarnPolylineManager().clearLine(); + Log.d(V2XConst.LOG_NAME_WARN, "V2XWaringManager ---- handleAdasData "); // 绘制连接线 TODO 来的是列表数据 DrawLineInfo info1 = new DrawLineInfo(); @@ -104,13 +101,12 @@ public class V2XWaringManager { MogoLatLng endLatlng1 = new MogoLatLng(40.010906,116.423821); info1.setStartLocation(startLatlng1); info1.setEndLocation(endLatlng1); - V2XServiceManager.getMoGoWarnPolylineManager().drawableWarnPolyline(getContext(), info1); + V2XServiceManager.getMoGoWarnPolylineManager().drawaWarnPolyline(getContext(), info1); // adas 每隔一秒传递的他车或行人数据 V2XServiceManager.getmIMogoADASController().addAdasRecognizedDataCallback(resultList -> { // 绘制近景识别到的车辆，行人和二轮车 TODO AdasRecognizedResultDrawer.getInstance().renderAdasRecognizedResult( resultList ); - Log.d("liyz", "V2XWaringManager ---- handleAdasData ----- "); //清理 V2XServiceManager.getMoGoWarnPolylineManager().clearLine(); @@ -121,7 +117,7 @@ public class V2XWaringManager { MogoLatLng endLatlng = new MogoLatLng(39.971089,116.407384); info.setStartLocation(startLatlng); info.setEndLocation(endLatlng); - V2XServiceManager.getMoGoWarnPolylineManager().drawableWarnPolyline(mContext, info); + V2XServiceManager.getMoGoWarnPolylineManager().drawaWarnPolyline(mContext, info); //更新数据 for (ADASRecognizedResult result : resultList) { @@ -135,7 +131,7 @@ public class V2XWaringManager { double lon = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLon(); double lat = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLat(); - Log.d("liyz", "lon = " + lon + "----lat = " + lat); + Log.d(V2XConst.LOG_NAME_WARN, "lon = " + lon + "----lat = " + lat); //绘制自车数据 liyz // DrawLineInfo info = new DrawLineInfo(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/model/CloundWarningInfo.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/model/CloundWarningInfo.java index 240c9a269a..cf0c398f82 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/model/CloundWarningInfo.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/model/CloundWarningInfo.java @@ -58,12 +58,12 @@ public class CloundWarningInfo { /** * 识别物经纬度 * */ - private MogoLatLng startLocation; + public MogoLatLng startLocation; /** * 行人经纬度交点 */ - private MogoLatLng endLocation; + public MogoLatLng endLocation; /** * 停止线的纬度 diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/IMoGoPersonWarnPolylineManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/IMoGoPersonWarnPolylineManager.java new file mode 100644 index 0000000000..777d1257fa --- /dev/null +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/IMoGoPersonWarnPolylineManager.java @@ -0,0 +1,27 @@ +package com.mogo.module.v2x.manager; + +import android.content.Context; + +import com.alibaba.android.arouter.facade.template.IProvider; +import com.mogo.map.overlay.IMogoPolyline; +import com.mogo.module.v2x.entity.model.DrawLineInfo; + +/** + * 绘制可变宽度和渐变的线， + */ +public interface IMoGoPersonWarnPolylineManager extends IProvider { + /** + * 绘制连接线，人物和二轮车 + * + * @param context + * @param info + */ + void drawPersonWarnPolyline(Context context, DrawLineInfo info); + + /** + * 移除连接线 + */ + void clearLine(); + + IMogoPolyline getMogoPersonWarnPolyline(); +} diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/IMoGoWarnPolylineManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/IMoGoWarnPolylineManager.java index fbdd452138..8d3eaa1530 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/IMoGoWarnPolylineManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/IMoGoWarnPolylineManager.java @@ -18,7 +18,7 @@ public interface IMoGoWarnPolylineManager extends IProvider { * @param context * @param info */ - void drawableWarnPolyline(Context context, DrawLineInfo info); + void drawaWarnPolyline(Context context, DrawLineInfo info); /** * 移除连接线 diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoPersonWarnPolylineManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoPersonWarnPolylineManager.java new file mode 100644 index 0000000000..d3f7269187 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoPersonWarnPolylineManager.java @@ -0,0 +1,84 @@ +package com.mogo.module.v2x.manager.impl; + +import android.content.Context; +import android.util.Log; + +import com.alibaba.android.arouter.facade.annotation.Route; +import com.mogo.map.overlay.IMogoPolyline; +import com.mogo.map.overlay.MogoPolylineOptions; +import com.mogo.module.v2x.MoGoV2XServicePaths; +import com.mogo.module.v2x.V2XConst; +import com.mogo.module.v2x.V2XServiceManager; +import com.mogo.module.v2x.entity.model.DrawLineInfo; +import com.mogo.module.v2x.manager.IMoGoPersonWarnPolylineManager; +import com.mogo.module.v2x.manager.IMoGoWarnPolylineManager; + +import java.util.ArrayList; +import java.util.List; + +/** + * 当前车辆与道路事件的连接线 + */ +@Route(path = MoGoV2XServicePaths.PATH_V2X_PERSON_WARN_POLYLINE_MANAGER) +public class MoGoPersonWarnPolylineManager implements IMoGoPersonWarnPolylineManager { + private static IMogoPolyline mMogoPolyline; + + + @Override + public void drawPersonWarnPolyline(Context context, DrawLineInfo info) { + try { + if (mMogoPolyline != null) { + mMogoPolyline.remove(); + } + + // 连接线参数 + MogoPolylineOptions options = new MogoPolylineOptions(); + + // 渐变色 + List colors = new ArrayList<>(); + + if (info.getType().equals("1")) { //预警 TODO + colors.add(0xFFFFA31A); + colors.add(0xFFFFA31A); + } else { + colors.add(0xFFE32F46); + colors.add(0xFFE32F46); + } + + // 线条粗细，渐变，渐变色值 + options.width(60).useGradient(true).colorValues(colors); + // 当前车辆位置 + options.add(info.getStartLocation()); + // 目标车辆位置 + options.add(info.getEndLocation()); + + // 绘制线的对象 + mMogoPolyline = V2XServiceManager.getMogoOverlayManager().addPolyline(options); + Log.d(V2XConst.LOG_NAME_WARN, "MoGoWarnPolylineManager drawableWarnPolyline -----> "); + + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public void clearLine() { + if (mMogoPolyline != null) { + mMogoPolyline.remove(); + mMogoPolyline = null; + } + } + + @Override + public void init(Context context) { + + } + + /** + * @return 绘制连接线的对象 + */ + @Override + public IMogoPolyline getMogoPersonWarnPolyline() { + return mMogoPolyline; + } +} diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java index 72631d7481..f431cd20b2 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java @@ -1,23 +1,31 @@ package com.mogo.module.v2x.manager.impl; import android.content.Context; +import android.location.Location; +import android.util.Log; import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.map.MogoLatLng; +import com.mogo.map.navi.IMogoCarLocationChangedListener2; +import com.mogo.map.overlay.IMogoPolyline; +import com.mogo.module.common.drawer.SnapshotSetDataDrawer; import com.mogo.module.v2x.MoGoV2XServicePaths; +import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.entity.model.CloundWarningInfo; import com.mogo.module.v2x.entity.model.DrawLineInfo; import com.mogo.module.v2x.manager.IMoGoV2XCloundDataManager; +import java.util.Arrays; + import static com.mogo.module.v2x.V2XServiceManager.getContext; /** * desc : V2X 服务端下发数据处理 点的绘制 */ @Route(path = MoGoV2XServicePaths.PATH_V2X_WARN_CLOUND_DATA_MANAGER) -public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager { - private static final String TAG = "MoGoV2XCloundDataManager"; +public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMogoCarLocationChangedListener2 { + private CloundWarningInfo mCloundWarningInfo; @Override public void init(Context context) { @@ -26,28 +34,42 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager { @Override public void analysisV2XCloundDataEvent(CloundWarningInfo cloundWarningInfo) { - //TODO - //清理 - V2XServiceManager.getMoGoWarnPolylineManager().clearLine(); + mCloundWarningInfo = cloundWarningInfo; - //绘制连接线自车与交汇点连线 - DrawLineInfo info1 = new DrawLineInfo(); - MogoLatLng startLatlng1 = new MogoLatLng(39.968919,116.407642); - MogoLatLng endLatlng1 = new MogoLatLng(40.010906,116.423821); - info1.setStartLocation(startLatlng1); - info1.setEndLocation(endLatlng1); - V2XServiceManager.getMoGoWarnPolylineManager().drawableWarnPolyline(getContext(), info1); + //TODO 根据判断条件，决定是否画线或者删除线 - //绘制识别物与交汇点连线 TODO + //绘制识别物与交汇点连线，并且更新连线数据 + drawOtherObjectLine(cloundWarningInfo); + //二轮车和行人的移动和渲染 +// SnapshotSetDataDrawer.getInstance().renderSnapshotData(); - //更新数据连线数据 他车和自车 + } - - //自车的移动 - - - //他车的移动 + /** + * 绘制行人和二轮车连线,并且更新数据 + */ + private void drawOtherObjectLine(CloundWarningInfo info) { + IMogoPolyline polyLine = V2XServiceManager.getMoGoPersonWarnPolylineManager().getMogoPersonWarnPolyline(); + if (info != null) { + if (polyLine != null) { + polyLine.setPoints(Arrays.asList(new MogoLatLng(info.startLocation.lat, info.startLocation.lon), + new MogoLatLng(info.endLocation.lat, info.endLocation.lon))); + } else { + DrawLineInfo lineInfo = new DrawLineInfo(); +// MogoLatLng startLatlng = new MogoLatLng(39.968919,116.407642); +// MogoLatLng endLatlng = new MogoLatLng(40.010906,116.423821); + MogoLatLng startLatlng = new MogoLatLng(info.startLocation.lat,info.startLocation.lon); + MogoLatLng endLatlng = new MogoLatLng(info.endLocation.lat,info.endLocation.lon); + lineInfo.setStartLocation(startLatlng); + lineInfo.setEndLocation(endLatlng); + lineInfo.setHeading(info.heading); + V2XServiceManager.getMoGoPersonWarnPolylineManager().drawPersonWarnPolyline(getContext(), lineInfo); + } + } else { + Log.e(V2XConst.LOG_NAME_WARN, "mCloundWarningInfo == null"); + V2XServiceManager.getMoGoPersonWarnPolylineManager().clearLine(); + } } @@ -55,4 +77,43 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager { public void clearALLPOI() { } + + /** + * 自车定位 移动完成需要 3s消失 TODO + */ + @Override + public void onCarLocationChanged2(Location latLng) { + Log.d(V2XConst.LOG_NAME_WARN, "latLng = " + latLng.getLatitude() + "--" + latLng.getLongitude()); + //当行人经纬度交点 经纬度不为空，开始画线，否则清理 + //自车只需要关注移动 + IMogoPolyline mogoPolyline = V2XServiceManager.getMoGoWarnPolylineManager().getMogoWarnPolyline(); + if (mCloundWarningInfo != null) { + if (mogoPolyline != null) { + mogoPolyline.setPoints(Arrays.asList(new MogoLatLng(latLng.getLatitude(), latLng.getLongitude()), + new MogoLatLng(mCloundWarningInfo.endLocation.lat, mCloundWarningInfo.endLocation.lon))); + + } else { + Log.e(V2XConst.LOG_NAME_WARN, "V2XServiceManager.getMoGoWarnPolylineManager().getMogoWarnPolyline() == null"); + DrawLineInfo info = new DrawLineInfo(); // 对象 TODO +// MogoLatLng startLatlng = new MogoLatLng(39.968919, 116.407642); +// MogoLatLng endLatlng = new MogoLatLng(40.010906, 116.423821); + MogoLatLng startLatlng = new MogoLatLng(latLng.getLatitude(), latLng.getLongitude()); + MogoLatLng endLatlng = new MogoLatLng(mCloundWarningInfo.endLocation.lat, mCloundWarningInfo.endLocation.lon); + info.setHeading(latLng.getBearing()); + info.setStartLocation(startLatlng); + info.setEndLocation(endLatlng); + V2XServiceManager.getMoGoWarnPolylineManager().drawaWarnPolyline(getContext(), info); + } + } else { + Log.e(V2XConst.LOG_NAME_WARN, "mCloundWarningInfo == null"); + V2XServiceManager.getMoGoWarnPolylineManager().clearLine(); + } + } + + @Override + public void onCarLocationChanged(MogoLatLng latLng) { + + } + + } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoWarnPolylineManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoWarnPolylineManager.java index 237a54fc30..a5e4a310e5 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoWarnPolylineManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoWarnPolylineManager.java @@ -10,6 +10,7 @@ import com.mogo.map.overlay.MogoPolylineOptions; import com.mogo.module.common.entity.V2XPoiTypeEnum; import com.mogo.module.common.entity.V2XRoadEventEntity; import com.mogo.module.v2x.MoGoV2XServicePaths; +import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.entity.model.DrawLineInfo; import com.mogo.module.v2x.manager.IMoGoWarnPolylineManager; @@ -27,7 +28,7 @@ public class MoGoWarnPolylineManager implements IMoGoWarnPolylineManager { @Override - public void drawableWarnPolyline(Context context, DrawLineInfo info) { + public void drawaWarnPolyline(Context context, DrawLineInfo info) { try { if (mMogoPolyline != null) { mMogoPolyline.remove(); @@ -56,7 +57,7 @@ public class MoGoWarnPolylineManager implements IMoGoWarnPolylineManager { // 绘制线的对象 mMogoPolyline = V2XServiceManager.getMogoOverlayManager().addPolyline(options); - Log.d("liyz", "MoGoWarnPolylineManager drawableWarnPolyline -----> "); + Log.d(V2XConst.LOG_NAME_WARN, "MoGoWarnPolylineManager drawableWarnPolyline -----> "); } catch (Exception e) { e.printStackTrace(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/AdasDataBroadcastReceiver.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/AdasDataBroadcastReceiver.java index df75b1e5aa..62905c22a0 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/AdasDataBroadcastReceiver.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/AdasDataBroadcastReceiver.java @@ -20,9 +20,9 @@ public class AdasDataBroadcastReceiver extends BroadcastReceiver { public void onReceive(Context context, Intent intent) { try { // ADASRecognizedResult adasResult = (ADASRecognizedResult) intent.getSerializableExtra(V2XConst.BROADCAST_ADAS_EXTRA_KEY); -// Logger.d("liyz", "AdasDataBroadcastReceiver -->" + GsonUtil.jsonFromObject(adasResult)); +// Logger.d(V2XConst.LOG_NAME_WARN, "AdasDataBroadcastReceiver -->" + GsonUtil.jsonFromObject(adasResult)); String adasResult = (String) intent.getSerializableExtra(V2XConst.BROADCAST_ADAS_EXTRA_KEY); - Log.d("liyz", "AdasDataBroadcastReceiver -----> "); + Log.d(V2XConst.LOG_NAME_WARN, "AdasDataBroadcastReceiver -----> "); V2XWaringManager.getInstance().registerAdasSocketMessage(context); } catch (Exception e) { diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/SceneBroadcastReceiver.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/SceneBroadcastReceiver.java index d4cd59f9a7..8b8b094354 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/SceneBroadcastReceiver.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/SceneBroadcastReceiver.java @@ -25,7 +25,6 @@ public class SceneBroadcastReceiver extends BroadcastReceiver { try { V2XMessageEntity v2XMessageEntity = (V2XMessageEntity) intent.getSerializableExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY); //Logger.d(TAG, "v2XMessageEntity:" + GsonUtil.jsonFromObject(v2XMessageEntity)); - Log.d("liyz", "SceneBroadcastReceiver ------->"); V2XScenarioManager.getInstance().handlerMessage(v2XMessageEntity); } catch (Exception e) { e.printStackTrace();