|
@@ -3097,7 +3097,7 @@ export default {
|
|
|
let photoTime = 0; //获取拍照秒数
|
|
|
for (let i = 0; i < this.photoList.length; i++) {
|
|
|
photoTime = Number(this.photoList[i]); //获取拍照秒数
|
|
|
- if (photoTime < this.playTime && photoTime > this.playTime - 8) {
|
|
|
+ if (this.erJianErZao && !this.photoHistoryList.length || photoTime < this.playTime && photoTime > this.playTime - 8) {
|
|
|
//3秒区间内才触发拍照,避免拉动滚动条
|
|
|
if (this.photoHistoryList.indexOf(i) < 0) {
|
|
|
//不存在拍照历史,没有重修过,没有学过,则拍照
|
|
@@ -3168,6 +3168,7 @@ export default {
|
|
|
console.log("播放");
|
|
|
if(this.noticeShow){
|
|
|
polyvPlayerContext.pause();
|
|
|
+ return
|
|
|
}
|
|
|
if (this.needSeek) {
|
|
|
// var polyvPlayerContext = this.selectComponent("#playerVideo");
|
|
@@ -3884,9 +3885,6 @@ export default {
|
|
|
// polyvPlayerContext = this.player;
|
|
|
polyvPlayerContext.on("s2j_onPlayStart", async (vid) => {
|
|
|
console.log("视频初次播放时触发:");
|
|
|
- if(this.noticeShow){
|
|
|
- polyvPlayerContext.j2s_pauseVideo();
|
|
|
- }
|
|
|
// #ifdef H5
|
|
|
// h5禁止拖动进度条
|
|
|
if (!this.$method.isWeixin()) {
|
|
@@ -3916,7 +3914,6 @@ export default {
|
|
|
// 视频暂停时触发
|
|
|
console.log("视频暂停时触发", this.vid);
|
|
|
this.erJianErZaoPauseTip();
|
|
|
-
|
|
|
this.clearBarTimer();
|
|
|
clearInterval(this.studyTimer);
|
|
|
clearInterval(this.timer);
|
|
@@ -3924,6 +3921,10 @@ export default {
|
|
|
polyvPlayerContext.on("s2j_onVideoPlay", () => {
|
|
|
// 视频初次播放或由暂停恢复播放时触发
|
|
|
console.log("视频初次播放或由暂停恢复播放时触发");
|
|
|
+ if(this.noticeShow){
|
|
|
+ polyvPlayerContext.j2s_pauseVideo();
|
|
|
+ return
|
|
|
+ }
|
|
|
if (this.needSeek) {
|
|
|
if (this.recordObj.videoCurrentTime) {
|
|
|
this.seekTime = this.$method.secondToDate(
|