Merge branch '250331-bugfix-shl' into test20250220

This commit is contained in:
joshen
2025-04-01 09:19:46 +08:00
2 changed files with 14 additions and 1 deletions

View File

@@ -506,6 +506,13 @@ export default {
updateProgressBySetTime(newCurrentTime) { updateProgressBySetTime(newCurrentTime) {
this.currentProgress = newCurrentTime / this.videoDom.duration; this.currentProgress = newCurrentTime / this.videoDom.duration;
}, },
/* 点击进度条更新视频播放进度2
*/
updateProgressByClickBar2(newCurrentTime,progressVideo) {
this.currentProgress = progressVideo;
this.barrageTimelineStart = newCurrentTime;
this.videoDom.currentTime = newCurrentTime;
},
/* 提高视频音量 /* 提高视频音量
*/ */
increaseVolume() { increaseVolume() {

View File

@@ -809,6 +809,11 @@
this.$nextTick(function(){ this.$nextTick(function(){
if(this.contentData.progressVideo){
this.$refs.myVideoPlayer.updateProgressByClickBar2(this.contentData.lastStudyTime,this.contentData.progressVideo);
// $this.notePlay = this.contentData.lastStudyTime;
}
//let h0=document.getElementById('id_course_player').offsetHeight; //let h0=document.getElementById('id_course_player').offsetHeight;
let h=$this.$refs.coursePlayer.offsetHeight; let h=$this.$refs.coursePlayer.offsetHeight;
//let h1=$this.$refs.coursePlayer.clientHeight; //let h1=$this.$refs.coursePlayer.clientHeight;
@@ -1465,6 +1470,7 @@
} }
//console.log(scon.contentId,con.id); //console.log(scon.contentId,con.id);
con.lastStudyTime = scon.lastStudyTime; con.lastStudyTime = scon.lastStudyTime;
con.progressVideo = scon.progressVideo;
//以下判断是为了兼容之前的问题,学习状态 //以下判断是为了兼容之前的问题,学习状态
if (scon.status) { if (scon.status) {
con.status = scon.status; con.status = scon.status;