|
|
@@ -782,6 +782,7 @@ export default {
|
|
|
prendreAutoCarme: false, // 是否发起授权相机
|
|
|
studyTimer: null, // 学习记录定时器
|
|
|
CountTo: 30, // 倒计时
|
|
|
+ handoutTipLength: 0,
|
|
|
menuAllList: [],
|
|
|
popupPhotoShow: false,
|
|
|
curPlayIndex: 0, // 正在播放的节的下标
|
|
|
@@ -1002,7 +1003,7 @@ export default {
|
|
|
this.goodsTeacher.push(data)
|
|
|
})
|
|
|
}
|
|
|
- console.log(this.goodsTeacher,'this.goodsTeacher', this.courseId);
|
|
|
+ // console.log(this.goodsTeacher,'this.goodsTeacher', this.courseId);
|
|
|
this.goodsTeacher.forEach((item) => {
|
|
|
if(item.courseList.some(x => x.courseId == this.courseId)){
|
|
|
this.teacherList = item.teaList
|
|
|
@@ -1371,12 +1372,18 @@ export default {
|
|
|
noticeConfirm() {
|
|
|
if (this.CountTo < 0) {
|
|
|
this.noticeShow = false
|
|
|
+ if (this.handoutTipLength == 0 && this.goodsPlayConfig.autoPlay > 0) {
|
|
|
+ this.autoplay = true
|
|
|
+ var polyvPlayerContext = this.selectComponent("#playerVideo")
|
|
|
+ polyvPlayerContext.play()
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
baseHandoutTipList() {
|
|
|
this.$api.baseHandoutTipList({
|
|
|
orderGoodsId:this.orderGoodsId
|
|
|
}).then(res => {
|
|
|
+ this.handoutTipLength = res.data.rows.length
|
|
|
if(res.data.rows.length == 0) {
|
|
|
this.noticeShow = true;
|
|
|
if (this.CountTo == 30) {
|
|
|
@@ -1389,6 +1396,11 @@ export default {
|
|
|
}
|
|
|
} else {
|
|
|
this.CountTo = -1
|
|
|
+ if (this.goodsPlayConfig.autoPlay > 0) {
|
|
|
+ this.autoplay = true
|
|
|
+ var polyvPlayerContext = this.selectComponent("#playerVideo")
|
|
|
+ polyvPlayerContext.play()
|
|
|
+ }
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
@@ -1406,6 +1418,7 @@ export default {
|
|
|
studyRecordQueryLiveLast() {
|
|
|
// /study/record/queryLiveLast
|
|
|
this.$api.studyRecordQueryLiveLast({
|
|
|
+ gradeId: this.gradeId,
|
|
|
orderGoodsId:this.orderGoodsId,
|
|
|
courseId:this.courseId
|
|
|
}).then(async res => {
|
|
|
@@ -1883,6 +1896,7 @@ export default {
|
|
|
self.photoHistoryList.push(res.data.data[i].photoIndex);
|
|
|
}
|
|
|
}
|
|
|
+ // console.log('7777', this.photoHistoryList, this.photoList);
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
@@ -2011,7 +2025,7 @@ export default {
|
|
|
// console.log(this.photoList, "随机拍照时间数组11", photoNum);
|
|
|
this.postCoursePhotoRecord(true); //提交随机拍照时间数组
|
|
|
}
|
|
|
- // console.log(this.photoList, "随机拍照时间数组");
|
|
|
+
|
|
|
//兼容已有观看历史
|
|
|
for (let i = 0; i < this.photoList.length - 1; i++) {
|
|
|
if (
|
|
|
@@ -2026,6 +2040,7 @@ export default {
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
+ // console.log(this.photoList, "随机拍照时间数组11", photoNum);
|
|
|
}
|
|
|
},
|
|
|
getLiveUid(channelId) {
|
|
|
@@ -2596,9 +2611,9 @@ export default {
|
|
|
this.playTime = polyvPlayerContext.getCurrentTime(); //播放时刻
|
|
|
// #endif
|
|
|
// #ifdef H5
|
|
|
- var polyvPlayerContext = polyvPlayerContext.j2s_getCurrentTime()
|
|
|
+ this.playTime = polyvPlayerContext.j2s_getCurrentTime()
|
|
|
// #endif
|
|
|
- // console.log('拍照啊', 789, this.photoHistoryList, 'this.photoList:', this.photoList)
|
|
|
+ // console.log(789, this.photoHistoryList, 'this.photoList:', this.photoList, 'photoNum:', this.photoNum, 'playTime:', this.playTime)
|
|
|
//判断是否需要拍照
|
|
|
if (this.photoNum > 0) {
|
|
|
this.configPhoto();
|
|
|
@@ -2616,8 +2631,8 @@ export default {
|
|
|
//暂停
|
|
|
polyvPlayerContext.exitFullScreen();
|
|
|
polyvPlayerContext.pause();
|
|
|
- if (uni.getStorageSync(`tabkePhotoShow${this.goodsId}`) == this.goodsId) {
|
|
|
this.photoIndex = i;
|
|
|
+ if (uni.getStorageSync(`tabkePhotoShow${this.goodsId}`) == this.goodsId) {
|
|
|
this.openPhoto();
|
|
|
} else {
|
|
|
this.popupPhotoShow = true
|
|
|
@@ -2743,6 +2758,9 @@ export default {
|
|
|
this.$store.commit("setPlaySectionId", { playSectionId: data.sectionId })
|
|
|
this.$store.commit("setPlayVID", { playVID: data.recordingUrl })
|
|
|
|
|
|
+ this.hasStart = false;
|
|
|
+ this.photoConfig = false;
|
|
|
+ this.photoIndex = 0;
|
|
|
this.sectionItem = data;
|
|
|
await this.getPhotoLastRecord() // 获取拍照历史
|
|
|
this.playVideo(data)
|
|
|
@@ -2795,11 +2813,11 @@ export default {
|
|
|
position: 0,
|
|
|
success: (res) => {
|
|
|
let base64 = "data:image/jpg;base64," + res.data;
|
|
|
- console.log('base64Data人脸识别参数：', {
|
|
|
- imageA: base64,
|
|
|
- orderGoodsId: this.orderGoodsId,
|
|
|
- gradeId: this.gradeId,
|
|
|
- })
|
|
|
+ // console.log('base64Data人脸识别参数：', {
|
|
|
+ // imageA: base64,
|
|
|
+ // orderGoodsId: this.orderGoodsId,
|
|
|
+ // gradeId: this.gradeId,
|
|
|
+ // })
|
|
|
|
|
|
let timer = setTimeout(() => {
|
|
|
uni.showToast({
|
|
|
@@ -2854,13 +2872,14 @@ export default {
|
|
|
this.uploadLock = true;
|
|
|
|
|
|
let compareFaceData = await this.faceRecognition();
|
|
|
- console.log(compareFaceData,'compareFaceData')
|
|
|
+ // console.log(compareFaceData,'compareFaceData')
|
|
|
this.compareFaceData = compareFaceData
|
|
|
if (compareFaceData >= 80) {
|
|
|
const waitYS = await this.imageInfos();
|
|
|
this.postCoursePhotoRecord()
|
|
|
.then((res) => {
|
|
|
this.photoHistoryList.push(this.photoIndex);
|
|
|
+ // console.log('拍照确定提交', this.photoHistoryList);
|
|
|
this.postStudyRecord(); //提交记录
|
|
|
//恢复播放
|
|
|
|
|
|
@@ -2968,9 +2987,9 @@ export default {
|
|
|
this.getNoteList();
|
|
|
if (self.goodsData.goodsPlayConfig) {
|
|
|
self.goodsPlayConfig = JSON.parse(self.goodsData.goodsPlayConfig);
|
|
|
- if (self.goodsPlayConfig.autoPlay > 0) {
|
|
|
- self.autoplay = true;
|
|
|
- }
|
|
|
+ // if (self.goodsPlayConfig.autoPlay > 0) {
|
|
|
+ // self.autoplay = true;
|
|
|
+ // }
|
|
|
if (self.goodsPlayConfig.drag > 0) {
|
|
|
self.isAllowSeek = "yes";
|
|
|
}
|
|
|
@@ -3112,7 +3131,7 @@ export default {
|
|
|
|
|
|
}
|
|
|
}
|
|
|
- console.log('menuList: ---', this.menuList, 'menuIndex:', this.menuIndex);
|
|
|
+ // console.log('menuList: ---', this.menuList, 'menuIndex:', this.menuIndex);
|
|
|
}
|
|
|
});
|
|
|
},
|
xuqiaoying