Merge branch 'iteration-20241028-member' into jenkins

src/views/coursewarePlay/component/tools/pen.tsx

@@ -42,8 +42,8 @@ export default defineComponent({
     const { show } = toRefs(props);
     const firstRender = ref(true);
     const src = /(localhost|192)/.test(location.host)
-      ? 'https://test.lexiaoya.cn/whiteboard-noCollab'
-      : `https://online.lexiaoya.cn/whiteboard-noCollab`;
+      ? 'https://test.lexiaoya.cn/whiteboard-noCollab?platform=daya'
+      : `https://online.lexiaoya.cn/whiteboard-noCollab?platform=daya`;
 
     const exportImg = (event: MessageEvent) => {
       const data = event.data;

src/views/exercise-after-class/index.tsx

@@ -291,6 +291,11 @@ export default defineComponent({
 
       handleExerciseCompleted();
 
+      if(data.visiableStatus) {
+        data.itemList[0].muted = true;
+        data.itemList[0].autoplay = false;
+      }
+
       if (data.disableScreenRecordingFlag === '1') {
         //禁止录屏 ios
         listenerMessage('setVideoPlayer', result => {
@@ -404,12 +409,16 @@ export default defineComponent({
 
     const dialogConfirm = () => {
       if (!data.isLastIndex) {
+        data.itemList = []
+        data.videoData = {}
         const nextItem = data.trainings[data.itemIndex + 1];
         if (nextItem.musicScoreName) {
           popupData.tabName = nextItem.musicScoreName;
         }
         data.itemList = [nextItem];
         data.videoData = nextItem;
+
+        console.log(data.itemList, data.videoData, 'videoData')
         if(data.videoData.useStatus === "LOCK") {
           handleShowVip(data.videoData.lessonCoursewareId, "LESSON", "exercise")
         } else {
@@ -452,6 +461,11 @@ export default defineComponent({
       }
 
       handleExerciseCompleted();
+
+      if(data.visiableStatus) {
+        data.itemList[0].muted = true;
+        data.itemList[0].autoplay = false;
+      }
     }
 
     watch(pageVisibility, (value: any) => {

src/views/exercise-after-class/video-class.tsx

@@ -59,11 +59,11 @@ export default defineComponent({
           videoItem.value?.pause();
         });
         // console.log(props.item, item.value, props.isMember, '-----');
-        videoItem.value.poster(props.item.coverImg); // 封面
-        videoItem.value.src(props.item.content); // url 播放地址
-        videoItem.value.loop(props.item.loop);
-        // videoItem.value.muted(props.item.muted)
-        videoItem.value.autoplay(props.item.autoplay);
+        videoItem.value.poster(item.value.coverImg); // 封面
+        videoItem.value.src(item.value.content); // url 播放地址
+        videoItem.value.loop(item.value.loop);
+        // videoItem.value.muted(item.value.muted)
+        videoItem.value.autoplay(item.value.autoplay);
 
         // 初步加载时
         videoItem.value.one('loadedmetadata', () => {
@@ -73,18 +73,17 @@ export default defineComponent({
           item.value.videoEle = videoEle;
           item.value.loaded = true;
           emit('loadedmetadata', videoItem.value);
-
-          if (item.value.autoplay && videoItem.value) {
-            item.value.muted = false;
+          item.value.muted = false;
             videoItem.value?.muted(false);
             videoItem.value?.volume(1);
-            // videoItem.value?.pause()
+          if (item.value.autoplay && videoItem.value) {
             videoItem.value?.play();
           } else {
-            item.value.muted = false;
-            videoItem.value?.muted(false);
-            videoItem.value?.volume(1);
+            // console.log(item.value, videoItem.value, 'loadedmetadata')
             videoItem.value?.pause();
+            setTimeout(() => {
+              videoItem.value?.pause();
+            }, 100);
           }
         });
 
@@ -159,6 +158,7 @@ export default defineComponent({
       () => props.item,
       () => {
         // item.value.videoEle?.pause()
+        videoItem.value.autoplay(item.value.autoplay);
         __init();
       }
     );