Commit 5364db2982fb3dfff22659d535344d3df82e838a
1 parent
7609d783
优化对讲逻辑
Showing
2 changed files
with
2 additions
and
1 deletions
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
| @@ -280,7 +280,7 @@ public class ZLMRTPServerFactory { | @@ -280,7 +280,7 @@ public class ZLMRTPServerFactory { | ||
| 280 | */ | 280 | */ |
| 281 | public Boolean isStreamReady(MediaServerItem mediaServerItem, String app, String streamId) { | 281 | public Boolean isStreamReady(MediaServerItem mediaServerItem, String app, String streamId) { |
| 282 | JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo(mediaServerItem, app, "rtsp", streamId); | 282 | JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo(mediaServerItem, app, "rtsp", streamId); |
| 283 | - return (mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online")); | 283 | + return (mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online") != null && mediaInfo.getBoolean("online")); |
| 284 | } | 284 | } |
| 285 | 285 | ||
| 286 | /** | 286 | /** |
web_src/src/components/dialog/devicePlayer.vue
| @@ -937,6 +937,7 @@ export default { | @@ -937,6 +937,7 @@ export default { | ||
| 937 | }).then( (res)=> { | 937 | }).then( (res)=> { |
| 938 | if (res.data.code == 0) { | 938 | if (res.data.code == 0) { |
| 939 | // this.broadcastStatus = -1; | 939 | // this.broadcastStatus = -1; |
| 940 | + // this.broadcastRtc.close() | ||
| 940 | }else { | 941 | }else { |
| 941 | this.$message({ | 942 | this.$message({ |
| 942 | showClose: true, | 943 | showClose: true, |