Commit 5e4a673ecc95d6fb06aec6c5e2f3ec4ffb72584b
1 parent
2a5c1274
修复视频播放点击音量报错 #557,修复编解码信息获取失败
Showing
2 changed files
with
13 additions
and
3 deletions
web_src/src/components/common/jessibuca.vue
| @@ -5,8 +5,8 @@ | @@ -5,8 +5,8 @@ | ||
| 5 | <i v-if="!playing" class="iconfont icon-play jessibuca-btn" @click="playBtnClick"></i> | 5 | <i v-if="!playing" class="iconfont icon-play jessibuca-btn" @click="playBtnClick"></i> |
| 6 | <i v-if="playing" class="iconfont icon-pause jessibuca-btn" @click="pause"></i> | 6 | <i v-if="playing" class="iconfont icon-pause jessibuca-btn" @click="pause"></i> |
| 7 | <i class="iconfont icon-stop jessibuca-btn" @click="destroy"></i> | 7 | <i class="iconfont icon-stop jessibuca-btn" @click="destroy"></i> |
| 8 | - <i v-if="isNotMute" class="iconfont icon-audio-high jessibuca-btn" @click="jessibuca.mute()"></i> | ||
| 9 | - <i v-if="!isNotMute" class="iconfont icon-audio-mute jessibuca-btn" @click="jessibuca.cancelMute()"></i> | 8 | + <i v-if="isNotMute" class="iconfont icon-audio-high jessibuca-btn" @click="mute()"></i> |
| 9 | + <i v-if="!isNotMute" class="iconfont icon-audio-mute jessibuca-btn" @click="cancelMute()"></i> | ||
| 10 | </div> | 10 | </div> |
| 11 | <div class="buttons-box-right"> | 11 | <div class="buttons-box-right"> |
| 12 | <span class="jessibuca-btn">{{ kBps }} kb/s</span> | 12 | <span class="jessibuca-btn">{{ kBps }} kb/s</span> |
| @@ -243,6 +243,16 @@ export default { | @@ -243,6 +243,16 @@ export default { | ||
| 243 | this.err = ""; | 243 | this.err = ""; |
| 244 | this.performance = ""; | 244 | this.performance = ""; |
| 245 | }, | 245 | }, |
| 246 | + mute: function () { | ||
| 247 | + if (jessibucaPlayer[this._uid]) { | ||
| 248 | + jessibucaPlayer[this._uid].mute(); | ||
| 249 | + } | ||
| 250 | + }, | ||
| 251 | + cancelMute: function () { | ||
| 252 | + if (jessibucaPlayer[this._uid]) { | ||
| 253 | + jessibucaPlayer[this._uid].cancelMute(); | ||
| 254 | + } | ||
| 255 | + }, | ||
| 246 | destroy: function () { | 256 | destroy: function () { |
| 247 | if (jessibucaPlayer[this._uid]) { | 257 | if (jessibucaPlayer[this._uid]) { |
| 248 | jessibucaPlayer[this._uid].destroy(); | 258 | jessibucaPlayer[this._uid].destroy(); |
web_src/src/components/dialog/devicePlayer.vue
| @@ -374,7 +374,7 @@ export default { | @@ -374,7 +374,7 @@ export default { | ||
| 374 | url: '/zlm/' +this.mediaServerId+ '/index/api/getMediaInfo?vhost=__defaultVhost__&schema=rtmp&app='+ this.app +'&stream='+ this.streamId | 374 | url: '/zlm/' +this.mediaServerId+ '/index/api/getMediaInfo?vhost=__defaultVhost__&schema=rtmp&app='+ this.app +'&stream='+ this.streamId |
| 375 | }).then(function (res) { | 375 | }).then(function (res) { |
| 376 | that.tracksLoading = false; | 376 | that.tracksLoading = false; |
| 377 | - if (res.data.code == 0 && res.data.online) { | 377 | + if (res.data.code == 0 && res.data.tracks) { |
| 378 | that.tracks = res.data.tracks; | 378 | that.tracks = res.data.tracks; |
| 379 | }else{ | 379 | }else{ |
| 380 | that.tracksNotLoaded = true; | 380 | that.tracksNotLoaded = true; |