From a4a91c2a7ee5614a38b73bc3a44ae33a235c4936 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 15 Apr 2021 17:41:58 +0800 Subject: [PATCH] fix bug of liveUrl limit --- .../live/listener/IRequestLiveListener.java | 2 +- .../live/manager/RequestLiveManager.java | 5 ++-- .../realtime/entity/ADASRecognizedResult.java | 30 +++++++++++++++++-- .../realtime/entity/CloudLocationInfo.java | 17 +++++++++++ .../core/TrafficLiveCurrentManager.java | 2 +- 5 files changed, 48 insertions(+), 8 deletions(-) diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/listener/IRequestLiveListener.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/listener/IRequestLiveListener.java index 63be4a3..9fbf4e4 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/listener/IRequestLiveListener.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/listener/IRequestLiveListener.java @@ -8,7 +8,7 @@ public interface IRequestLiveListener { default void onSuccess(String liveUrl) { } - default void onSuccess(String liveSn, String liveUrl, double lat, double lon) { + default void onSuccess(String liveSn, double lat, double lon) { } void onError(Throwable e); diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java index a01b4f8..4a4cbd4 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java @@ -121,9 +121,8 @@ public class RequestLiveManager { public void onNext(@NonNull BaseData baseData) { if (requestLiveListener != null) { LiveReceive liveReceive = baseData.result; - if (liveReceive != null && liveReceive.getLive() != null && liveReceive.getSn() != null) { - requestLiveListener.onSuccess(liveReceive.getSn(), liveReceive.getLive(), - liveReceive.getLat(), liveReceive.getLon()); + if (liveReceive != null && liveReceive.getSn() != null) { + requestLiveListener.onSuccess(liveReceive.getSn(), liveReceive.getLat(), liveReceive.getLon()); } else { requestLiveListener.onError(new Throwable("liveReceiver msg is wrong : " + liveReceive.toString())); } diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/entity/ADASRecognizedResult.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/entity/ADASRecognizedResult.java index cc3f84f..d7e642a 100644 --- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/entity/ADASRecognizedResult.java +++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/entity/ADASRecognizedResult.java @@ -1,10 +1,9 @@ package com.mogo.realtime.entity; -public -/** +/* * adas 识别物体参数 */ -class ADASRecognizedResult { +public class ADASRecognizedResult { /** * 识别物体类型 @@ -78,4 +77,29 @@ class ADASRecognizedResult { * 1：高精定位 */ public int dataAccuracy; + + /** + * 道路ID + */ + private String roadId; + + /** + * 车道ID-2D路段 + */ + private String laneId; + + /** + * 车道号：中心线编号为0，中心线右侧编号为负数，3车道通行Road的车道编号，0，-1，-2，-3 + */ + private int laneNum; + + /** + * 限速 + */ + private double rateLimiting; + + /** + * 车道宽度 + */ + private double roadWidth; } diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/entity/CloudLocationInfo.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/entity/CloudLocationInfo.java index d1d0136..773f2b1 100644 --- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/entity/CloudLocationInfo.java +++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/entity/CloudLocationInfo.java @@ -73,6 +73,11 @@ public class CloudLocationInfo implements Parcelable { */ private double rateLimiting; + /** + * 车道宽度 + */ + private double roadWidth; + public CloudLocationInfo() { } @@ -89,6 +94,7 @@ public class CloudLocationInfo implements Parcelable { this.laneId = info.laneId; this.laneNum = info.laneNum; this.rateLimiting = info.rateLimiting; + this.roadWidth = info.roadWidth; } protected CloudLocationInfo(Parcel in) { @@ -104,6 +110,7 @@ public class CloudLocationInfo implements Parcelable { laneId = in.readString(); laneNum = in.readInt(); rateLimiting = in.readDouble(); + roadWidth = in.readDouble(); } @Override @@ -120,6 +127,7 @@ public class CloudLocationInfo implements Parcelable { dest.writeString(laneId); dest.writeInt(laneNum); dest.writeDouble(rateLimiting); + dest.writeDouble(roadWidth); } @Override @@ -235,6 +243,14 @@ public class CloudLocationInfo implements Parcelable { this.rateLimiting = rateLimiting; } + public double getRoadWidth() { + return roadWidth; + } + + public void setRoadWidth(double roadWidth) { + this.roadWidth = roadWidth; + } + @Override public String toString() { return "CloudLocationInfo{" + @@ -250,6 +266,7 @@ public class CloudLocationInfo implements Parcelable { ", laneId='" + laneId + '\'' + ", laneNum=" + laneNum + ", rateLimiting=" + rateLimiting + + ", roadWidth=" + roadWidth + '}'; } diff --git a/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveCurrentManager.java b/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveCurrentManager.java index 726a4a3..5cbf8a9 100644 --- a/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveCurrentManager.java +++ b/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveCurrentManager.java @@ -62,7 +62,7 @@ public class TrafficLiveCurrentManager this.trafficLiveCallBack = callBack; requestLiveManager.requestFrontVehicleLive(lat, lon, bearing, new IRequestLiveListener() { @Override - public void onSuccess(String liveSn, String liveUrl, double lat, double lon) { + public void onSuccess(String liveSn, double lat, double lon) { onVehicleLiveSuccess(liveSn, surfaceView); }