未修复
This commit is contained in:
@@ -4,20 +4,16 @@
|
||||
"version" : "0.0",
|
||||
"configurations" : [
|
||||
{
|
||||
"app-plus" :
|
||||
{
|
||||
"app-plus" : {
|
||||
"launchtype" : "remote"
|
||||
},
|
||||
"default" :
|
||||
{
|
||||
"default" : {
|
||||
"launchtype" : "local"
|
||||
},
|
||||
"h5" :
|
||||
{
|
||||
"h5" : {
|
||||
"launchtype" : "local"
|
||||
},
|
||||
"mp-weixin" :
|
||||
{
|
||||
"mp-weixin" : {
|
||||
"launchtype" : "local"
|
||||
},
|
||||
"provider" : "aliyun",
|
||||
@@ -28,7 +24,7 @@
|
||||
"type" : "uni-app:app-ios"
|
||||
},
|
||||
{
|
||||
"playground" : "custom",
|
||||
"playground" : "standard",
|
||||
"type" : "uni-app:app-android"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -1,13 +1,27 @@
|
||||
<template>
|
||||
<view class="container" style="background-color: #000; position: relative">
|
||||
<view style="width: 100%; height: 200px">
|
||||
<view v-if="show" style="height: 100%;display: flex;align-items:center;justify-content:center;color: #fff;font-size: 38rpx;text-align: center;">{{errorTxt}}</view>
|
||||
<view v-if="showCountDown" class="showCountDownd" style="">
|
||||
<view class="">
|
||||
<text class="nextText">{{secondCountDown}} 秒后播放下一个视频</text><br/>
|
||||
<view >
|
||||
<text class="cancelNext" @click="hideNextVideo">取消下一个</text>
|
||||
<!-- <text class="cancelNext" @click="replayVideo">重新播放</text> -->
|
||||
</view>
|
||||
<!-- <view class="cancelNext" @click="hideNextVideo">重新播放</view> -->
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="show"
|
||||
style="height: 100%;display: flex;align-items:center;justify-content:center;color: #fff;font-size: 38rpx;text-align: center;">
|
||||
{{errorTxt}}</view>
|
||||
<div class="" v-else style="background-color: #000" ref="videoContent" @tap="renderScript.handleClick"
|
||||
id="url-player-test" :videoData="videoData" :winWidth="winWidth" :winHeight="winHeight"
|
||||
:currentVideoList="currentVideoList" :firstTime="firstTime" :isfresh="isfresh" :platform="platform"
|
||||
:isSetFirstTime="isSetFirstTime" :isChange="isChange" :change:videoData="renderScript.receiveMsg"
|
||||
:replayVideoFlag="replayVideoFlag"
|
||||
:change:winWidth="renderScript.receiveWinWidth" :change:winHeight="renderScript.receiveWinHeight"
|
||||
:change:firstTime="renderScript.receiveFirstTime"
|
||||
:change:replayVideoFlag="renderScript.receiveReplayVideoFlag"
|
||||
:change:isSetFirstTime="renderScript.receiveisSetFirstTime"
|
||||
:change:isfresh="renderScript.receiveIsfresh" :change:platform="renderScript.receiveplatform"
|
||||
:change:isChange="renderScript.receiveIsChange"
|
||||
@@ -29,6 +43,15 @@
|
||||
<div @tap="renderScript.emitopenShow" ref="videoContent5" v-show="false" class="videoContent5">
|
||||
打开视频提示
|
||||
</div>
|
||||
<div @tap="renderScript.emitLoadNextVideo" ref="videoContent6" v-show="false" class="videoContent6">
|
||||
播放下一条
|
||||
</div>
|
||||
<div @tap="renderScript.emitHideNextVideo" ref="videoContent7" v-show="false" class="videoContent7">
|
||||
隐藏播放下一条界面
|
||||
</div>
|
||||
<div @tap="renderScript.emitReplayVideoFlagFalse" ref="videoContent8" v-show="false" class="videoContent8">
|
||||
隐藏播放下一条界面
|
||||
</div>
|
||||
<div class="fullScreenButton-container">
|
||||
<div :class="`prism-fullscreen-btn ${isFullScreen ? 'fullscreen' : ''}`"
|
||||
@tap="renderScript.changeVideoScreen"></div>
|
||||
@@ -45,7 +68,7 @@
|
||||
} from "vuex";
|
||||
|
||||
export default {
|
||||
props: ["currentVideo", "currentVideoList","videoTitle"],
|
||||
props: ["currentVideo", "currentVideoList", "videoTitle",'secondCountDown'],
|
||||
data() {
|
||||
return {
|
||||
reaquestFlag: false,
|
||||
@@ -57,8 +80,13 @@
|
||||
isChange: false,
|
||||
isControl: true,
|
||||
timer: null,
|
||||
replayVideoFlag:false,
|
||||
// secondCountDown: 5,
|
||||
showCountDown: false,
|
||||
playEndBlank:false,
|
||||
// videoTitle: "",
|
||||
videoList: [],
|
||||
replayVideoLock:false,// 重播操作锁
|
||||
firstTime: 0,
|
||||
options: {},
|
||||
playAuth: "",
|
||||
@@ -111,6 +139,39 @@
|
||||
},
|
||||
|
||||
methods: {
|
||||
replayVideo(){
|
||||
if(!this.replayVideoFlag){
|
||||
this.getLive(true, this.currentVideo)
|
||||
console.log('this.currentVideo',this.currentVideo.id);
|
||||
this.hideNextVideo()
|
||||
this.replayVideoFlag = true
|
||||
}
|
||||
},
|
||||
replayVideoFlagFalse(){
|
||||
console.log('复原replayVideoFlag',this.replayVideoFlag);
|
||||
this.replayVideoFlag = false
|
||||
},
|
||||
hideNextVideo(){
|
||||
this.showCountDown = false
|
||||
this.playEndBlank = false
|
||||
this.$emit('hideNextVideo')
|
||||
},
|
||||
loadNextVideo() {
|
||||
this.playEndBlank = true
|
||||
var _list = [...this.currentVideoList]
|
||||
_list = _list.map(item => { return item.id})
|
||||
|
||||
var thisIndex = _list.findIndex(item=>{
|
||||
return item == this.currentVideo.id
|
||||
})
|
||||
console.log('播放列表',_list,this.currentVideo.id, thisIndex);
|
||||
if(thisIndex < this.currentVideoList.length-1){
|
||||
this.showCountDown = true
|
||||
this.$emit('startNextVideoCountDown')
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
openShow(data) {
|
||||
data.msg ? this.errorTxt = data.msg : '此设备暂不支持观看当前视频请移步到安卓手机进行学习'
|
||||
this.show = true;
|
||||
@@ -166,7 +227,7 @@
|
||||
|
||||
this.videoId = this.options.video;
|
||||
console.log("这是苹果视屏id", this.videoId);
|
||||
await this.getLive(isChange);
|
||||
await this.getLive(isChange,this.options);
|
||||
},
|
||||
// 配置播放项
|
||||
async getData(data, isChange) {
|
||||
@@ -236,6 +297,7 @@
|
||||
},
|
||||
// 获取播放凭证
|
||||
async getLive(isChange, newVideoData) {
|
||||
console.log('获取播放凭证',newVideoData.id);
|
||||
if (this.reaquestFlag) {
|
||||
uni.showToast({
|
||||
title: '操作太快了,歇一下吧',
|
||||
@@ -264,9 +326,11 @@
|
||||
},
|
||||
})
|
||||
.then(async (res) => {
|
||||
|
||||
this.reaquestFlag = false
|
||||
if (this.$platform == 'ios') {
|
||||
if (this.currentVideo.type == 1 && res.video.m3u8Url == null || this.currentVideo.type == 1 && res.video.m3u8Url == '') {
|
||||
if (this.currentVideo.type == 1 && res.video.m3u8Url == null || this.currentVideo
|
||||
.type == 1 && res.video.m3u8Url == '') {
|
||||
// 只存在私有加密
|
||||
this.show = true
|
||||
uni.showModal({
|
||||
@@ -375,8 +439,10 @@
|
||||
</script>
|
||||
|
||||
<script module="renderScript" lang="renderjs">
|
||||
var GolbalPlayerOptions = {}
|
||||
var videoData = null
|
||||
var _seconds = 0
|
||||
var ReplayVideoFlag = false
|
||||
var curStatus = null
|
||||
var diff = 0
|
||||
var myplayer = undefined
|
||||
@@ -389,6 +455,7 @@
|
||||
// 在适合的生命周期,通过script和link标签引入播放器sdk、css
|
||||
console.log(this.options, '这是monted')
|
||||
this.loadWebPlayerSDK()
|
||||
this.loadComponent()
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
@@ -419,6 +486,23 @@
|
||||
})
|
||||
|
||||
},
|
||||
receiveReplayVideoFlag(newValue, oldValue, ownerVm, vm) {
|
||||
console.log('newValue重新播放',newValue,myplayer);
|
||||
ReplayVideoFlag = newValue
|
||||
if(newValue){
|
||||
$('.videoContent8').click()
|
||||
// ReplayVideoFlag = newValue
|
||||
// // myplayer.replay()
|
||||
// $('.videoContent7').click()
|
||||
// myplayer.seek(0)
|
||||
// myplayer.play()
|
||||
|
||||
}
|
||||
|
||||
},
|
||||
emitReplayVideoFlagFalse(event, ownerInstance) {
|
||||
ownerInstance.callMethod('replayVideoFlagFalse')
|
||||
},
|
||||
async receiveFirstTime(newValue, oldValue, ownerVm, vm) {
|
||||
|
||||
},
|
||||
@@ -431,8 +515,16 @@
|
||||
time: _seconds,
|
||||
})
|
||||
},
|
||||
emitHideNextVideo(event, ownerInstance) {
|
||||
ownerInstance.callMethod('hideNextVideo')
|
||||
},
|
||||
emitLoadNextVideo(event, ownerInstance) {
|
||||
ownerInstance.callMethod('loadNextVideo')
|
||||
},
|
||||
emitopenShow(event, ownerInstance) {
|
||||
ownerInstance.callMethod('openShow',{msg:'播放出错啦!'})
|
||||
ownerInstance.callMethod('openShow', {
|
||||
msg: '播放出错啦!'
|
||||
})
|
||||
},
|
||||
// 全屏切换事件
|
||||
changeVideoScreen(event, ownerInstance) {
|
||||
@@ -476,8 +568,8 @@
|
||||
},
|
||||
// renderjs阿里云播放器引入与配置
|
||||
getLive() {
|
||||
console.log('这是这只只是666666:', this.firstTime, this.videoData)
|
||||
if (this.player) {
|
||||
// console.log('这是这只只是666666:', this.firstTime, this.videoData)
|
||||
if (myplayer) {
|
||||
this.player.dispose();
|
||||
$('#url-player-test').empty();
|
||||
this.player = null;
|
||||
@@ -538,24 +630,22 @@
|
||||
/**
|
||||
* 显示广告
|
||||
*/
|
||||
ended: function(player, e) {
|
||||
}
|
||||
ended: function(player, e) {}
|
||||
});
|
||||
console.log('这是查看是否获取到hlstoken', this.videoData)
|
||||
// console.log('这是查看是否获取到hlstoken', this.videoData)
|
||||
var playerOptions = {
|
||||
id: "url-player-test",
|
||||
width: '100%', //容器的大小
|
||||
height: '100%', //容器的大小
|
||||
"qualitySort": "asc",
|
||||
"cover": "",
|
||||
"autoplay": true,
|
||||
"isLive": false,
|
||||
"rePlay": false,
|
||||
"playsinline": true,
|
||||
"controlBarVisibility": "hover",
|
||||
"useH5Prism": true,
|
||||
components: [
|
||||
{
|
||||
width: '100%', //容器的大小
|
||||
height: '100%', //容器的大小
|
||||
"qualitySort": "asc",
|
||||
"cover": "",
|
||||
"autoplay": true,
|
||||
"isLive": false,
|
||||
"rePlay": false,
|
||||
"playsinline": true,
|
||||
"controlBarVisibility": "hover",
|
||||
"useH5Prism": true,
|
||||
components: [{
|
||||
name: 'adComponent',
|
||||
type: fullScreenButtonComponent,
|
||||
args: [
|
||||
@@ -626,6 +716,7 @@
|
||||
x: 15,
|
||||
y: 12
|
||||
},
|
||||
// {name: "fullScreenButton", align: "tr", x: 10, y: 12},
|
||||
{
|
||||
name: "volume",
|
||||
align: "tr",
|
||||
@@ -673,22 +764,43 @@
|
||||
}
|
||||
console.log('这是没有加密的视频');
|
||||
}
|
||||
|
||||
// GolbalPlayerOptions = playerOptions
|
||||
var player = new Aliplayer(playerOptions, function(player) {});
|
||||
this.player = player;
|
||||
myplayer = player;
|
||||
// console.log('myplayer------------',myplayer.loadByUrl('https://www.w3schools.com/html/movie.mp4'));
|
||||
|
||||
console.log('myplayer------------',JSON.stringify(myplayer));
|
||||
console.log('是否拿到第一次初始值呢', this.platform, typeof this.firstTime, this.firstTime)
|
||||
|
||||
player.on('ready', function() {
|
||||
console.log('播放器准备就绪,开始播放');
|
||||
player.play()
|
||||
})
|
||||
player.on('play', function() {
|
||||
console.log('开始播放------');
|
||||
|
||||
$('.videoContent7').click()
|
||||
|
||||
})
|
||||
player.one('canplay', function() {
|
||||
console.log('这是ios数据缓冲初次设置播放位置判断!!!!',videoData)
|
||||
// console.log('这是ios数据缓冲初次设置播放位置判断!!!!', videoData)
|
||||
// player.seek(20);
|
||||
// if(ReplayVideoFlag){
|
||||
// player.seek(0);
|
||||
// }else{
|
||||
var videoDurationTimes = parseInt(player.getDuration())
|
||||
// var firstTime = parseInt(player.getCurrentTime())
|
||||
console.log('视频总长度',parseInt(player.getDuration()),parseInt(player.getCurrentTime()));
|
||||
if(videoData.firstTime < videoDurationTimes){
|
||||
player.seek(videoData.firstTime);
|
||||
}else{
|
||||
player.seek(0);
|
||||
}
|
||||
//}
|
||||
})
|
||||
this.player.on('playing', function() {
|
||||
console.log('正在播放')
|
||||
console.log('正在播放...')
|
||||
|
||||
})
|
||||
this.player.on('timeupdate', function() {
|
||||
let that = this
|
||||
@@ -709,6 +821,7 @@
|
||||
this.player.on('ended', function() {
|
||||
console.log('播放完毕');
|
||||
$('.videoContent2').click()
|
||||
$('.videoContent6').click()
|
||||
})
|
||||
|
||||
this.player.on('error', function() {
|
||||
@@ -742,8 +855,7 @@
|
||||
});
|
||||
|
||||
},
|
||||
receiveScreenType(newValue) {
|
||||
},
|
||||
receiveScreenType(newValue) {},
|
||||
async receiveIsfresh(newValue) {
|
||||
|
||||
console.log('是否走了刷新销毁方法:', this.player)
|
||||
@@ -768,9 +880,11 @@
|
||||
},
|
||||
// 监听视频参数变化,并赋值给常量
|
||||
receiveMsg(newValue, oldValue, ownerVm, vm) {
|
||||
|
||||
//数据变化
|
||||
videoData = newValue
|
||||
if (videoData) {
|
||||
console.log('切换后的播放数据videoData',videoData.type);
|
||||
if (videoData.type == 1) {
|
||||
if (videoData.m3u8Url != '' && videoData.m3u8Url != null) {
|
||||
// myplayer.source(videoData.m3u8Url)
|
||||
@@ -781,11 +895,11 @@
|
||||
console.log('切换走了吗?私有加密');
|
||||
}
|
||||
} else {
|
||||
myplayer.loadByUrl(videoData.m3u8Url)
|
||||
myplayer.loadByUrl(videoData.videoUrl)
|
||||
console.log('切换常规视频');
|
||||
}
|
||||
}
|
||||
console.log('可能是切换视频',myplayer,videoData,);
|
||||
// console.log('可能是切换视频', videoData, );
|
||||
},
|
||||
receiveWinWidth(newValue, oldValue, ownerVm, vm) {
|
||||
//数据变化
|
||||
@@ -803,7 +917,7 @@
|
||||
this.checkValue();
|
||||
}, 1000);
|
||||
} else {
|
||||
console.log('这是这只只是594:', this.firstTime, this.videoData)
|
||||
// console.log('这是这只只是594:', this.firstTime, this.videoData)
|
||||
this.getLive();
|
||||
}
|
||||
},
|
||||
@@ -833,11 +947,49 @@
|
||||
document.body.appendChild(l_tag);
|
||||
});
|
||||
},
|
||||
|
||||
loadComponent() {
|
||||
return new Promise((resolve, reject) => {
|
||||
const s_tag = document.createElement('script');
|
||||
s_tag.type = 'text/javascript';
|
||||
// 需要先下载组件 js 文件,放到项目 /static/ 目录下
|
||||
// 下载地址:https://github.com/aliyunvideo/AliyunPlayer_Web/blob/master/customComponents/dist/aliplayer-components/aliplayercomponents-1.0.9.min.js
|
||||
s_tag.src = '@/static/aliplayercomponents-1.0.9.min.js';
|
||||
s_tag.charset = 'utf-8';
|
||||
s_tag.onload = () => {
|
||||
resolve();
|
||||
}
|
||||
document.body.appendChild(s_tag);
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style>
|
||||
.cancelNext{display: inline-block;
|
||||
border-radius: 10rpx; margin-top: 10rpx;
|
||||
padding: 10rpx 20rpx !important; background-color: #fff !important;
|
||||
color: #000; text-align: center; line-height: 50rpx;}
|
||||
/* .cancelNext:last-child{margin-left: 10rpx;} */
|
||||
.nextText{}
|
||||
.showCountDownd {
|
||||
box-sizing: border-box;
|
||||
height: 100%; width: 90%; background-color: rgba(0, 0, 0, 0.6);
|
||||
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content:flex-end;
|
||||
color: #fff;
|
||||
font-size: 38rpx;
|
||||
text-align: center;
|
||||
position: absolute;
|
||||
top: 0; right: 10rpx;
|
||||
z-index: 4;
|
||||
text{
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.container {
|
||||
width: 100vw;
|
||||
height: auto;
|
||||
|
||||
@@ -16,8 +16,11 @@
|
||||
<common-video
|
||||
@changeScreen="changeScreen"
|
||||
@changeScreenLoading="changeScreenLoading"
|
||||
@hideNextVideo="hideNextVideo"
|
||||
@startNextVideoCountDown = "startNextVideoCountDown"
|
||||
v-if="isfresh"
|
||||
ref="commonVideo"
|
||||
:secondCountDown="secondCountDown"
|
||||
:videoTitle="curriculumData.title"
|
||||
:currentVideo="currentVideo"
|
||||
:noRecored = "noRecored"
|
||||
@@ -119,6 +122,8 @@ export default {
|
||||
isfresh: false,
|
||||
currentCateIndex: 0,
|
||||
currentVideo: {},
|
||||
secondCountDown:10,
|
||||
countDownTimer:undefined,
|
||||
videoList: {},
|
||||
isOpenMp3: false,
|
||||
praise: "",
|
||||
@@ -206,22 +211,13 @@ export default {
|
||||
},
|
||||
beforeDestroy(){
|
||||
console.log('页面卸载')
|
||||
|
||||
// this.$nextTick(()=>{
|
||||
// this.$refs.commonVideo.handleEnd();
|
||||
|
||||
// })
|
||||
this.hideNextVideo()
|
||||
},
|
||||
onUnload(){
|
||||
// console.log('页面卸载')
|
||||
|
||||
// // this.$nextTick(()=>{
|
||||
// this.$refs.commonVideo.handleEnd();
|
||||
|
||||
// // })
|
||||
|
||||
},
|
||||
onHide() {
|
||||
// this.hideNextVideo()
|
||||
// this.showSearchList = false
|
||||
// this.searchList = []
|
||||
},
|
||||
@@ -232,7 +228,33 @@ export default {
|
||||
...mapState(["userInfo"]),
|
||||
},
|
||||
methods: {
|
||||
// 放大图片
|
||||
startNextVideoCountDown(){
|
||||
this.secondCountDown = 10
|
||||
let that = this
|
||||
if(this.countDownTimer){
|
||||
clearInterval(this.countDownTimer)
|
||||
}
|
||||
this.countDownTimer = setInterval(()=>{
|
||||
this.secondCountDown -= 1
|
||||
if(this.secondCountDown == 0){
|
||||
// clearInterval(this.countDownTimer)
|
||||
// console.log('倒计时结束');
|
||||
that.hideNextVideo()
|
||||
console.log('切换之前的播放index是',this.currentCateIndex);
|
||||
// console.log('当前的播放列表',this.videoArray.length);
|
||||
// if(this.currentCateIndex < this.videoArray.length-1){
|
||||
this.currentCateIndex++
|
||||
console.log('切换之后的播放index是',this.currentCateIndex);
|
||||
that.changeVideo(this.videoArray[this.currentCateIndex])
|
||||
// }
|
||||
}
|
||||
},1000)
|
||||
},
|
||||
hideNextVideo(){
|
||||
console.log('父组件收到了取消加载-------------------');
|
||||
clearInterval(this.countDownTimer)
|
||||
this.countDownTimer = undefined
|
||||
},
|
||||
|
||||
//课程详情
|
||||
async gotoDetail(v, index) {
|
||||
@@ -279,9 +301,16 @@ export default {
|
||||
});
|
||||
},
|
||||
changeVideo(data) {
|
||||
console.log("点击了点击了切换视频-----:", data);
|
||||
if(this.countDownTimer){
|
||||
this.hideNextVideo()
|
||||
}
|
||||
|
||||
console.log("点击了点击了切换视频-----:", this.countDownTimer,data, );
|
||||
|
||||
if (data.id != this.currentVideo.id) {
|
||||
this.currentCateIndex = this.videoArray.findIndex(item => {
|
||||
return item.id == data.id
|
||||
})
|
||||
// handleEnd
|
||||
// this.$refs.commonVideo.handleEnd();
|
||||
setTimeout(() => {
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
align-items: center;
|
||||
" @click="isHideCourseInfo = !isHideCourseInfo">
|
||||
<view :class="`${isHideCourseInfo ? 'hidden2' : ''}`"
|
||||
style="width: calc(100% - 50rpx)" v-html="course.content">
|
||||
style="width: calc(100% - 50rpx); font-size: 30rpx;" v-html="course.content">
|
||||
</view>
|
||||
<!-- <text
|
||||
style="
|
||||
|
||||
5932
static/aliplayercomponents-1.0.9.min.js
vendored
Normal file
5932
static/aliplayercomponents-1.0.9.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user