Merge branch 'wvp-28181-2.0'

# Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
2022-09-14 20:51:21 +08:00
parent 2f76fa98bb 5b3dc4d595
commit ab74d1cff9
42 changed files with 865 additions and 745 deletions
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -250,6 +250,7 @@ export default {
            that.loadSnap[deviceId + channelId] = 0;
            that.getSnapErrorEvent(snapId)
          }, 5000)
+          itemData.streamId = res.data.data.stream;
          that.$refs.devicePlayer.openDialog("media", deviceId, channelId, {
            streamInfo: res.data.data,
            hasAudio: itemData.hasAudio