修复分享功能
This commit is contained in:
parent
d3d48d1d07
commit
429817b8c4
@ -14,15 +14,27 @@
|
|||||||
</div>
|
</div>
|
||||||
<div style="display: flex; margin-bottom: 0.5rem; height: 2.5rem;">
|
<div style="display: flex; margin-bottom: 0.5rem; height: 2.5rem;">
|
||||||
<span style="width: 5rem; line-height: 2.5rem; text-align: right;">播放地址:</span>
|
<span style="width: 5rem; line-height: 2.5rem; text-align: right;">播放地址:</span>
|
||||||
<el-input v-model="getPlayerShared.sharedUrl" :disabled="true" v-on:click.native="copySharedInfo(getPlayerShared.sharedUrl)"></el-input>
|
<el-input v-model="getPlayerShared.sharedUrl" :disabled="true" >
|
||||||
|
<template slot="append">
|
||||||
|
<i class="cpoy-btn el-icon-document-copy" title="点击拷贝" v-clipboard="getPlayerShared.sharedUrl" @success="$message({type:'success', message:'成功拷贝到粘贴板'})"></i>
|
||||||
|
</template>
|
||||||
|
</el-input>
|
||||||
</div>
|
</div>
|
||||||
<div style="display: flex; margin-bottom: 0.5rem; height: 2.5rem;">
|
<div style="display: flex; margin-bottom: 0.5rem; height: 2.5rem;">
|
||||||
<span style="width: 5rem; line-height: 2.5rem; text-align: right;">iframe:</span>
|
<span style="width: 5rem; line-height: 2.5rem; text-align: right;">iframe:</span>
|
||||||
<el-input v-model="getPlayerShared.sharedIframe" :disabled="true" v-on:click.native="copySharedInfo(getPlayerShared.sharedIframe)"></el-input>
|
<el-input v-model="getPlayerShared.sharedIframe" :disabled="true" >
|
||||||
|
<template slot="append">
|
||||||
|
<i class="cpoy-btn el-icon-document-copy" title="点击拷贝" v-clipboard="getPlayerShared.sharedIframe" @success="$message({type:'success', message:'成功拷贝到粘贴板'})"></i>
|
||||||
|
</template>
|
||||||
|
</el-input>
|
||||||
</div>
|
</div>
|
||||||
<div style="display: flex; margin-bottom: 0.5rem; height: 2.5rem;">
|
<div style="display: flex; margin-bottom: 0.5rem; height: 2.5rem;">
|
||||||
<span style="width: 5rem; line-height: 2.5rem; text-align: right;">资源地址:</span>
|
<span style="width: 5rem; line-height: 2.5rem; text-align: right;">资源地址:</span>
|
||||||
<el-input v-model="getPlayerShared.sharedRtmp" :disabled="true" v-on:click.native="copySharedInfo(getPlayerShared.sharedRtmp)"></el-input>
|
<el-input v-model="getPlayerShared.sharedRtmp" :disabled="true" >
|
||||||
|
<template slot="append">
|
||||||
|
<i class="cpoy-btn el-icon-document-copy" title="点击拷贝" v-clipboard="getPlayerShared.sharedRtmp" @success="$message({type:'success', message:'成功拷贝到粘贴板'})"></i>
|
||||||
|
</template>
|
||||||
|
</el-input>
|
||||||
</div>
|
</div>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
<!--{"code":0,"data":{"paths":["22-29-30.mp4"],"rootPath":"/home/kkkkk/Documents/ZLMediaKit/release/linux/Debug/www/record/hls/kkkkk/2020-05-11/"}}-->
|
<!--{"code":0,"data":{"paths":["22-29-30.mp4"],"rootPath":"/home/kkkkk/Documents/ZLMediaKit/release/linux/Debug/www/record/hls/kkkkk/2020-05-11/"}}-->
|
||||||
@ -148,9 +160,10 @@ export default {
|
|||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
getPlayerShared: function () {
|
getPlayerShared: function () {
|
||||||
|
|
||||||
return {
|
return {
|
||||||
sharedUrl: window.location.host + '/' + this.videoUrl,
|
sharedUrl: window.location.origin + '/#/play/wasm/' + encodeURIComponent(this.videoUrl),
|
||||||
sharedIframe: '<iframe src="' + window.location.host + '/' + this.videoUrl + '"></iframe>',
|
sharedIframe: '<iframe src="' + window.location.origin + '/#/play/wasm/' + encodeURIComponent(this.videoUrl) + '"></iframe>',
|
||||||
sharedRtmp: this.videoUrl
|
sharedRtmp: this.videoUrl
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -14,7 +14,11 @@ export default {
|
|||||||
},
|
},
|
||||||
props: ['videoUrl', 'error', 'hasaudio'],
|
props: ['videoUrl', 'error', 'hasaudio'],
|
||||||
mounted () {
|
mounted () {
|
||||||
|
let paramUrl = decodeURIComponent(this.$route.params.url)
|
||||||
this.$nextTick(() =>{
|
this.$nextTick(() =>{
|
||||||
|
if (typeof (this.videoUrl) == "undefined") {
|
||||||
|
this.videoUrl = paramUrl;
|
||||||
|
}
|
||||||
console.log("初始化时的地址为: " + this.videoUrl)
|
console.log("初始化时的地址为: " + this.videoUrl)
|
||||||
this.easyPlayer = new WasmPlayer(null, 'easyplayer', this.eventcallbacK)
|
this.easyPlayer = new WasmPlayer(null, 'easyplayer', this.eventcallbacK)
|
||||||
this.easyPlayer.play(this.videoUrl, 1)
|
this.easyPlayer.play(this.videoUrl, 1)
|
||||||
|
@ -17,7 +17,11 @@ export default {
|
|||||||
},
|
},
|
||||||
props: ['videoUrl', 'error', 'hasaudio'],
|
props: ['videoUrl', 'error', 'hasaudio'],
|
||||||
mounted () {
|
mounted () {
|
||||||
|
let paramUrl = decodeURIComponent(this.$route.params.url)
|
||||||
this.$nextTick(() =>{
|
this.$nextTick(() =>{
|
||||||
|
if (typeof (this.videoUrl) == "undefined") {
|
||||||
|
this.videoUrl = paramUrl;
|
||||||
|
}
|
||||||
console.log("初始化时的地址为: " + this.videoUrl)
|
console.log("初始化时的地址为: " + this.videoUrl)
|
||||||
this.play(this.videoUrl)
|
this.play(this.videoUrl)
|
||||||
})
|
})
|
||||||
|
@ -14,6 +14,9 @@ import web from '../components/setting/Web.vue'
|
|||||||
import sip from '../components/setting/Sip.vue'
|
import sip from '../components/setting/Sip.vue'
|
||||||
import media from '../components/setting/Media.vue'
|
import media from '../components/setting/Media.vue'
|
||||||
|
|
||||||
|
import wasmPlayer from '../components/dialog/easyPlayer.vue'
|
||||||
|
import rtcPlayer from '../components/dialog/rtcPlayer.vue'
|
||||||
|
|
||||||
const originalPush = VueRouter.prototype.push
|
const originalPush = VueRouter.prototype.push
|
||||||
VueRouter.prototype.push = function push(location) {
|
VueRouter.prototype.push = function push(location) {
|
||||||
return originalPush.call(this, location).catch(err => err)
|
return originalPush.call(this, location).catch(err => err)
|
||||||
@ -81,5 +84,10 @@ export default new VueRouter({
|
|||||||
name: 'test',
|
name: 'test',
|
||||||
component: test,
|
component: test,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
path: '/play/rtc/:url',
|
||||||
|
name: 'rtcPlayer',
|
||||||
|
component: rtcPlayer,
|
||||||
|
},
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
|
Loading…
Reference in New Issue
Block a user