与master分支同步

Lawrence

2021-01-12 5257c7c9f4b7ef3e8ef074c2fb2fc582f3bdcf05

与master分支同步

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java

@@ -409,12 +409,7 @@
        try {

            MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo();

            String ssrc = streamSession.createPlayBackSsrc();

            String streamId = null;

            if (rtpEnable) {

                streamId = String.format("gb_playback_%s_%s", device.getDeviceId(), channelId);

            }else {

                streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();

            }

            String streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();

            // 添加订阅

            JSONObject subscribeKey = new JSONObject();

            subscribeKey.put("app", "rtp");


 web_src/src/components/gb28181/devicePlayer.vue

@@ -183,7 +183,8 @@
            scanGroup: 0,
            tracks: [],
            coverPlaying:false,
            tracksLoading: false
            tracksLoading: false,
            recordPlay: ""
        };
    },
    methods: {
@@ -318,6 +319,10 @@
              this.convertStop();
            }
            this.convertKey = ''
            if (this.recordPlay != '') {
              this.stopPlayRecord();
            }
            this.recordPlay = ''
        },

        copySharedInfo: function (data) {
@@ -384,6 +389,7 @@
                    var streamInfo = res.data;
                    that.streamId = streamInfo.streamId;
                    that.videoUrl = streamInfo.ws_flv;
                    that.recordPlay = true;
                });
            }
        },