dusenyao 3 роки тому
батько
коміт
c1c5d183eb

+ 6 - 6
package-lock.json

@@ -11,7 +11,7 @@
         "ailp-book-question-ui": "file:../ailp-book-question-ui-0.1.1.tgz",
         "awe-dnd": "^0.3.4",
         "axios": "^0.27.2",
-        "book-ui": "file:../book-ui-0.3.9.tgz",
+        "book-ui": "file:../book-ui-0.3.10.tgz",
         "core-js": "^3.23.2",
         "dayjs": "^1.11.3",
         "element-ui": "^2.15.9",
@@ -6295,9 +6295,9 @@
       "dev": true
     },
     "node_modules/book-ui": {
-      "version": "0.3.9",
-      "resolved": "file:../book-ui-0.3.9.tgz",
-      "integrity": "sha512-OL6mgaMVzM0QUD8Qste2uBFpaPE10BhBW2Mn0Gy4xNsvQhkv4ZLKa+4gvGZg+7uTMeYbB/B0XrF90FW3tgrKJg==",
+      "version": "0.3.10",
+      "resolved": "file:../book-ui-0.3.10.tgz",
+      "integrity": "sha512-q4/NSLrFXn+fvbjrOiiSSSqbXD947fgwCCi4uYO8Pxj6UlRuUcXlaPGPchMCrVSZCge1V0gvc5/ohi/agbNFwg==",
       "dependencies": {
         "awe-dnd": "^0.3.4",
         "axios": "^0.21.1",
@@ -31723,8 +31723,8 @@
       }
     },
     "book-ui": {
-      "version": "file:..\\book-ui-0.3.9.tgz",
-      "integrity": "sha512-OL6mgaMVzM0QUD8Qste2uBFpaPE10BhBW2Mn0Gy4xNsvQhkv4ZLKa+4gvGZg+7uTMeYbB/B0XrF90FW3tgrKJg==",
+      "version": "file:..\\book-ui-0.3.10.tgz",
+      "integrity": "sha512-q4/NSLrFXn+fvbjrOiiSSSqbXD947fgwCCi4uYO8Pxj6UlRuUcXlaPGPchMCrVSZCge1V0gvc5/ohi/agbNFwg==",
       "requires": {
         "awe-dnd": "^0.3.4",
         "axios": "^0.21.1",

+ 1 - 1
package.json

@@ -16,7 +16,7 @@
     "ailp-book-question-ui": "file:../ailp-book-question-ui-0.1.1.tgz",
     "awe-dnd": "^0.3.4",
     "axios": "^0.27.2",
-    "book-ui": "file:../book-ui-0.3.9.tgz",
+    "book-ui": "file:../book-ui-0.3.10.tgz",
     "core-js": "^3.23.2",
     "dayjs": "^1.11.3",
     "element-ui": "^2.15.9",

+ 1 - 1
src/components/course/CompletionView.vue

@@ -55,7 +55,7 @@
       <bookrlc v-if="context" :context="context" :theme-color="themeColor" :book-font-size="bookFontSize" />
     </template>
 
-    <div slot="footer" />
+    <div slot="footer"></div>
   </el-dialog>
 </template>
 

+ 3 - 3
src/components/live/CurMaterial.vue

@@ -93,7 +93,7 @@
           :src="`${$store.state.app.config.doc_preview_service_address}/onlinePreview?url=${fileUrl}`"
           width="100%"
           height="540px"
-        />
+        ></iframe>
       </div>
     </template>
 
@@ -418,7 +418,7 @@ export default {
       const data = {
         file_id_list: JSON.parse(idList)
       };
-      getContentFile(MethodName, data).then(res => {
+      getContentFile(MethodName, data).then((res) => {
         const id = res.file_compress_task_id;
         this.bookDownTimer = setInterval(() => {
           this.checkTaskProgress(id);
@@ -437,7 +437,7 @@ export default {
       const data = {
         file_compress_task_id: taskId
       };
-      getContentFile(MethodName, data).then(res => {
+      getContentFile(MethodName, data).then((res) => {
         if (res.is_finish === 'true') {
           clearInterval(this.bookDownTimer);
           window.open(

+ 18 - 18
src/views/live/student/audit.js

@@ -31,11 +31,11 @@ export function unSubscribeStream(unSubStream) {
  * 初始化监听事件
  */
 export function initListener(vue) {
-  rtc.on('login_success', data => {
+  rtc.on('login_success', (data) => {
     console.log('登录成功', data);
   });
 
-  rtc.on('login_failed', data => {
+  rtc.on('login_failed', (data) => {
     console.log('登录失败', data);
     Message({
       message: `${i18n.t('Key443')}:${JSON.stringify(data)}`,
@@ -60,13 +60,13 @@ export function initListener(vue) {
     });
   });
 
-  rtc.on('conference_join_failed', err => {
+  rtc.on('conference_join_failed', (err) => {
     // 加入房间失败  err为错误原因
     console.log('加入房间失败', err);
   });
 
   // 新增订阅流事件
-  rtc.on('allow_sub', stream => {
+  rtc.on('allow_sub', (stream) => {
     console.log('新增订阅流事件');
     if (stream.isMixed()) {
       console.log('是混合流,不订阅');
@@ -74,7 +74,7 @@ export function initListener(vue) {
       // 订阅远程流
       rtc.trySubscribeStream({
         tryStream: stream,
-        success: stream => {
+        success: (stream) => {
           // 订阅流成功
           const streamType = stream.streamType();
           console.log('订阅流成功', streamType);
@@ -94,12 +94,12 @@ export function initListener(vue) {
   });
 
   // 房间全量信息事件(人员进出时广播)
-  rtc.on('room_context', roomData => {
+  rtc.on('room_context', (roomData) => {
     vue.roomContext = JSON.parse(roomData);
     console.log('房间全量信息事件(人员进出时广播)', JSON.parse(roomData));
   });
 
-  rtc.on('publish_stream', str => {
+  rtc.on('publish_stream', (str) => {
     console.log('直播已开启', str);
     Message({
       type: 'success',
@@ -108,7 +108,7 @@ export function initListener(vue) {
     vue.liveStat = true;
   });
 
-  rtc.on('end_stream', str => {
+  rtc.on('end_stream', (str) => {
     console.log('分组讨论已关闭', str);
     Message({
       type: 'success',
@@ -118,17 +118,17 @@ export function initListener(vue) {
   });
 
   // 单个用户配置监听
-  rtc.on('switch_user_settings', settingData => {
+  rtc.on('switch_user_settings', (settingData) => {
     console.log('单个用户配置监听', JSON.parse(settingData));
   });
 
   // 人员列表事件(人员麦序变化时广播)
-  rtc.on('speak_context', speakData => {
+  rtc.on('speak_context', (speakData) => {
     vue.speakData = JSON.parse(speakData);
     console.log('人员列表事件(人员麦序变化时广播)', JSON.parse(speakData));
   });
 
-  rtc.on('switch_settings', data => {
+  rtc.on('switch_settings', (data) => {
     console.log('房间设置事件', JSON.parse(data)); // 房间设置事件
   });
 
@@ -137,24 +137,24 @@ export function initListener(vue) {
   });
 
   // 视频无法自动播放
-  rtc.on('playError', data => {
+  rtc.on('playError', (data) => {
     console.log('视频无法自动播放', data);
   });
 
   // 监听通知移除流事件
-  rtc.on('stream_removed', stream => {
+  rtc.on('stream_removed', (stream) => {
     console.log('监听通知移除流事件');
     if (stream.streamType() === 0) {
       vue.is_teacher_in_group = false;
     }
-    const num = vue.streamList.findIndex(el => el.id() === stream.id());
+    const num = vue.streamList.findIndex((el) => el.id() === stream.id());
     if (num !== -1) {
       vue.streamList.splice(num, 1);
     }
   });
 
   // 停止订阅流
-  rtc.on('unSub', stream => {
+  rtc.on('unSub', (stream) => {
     console.log('停止订阅流');
     unSubscribeStream(stream);
   });
@@ -164,11 +164,11 @@ export function initListener(vue) {
    */
 
   // 监听自己被邀请事件
-  rtc.on('inviteUp', uid => {
+  rtc.on('inviteUp', (uid) => {
     console.log('监听自己被邀请事件', uid);
   });
 
-  rtc.on('videoModeChange', data => {
+  rtc.on('videoModeChange', (data) => {
     console.log('连麦音视频模式更新成功监听回调', data.settings.video_mode);
     vue.roomInfo.video_mode = data.settings.video_mode;
   });
@@ -176,7 +176,7 @@ export function initListener(vue) {
   /**
    * 监听聊天事件
    */
-  rtc.on('chat_message', data => {
+  rtc.on('chat_message', (data) => {
     const dat = JSON.parse(data);
     // 如果返回消息中有 isFilterChat 字段(消息不包含敏感词返回数据中无isFilterChat字段),且isFilterChat的值为1,则说明该消息包含敏感字,除发送者外其他人不会收到这条消息。
     if (dat.isFilterChat && dat.isFilterChat === 1) {

+ 27 - 27
src/views/live/teacher/live.js

@@ -31,11 +31,11 @@ function publishStream(streamName) {
   rtc.publish({
     streamName,
     // 推流成功,更新上麦结果
-    success: stream => {
+    success: (stream) => {
       console.log('推流成功', stream);
       updateMcResult(stream.id(), 1);
     },
-    fail: str => {
+    fail: (str) => {
       // 推流失败,更新上麦结果
       console.log('推流失败,更新上麦结果', str);
       updateMcResult('', 0);
@@ -80,7 +80,7 @@ export function closeVideoTeacher(options) {
  * 初始化监听事件
  */
 export function initListener(vue) {
-  rtc.on('login_success', data => {
+  rtc.on('login_success', (data) => {
     console.log('登录成功', data);
     vue.roomData = data;
     // 初始化画板需要的数据
@@ -94,7 +94,7 @@ export function initListener(vue) {
     rtc.canvasInit(canvasInitData);
   });
 
-  rtc.on('login_failed', data => {
+  rtc.on('login_failed', (data) => {
     console.log('登录失败', data);
     Message({
       message: `${i18n.t('Key443')}:${JSON.stringify(data)}`,
@@ -130,8 +130,8 @@ export function initListener(vue) {
           });
         }
 
-        const isVideo = device.video.length > 0 && data.video.some(item => item.deviceId === device.video);
-        const isAudio = device.audio.length > 0 && data.audio.some(item => item.deviceId === device.audio);
+        const isVideo = device.video.length > 0 && data.video.some((item) => item.deviceId === device.video);
+        const isAudio = device.audio.length > 0 && data.audio.some((item) => item.deviceId === device.audio);
 
         if (!isVideo && !isAudio) {
           vue.setDevice(false);
@@ -149,7 +149,7 @@ export function initListener(vue) {
     });
   });
 
-  rtc.on('conference_join_failed', err => {
+  rtc.on('conference_join_failed', (err) => {
     // 加入房间失败  err为错误原因
     console.log('加入房间失败', err);
     Message({
@@ -159,7 +159,7 @@ export function initListener(vue) {
   });
 
   // 新增订阅流事件
-  rtc.on('allow_sub', tryStream => {
+  rtc.on('allow_sub', (tryStream) => {
     if (tryStream.isMixed()) {
       console.log('是混合流,不订阅');
     } else {
@@ -207,61 +207,61 @@ export function initListener(vue) {
   });
 
   // 房间全量信息事件(人员进出时广播)
-  rtc.on('room_context', roomData => {
+  rtc.on('room_context', (roomData) => {
     vue.roomContext = JSON.parse(roomData);
     vue.getLiveRoomData_DRTD();
     console.log('房间全量信息事件(人员进出时广播)', JSON.parse(roomData));
   });
 
-  rtc.on('publish_stream', str => {
+  rtc.on('publish_stream', (str) => {
     console.log('直播已开启', str);
     vue.liveStat = true;
   });
 
-  rtc.on('end_stream', str => {
+  rtc.on('end_stream', (str) => {
     console.log('直播已关闭', str);
     vue.liveStat = false;
   });
 
-  rtc.on('switch_user_settings', settingData => {
+  rtc.on('switch_user_settings', (settingData) => {
     // 单个用户配置监听
     console.log(settingData);
   });
 
   // 人员列表事件(人员麦序变化时广播)
-  rtc.on('speak_context', speakData => {
+  rtc.on('speak_context', (speakData) => {
     vue.speakData = JSON.parse(speakData);
     console.log('人员列表事件(人员麦序变化时广播)', JSON.parse(speakData));
   });
 
-  rtc.on('switch_settings', data => {
+  rtc.on('switch_settings', (data) => {
     console.log('房间设置事件', data); // 房间设置事件
   });
 
   // 网络整体状态事件
-  rtc.on('netStatus', data => {
+  rtc.on('netStatus', (data) => {
     vue.netStatus = data.netStatus;
   });
 
   // 单条流状态通知事件
-  rtc.on('streamStatus', data => {
+  rtc.on('streamStatus', (data) => {
     console.log(data);
   });
 
   // 推流异常断开事件
-  rtc.on('publishStreamErr', data => {
+  rtc.on('publishStreamErr', (data) => {
     // 直播开启状态下,尝试重推这条流
     console.log(`推流意外终止:${data.streamName}`);
     publishStream('main');
   });
 
   // 视频无法自动播放
-  rtc.on('playError', data => {
+  rtc.on('playError', (data) => {
     console.log('视频无法自动播放', data);
   });
 
   // 监听通知移除流事件
-  rtc.on('stream_removed', stream => {
+  rtc.on('stream_removed', (stream) => {
     console.log('监听通知移除流事件', stream);
     if ('room_user_id' in vue.connectStudent && stream.streamType() === 10 && vue.connect) {
       vue.handsDown();
@@ -271,7 +271,7 @@ export function initListener(vue) {
   });
 
   // 停止订阅流
-  rtc.on('unSub', unSubStream => {
+  rtc.on('unSub', (unSubStream) => {
     console.log('停止订阅流', unSubStream);
     rtc.unSubscribeStream({
       unSubStream,
@@ -286,7 +286,7 @@ export function initListener(vue) {
   });
 
   // 用户退出房间通知其他人员事件
-  rtc.on('exit_room_user', data => {
+  rtc.on('exit_room_user', (data) => {
     console.log('用户退出房间通知其他人员事件', data);
     vue.studentExitLiveRoom(data.id, false);
   });
@@ -296,7 +296,7 @@ export function initListener(vue) {
    */
 
   // 监听自己被邀请事件
-  rtc.on('inviteUp', uid => {
+  rtc.on('inviteUp', (uid) => {
     console.log('监听自己被邀请事件', uid);
     rtc.inviteAccept({
       success(str) {
@@ -311,7 +311,7 @@ export function initListener(vue) {
   /**
    * 监听聊天事件
    */
-  rtc.on('chat_message', data => {
+  rtc.on('chat_message', (data) => {
     const dat = JSON.parse(data);
     console.log(dat);
     // 敏感词过滤:如果发送的聊天消息被系统判定包含敏感词,则只有发送者能收到本条消息,房间内其他人都不会收到这条聊天消息。
@@ -330,13 +330,13 @@ export function initListener(vue) {
   });
 
   // 画笔数据事件
-  rtc.on('draw', data => {
+  rtc.on('draw', (data) => {
     const drawData = JSON.parse(data);
     console.log('画笔数据事件', drawData);
   });
 
   // 接收自定义消息
-  rtc.on('publish_message', data => {
+  rtc.on('publish_message', (data) => {
     // 连接中途下麦
     if (data.type === 'handsDown-load-student' && data.uid === vue.connectUid) {
       vue.callLoading = false;
@@ -404,10 +404,10 @@ export function stopLive() {
  */
 export function publishShareStream() {
   rtc.publishShareStream({
-    success: stream => {
+    success: (stream) => {
       console.log('推送桌面共享成功', stream);
     },
-    fail: str => {
+    fail: (str) => {
       console.log(str);
     }
   });