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 a5751fa..89184d6 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 @@ -119,13 +119,15 @@ public class RequestLiveManager { @Override public void onNext(@NonNull BaseData baseData) { - if (requestLiveListener != null && baseData.result != null) { + if (requestLiveListener != null && baseData != null) { LiveReceive liveReceive = baseData.result; 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())); + requestLiveListener.onError(new Throwable("前方暂无可直播车机")); } + }else { + requestLiveListener.onError(new Throwable("前方暂无可直播车机")); } } @@ -170,13 +172,15 @@ public class RequestLiveManager { @Override public void onNext(@NonNull BaseData baseData) { - if (requestLiveListener != null && baseData.result != null) { + if (requestLiveListener != null && baseData != null) { LiveReceive liveReceive = baseData.result; if (liveReceive != null && liveReceive.getLive() != null) { requestLiveListener.onSuccess(liveReceive.getLive()); } else { - requestLiveListener.onError(new Throwable("request liveUrl is null,please connect tech")); + requestLiveListener.onError(new Throwable("前方路口暂无可直播设备")); } + }else{ + requestLiveListener.onError(new Throwable("前方路口暂无可直播设备")); } } @@ -217,13 +221,15 @@ public class RequestLiveManager { @Override public void onNext(@NonNull BaseData baseData) { - if (requestLiveListener != null && baseData.result != null) { + if (requestLiveListener != null && baseData != null) { LiveReceive liveReceive = baseData.result; if (liveReceive != null && liveReceive.getLive() != null) { requestLiveListener.onSuccess(liveReceive.getLive()); } else { - requestLiveListener.onError(new Throwable("request liveUrl is null,please connect tech")); + requestLiveListener.onError(new Throwable("此路口摄像头暂无直播流")); } + }else{ + requestLiveListener.onError(new Throwable("此路口摄像头暂无直播流")); } } diff --git a/gradle.properties b/gradle.properties index e78ae31..4d472fa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,20 +30,20 @@ PASSWORD=xintai2018 RELEASE=true # AI CLOUD 云平台 # 工具类 -MOGO_UTILS_VERSION=1.0.71 +MOGO_UTILS_VERSION=1.0.72 # 网络请求 -MOGO_NETWORK_VERSION=1.0.71 +MOGO_NETWORK_VERSION=1.0.72 # 网络DNS -MOGO_HTTPDNS_VERSION=1.0.71 +MOGO_HTTPDNS_VERSION=1.0.72 # 鉴权 -MOGO_PASSPORT_VERSION=1.0.71 +MOGO_PASSPORT_VERSION=1.0.72 # 常链接 -MOGO_SOCKET_VERSION=1.0.71 +MOGO_SOCKET_VERSION=1.0.72 # 数据采集 -MOGO_REALTIME_VERSION=1.0.71 +MOGO_REALTIME_VERSION=1.0.72 # 探路,道路事件发布,获取 -MOGO_TANLU_VERSION=1.0.71 +MOGO_TANLU_VERSION=1.0.72 # 直播推流 -MOGO_LIVE_VERSION=1.0.71 +MOGO_LIVE_VERSION=1.0.72 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.0.71 +MOGO_TRAFFICLIVE_VERSION=1.0.72 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 d7e642a..db0dc39 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 @@ -98,6 +98,11 @@ public class ADASRecognizedResult { */ private double rateLimiting; + /** + * 瓦片id + */ + private String tileId; + /** * 车道宽度 */ 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 773f2b1..0a5c127 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; + /** + * 瓦片id + */ + private String tileId; + /** * 车道宽度 */ @@ -94,6 +99,7 @@ public class CloudLocationInfo implements Parcelable { this.laneId = info.laneId; this.laneNum = info.laneNum; this.rateLimiting = info.rateLimiting; + this.tileId = info.tileId; this.roadWidth = info.roadWidth; } @@ -110,6 +116,7 @@ public class CloudLocationInfo implements Parcelable { laneId = in.readString(); laneNum = in.readInt(); rateLimiting = in.readDouble(); + tileId = in.readString(); roadWidth = in.readDouble(); } @@ -127,6 +134,7 @@ public class CloudLocationInfo implements Parcelable { dest.writeString(laneId); dest.writeInt(laneNum); dest.writeDouble(rateLimiting); + dest.writeString(tileId); dest.writeDouble(roadWidth); } @@ -243,6 +251,14 @@ public class CloudLocationInfo implements Parcelable { this.rateLimiting = rateLimiting; } + public String getTileId() { + return tileId; + } + + public void setTileId(String tileId) { + this.tileId = tileId; + } + public double getRoadWidth() { return roadWidth; } @@ -266,6 +282,7 @@ public class CloudLocationInfo implements Parcelable { ", laneId='" + laneId + '\'' + ", laneNum=" + laneNum + ", rateLimiting=" + rateLimiting + + ", tileId=" + tileId + ", roadWidth=" + roadWidth + '}'; }