Merge pull request 'lyc-dev' (#128) from lyc-dev into main

Reviewed-on: #127

.env.production

@@ -19,7 +19,7 @@ VITE_APP_RES_FILE_PATH = 'https://prev.ysaix.com:7868/src/assets/textbook/booktx
 VITE_APP_BUILD_BASE_PATH = 'https://prev.ysaix.com:7868/'
 
 # websocket 地址
-VITE_APP_WS_URL = 'wss://file.ysaix.com:7868'
+VITE_APP_WS_URL = 'wss://prev.ysaix.com:7868'
 
 # 是否显示开发工具
 VITE_SHOW_DEV_TOOLS = 'true'

src/renderer/src/AixPPTist/src/App.vue

@@ -28,8 +28,9 @@ import msgUtils from '@/plugins/modal' // 消息工具
 import * as API_entpcoursefile from '@/api/education/entpcoursefile' // 相关api
 import { PPTApi } from './api'
 import { sessionStore } from '@/utils/store' // electron-store 状态管理
-import './api/watcher' // 监听
+// import './api/watcher' // 监听
-
+import watcher from './api/watcher' // 监听
+watcher() // 监听启动
 const loading = ref(true)
 const _isPC = isPC()
 

src/renderer/src/AixPPTist/src/api/classcourse.ts

@@ -8,12 +8,15 @@ import * as useStore from '../store' // pptist-状态管理
 import ChatWs from '@/plugins/socket' // 聊天socket
 import msgUtils from '@/plugins/modal' // 消息工具
 
+const slidesStore = useStore.useSlidesStore() // 幻灯片-状态管理
 const screenStore = useStore.useScreenStore() // 全屏-状态管理
 const classcourseStore = useStore.useClasscourseStore() // 课堂信息-状态管理
 const classcourse = sessionStore.get('curr.classcourse') // 课堂信息
 
 export class Classcourse {
   msgObj:ElMessageBox = null // 提示消息对象
+  classcourse:any = null // 课堂信息
+  id: number|string = null // 课堂id
 
   constructor() {
     this.load()
@@ -22,6 +25,7 @@ export class Classcourse {
    * @description 加载
    */
   load() {
+    console.log('classcourse-load', classcourse)
     // 打开全屏
     screenStore.setScreening(!!classcourse)
     // 如果课堂信息有值，则连接socket
@@ -29,14 +33,19 @@ export class Classcourse {
       // 连接socket
       if (!ChatWs.ws) ChatWs.init()
       ChatWs.id = classcourse.timgroupid // 群组id
-      console.log('ws- ', classcourse)
+      this.classcourse = classcourse // 课堂信息
+      this.id = classcourse.id // 课堂id
+      // 如果课堂信息有paging，则更新当前页码
+      const isPaging = !!classcourse.paging||classcourse.paging==0
+      if (isPaging) slidesStore.updateSlideIndex(classcourse.paging)
+      // 课堂信息-状态管理
       classcourseStore.setClasscourse(classcourse)
       // 待上课提示
       if (!classcourse.status) {
         this.msgObj = {
           type: 'success',
           title: '系统提示',
-          message: '公屏课堂已准备完毕，请等待老师开启课堂！',
+          message: '公屏课堂已准备完毕，等待老师开启课堂...',
           center: true,
           showClose: false,
           showCancelButton: false,

src/renderer/src/AixPPTist/src/api/index.ts

@@ -73,7 +73,6 @@ export class PPTApi {
         // 活动列表处理
         const workList = (res.rows || []).map(o => o.activityContent)
         const workItem = [...res.rows]
-        // 加入活动后刷新ppt数据内容，不跟换为第一页
         // slidesStore.updateSlideIndex(0) // 下标0 为第一页
         slidesStore.setSlides(slides) // 写入数据
         // 写入作业列表数据
@@ -110,11 +109,9 @@ export class PPTApi {
       const rid = await API_entpcoursefile.addEntpcoursefileReturnId(params)
       if (!!rid) {
         data.id = rid
-        params.id = rid
-        params.activityContent = null
-        slidesStore.addWorkItem(params)
         slidesStore.updateSlide(data)
         // msgUtils.msgSuccess('新增成功')
+        PPTApi.getSlideList(resource.id)
         this.isUpdate = false // 新增后会触发监听，不再更新数据
         resolve(true)
       } else msgUtils.msgError('新增失败');resolve(false)

src/renderer/src/AixPPTist/src/api/types.ts

@@ -106,6 +106,8 @@ export class MsgEnum {
     MSG_anmationclick : 'anmationclick',
     /** @desc: 群组创建成功 */
     MSG_classcourseopen : 'classcourseopen',
+    /** @desc: 学生提交作业 */
+    MSG_finishHomework : 'finishHomework',
     /** @desc: 学生的测练结果反馈 */
     MSG_classquizfeedback : 'classquizfeedback',
     /** @desc: 老师端：接收到学生反馈消息-课堂测练中的其他任务 */
@@ -120,6 +122,12 @@ export class MsgEnum {
     MSG_classWorkOfPresentDataUpdate : 'classWorkOfPresentDataUpdate',
     /** @desc: 课堂讲授活动，选择不同的内容 */
     MSG_classlecturePagesrc : 'classlecturePagesrc',
+    /** @desc: 课堂作业|活动 */
+    MSG_homework : 'HOMEWORK',
+    /** @desc: 点赞 */
+    MSG_dz : 'dz',
+    /** @desc: 疑惑 */
+    MSG_yh : 'yh',
     // === 新定义-消息头 ===
     /** @desc: 课程创建-待开课 */
     MSG_0000: 0x0000,

src/renderer/src/AixPPTist/src/api/watcher.ts

@@ -10,85 +10,106 @@ import { MsgEnum } from './types' // 消息枚举
 import ChatWs from '@/plugins/socket' // 聊天socket
 import Classcourse from './classcourse' // 课程相关
 import msgUtils from '@/plugins/modal' // 消息工具
-const slidesStore = store.useSlidesStore()
+import { Homework } from './index' // api-作业相关
-const classcourseStore = store.useClasscourseStore() // 课堂信息-状态管理
+import emitter from '@/utils/mitt' //mitt 事件总线
-const resource = sessionStore.get('curr.resource') // apt 资源
+
-const smarttalk = sessionStore.get('curr.smarttalk') // 备课资源
 /**
  * @description 监听器
  */
-// 监听幻灯片内容变化
+export default () => {
-watch(() => slidesStore.slides, (newVal, oldVal) => {
+  const slidesStore = store.useSlidesStore()
-  PPTApi.updateSlides(newVal, oldVal) // 更新幻灯片内容
+  const classcourseStore = store.useClasscourseStore() // 课堂信息-状态管理
-},{ deep: true })
+  const resource = sessionStore.get('curr.resource') // apt 资源
-
+  const smarttalk = sessionStore.get('curr.smarttalk') // 备课资源
-// 监听标题变化
+  
-watch(() => slidesStore.title, (newVal, oldVal) => {
+  // 监听幻灯片内容变化
-  if (oldVal == '未命名演示文稿') return // 初始加载，不需要更新数据
+  watch(() => slidesStore.slides, (newVal, oldVal) => {
-  updatePPT({title: newVal})
+    PPTApi.updateSlides(newVal, oldVal) // 更新幻灯片内容
-})
+  },{ deep: true })
-
+  
-// 消息监听ws
+  // 监听标题变化
-console.log('监听器已开启', ChatWs)
+  watch(() => slidesStore.title, (newVal, oldVal) => {
-if (ChatWs.ws) {
+    if (oldVal == '未命名演示文稿') return // 初始加载，不需要更新数据
-  ChatWs.watch((msg, e) => {
+    updatePPT({title: newVal})
-    try {
-      handleMessage(JSON.parse(msg))
-    } catch (error) {
-      console.error('socket 解析异常 ', error, e)
-      handleMessage(msg)
-    }
   })
-}
+  
-
+  // 消息监听ws
-// 更新ppt内容
+  // console.log('监听器已开启', ChatWs)
-const updatePPT = async (data) => {
+  if (!!ChatWs.ws) {
-  if (!resource) return
+    ChatWs.watch((data, e) => {
-  data.id = resource.id
+      try {
-  await PPTApi.updateSlide(data) // 更新ppt内容
+        handleMessage(JSON.parse(data)?.msg)
-  sessionStore.set('curr.resource.title', data.title)
+      } catch (error) {
-  // 更新smarttalk内容
+        console.error('socket 解析异常 ', error, e)
-  if (!!smarttalk && !!data.title) {
+        handleMessage(data)
-    const {id, fileFlag} = smarttalk
+      }
-    const params = { id, fileShowName: `${data.title}.${fileFlag}` }
+    })
-    await PPTApi.updateSmarttalk(params) // 更新ppt内容
-    sessionStore.set('curr.smarttalk.fileShowName', params.fileShowName)
   }
-}
+  
-
+  // 更新ppt内容
-// ws消息处理
+  const updatePPT = async (data) => {
-const handleMessage = (msg) => {
+    if (!resource) return
-  if (typeof msg === 'object'){
+    data.id = resource.id
-    const { head, content, ...other } = msg
+    await PPTApi.updateSlide(data) // 更新ppt内容
-    switch (head) {
+    sessionStore.set('curr.resource.title', data.title)
-      case MsgEnum.HEADS.MSG_open: // 开课
+    // 更新smarttalk内容
-        // 课堂信息不一致
+    if (!!smarttalk && !!data.title) {
-        if (Classcourse.id !== content.id) {
+      const {id, fileFlag} = smarttalk
-          msgUtils.alertError('老师开课信息异常，请重新进入公屏！')
+      const params = { id, fileShowName: `${data.title}.${fileFlag}` }
-          .then(() => { // 点击确定按钮，关闭窗口
+      await PPTApi.updateSmarttalk(params) // 更新ppt内容
-            window.close()
+      sessionStore.set('curr.smarttalk.fileShowName', params.fileShowName)
-          })
-        } else { // 正常更新数据
-          classcourseStore.classcourse.status = 'open'
-          // 更新课堂信息-关闭警告框
-          Classcourse?.msgObj?.onVanish()
-        }
-        break
-      case MsgEnum.HEADS.MSG_slideFlapping: // 幻灯片翻页
-        const slideIndex = content.current
-        slidesStore.updateSlideIndex(slideIndex) // 更新幻灯片下标
-        break
-      case MsgEnum.HEADS.MSG_closed: // 下课:
-        window.close() // 关闭窗口
-        break
-      default:
-        break
     }
   }
+  
+  // ws消息处理
+  const handleMessage = (msg) => {
+    console.log('ws消息处理', msg)
+    if (typeof msg === 'object'){
+      const { head, content, ...other } = msg
+      switch (head) {
+        case MsgEnum.HEADS.MSG_open: // 开课
+          // 课堂信息不一致
+          if (Classcourse.id !== content.id) {
+            msgUtils.alertError('老师开课信息异常，请重新进入公屏！')
+            .then(() => { // 点击确定按钮，关闭窗口
+              close()
+            })
+          } else { // 正常更新数据
+            classcourseStore.classcourse.status = 'open'
+            sessionStore.set('curr.classcourse.status', 'open')
+            // 更新课堂信息-关闭警告框
+            Classcourse?.msgObj?.onVanish()
+          }
+          break
+        case MsgEnum.HEADS.MSG_slideFlapping: // 幻灯片翻页
+          const slideIndex = content.current
+          slidesStore.updateSlideIndex(slideIndex) // 更新幻灯片下标
+          break
+        case MsgEnum.HEADS.MSG_homework: // 作业|活动-布置
+          if (!content.classWorkId) return
+          Homework.showHomework(content.classWorkId)
+          break
+        case MsgEnum.HEADS.MSG_closed: // 下课:
+          close()
+          break
+        case MsgEnum.HEADS.MSG_dz: // 点赞
+          emitter.emit('upvoteTrigger', 1)
+          break
+        case MsgEnum.HEADS.MSG_yh: // 疑惑
+          emitter.emit('upvoteTrigger', 2)
+          break
+        case MsgEnum.HEADS.MSG_0010: // 备用
+          break
+        default:
+          break
+      }
+    }
+  }
+  // 关闭窗口
+  const close = () => {
+    ChatWs?.close() // 关闭ws
+    setTimeout(() => {
+      window.close() // 关闭窗口
+    }, 1000)
+  }
 }
-// console.log('监听器已开启', Classcourse)
-// setTimeout(() => {
-//   console.log('关闭弹窗')
-//   // Classcourse.msgObj?.close()
-//   Classcourse?.msgObj?.onVanish()
-// }, 10 * 1000)

src/renderer/src/AixPPTist/src/hooks/useScreening.ts

@@ -1,5 +1,6 @@
 import { useScreenStore, useSlidesStore, useClasscourseStore } from '../store'
 import { enterFullscreen, exitFullscreen, isFullscreen } from '../utils/fullscreen'
+import ChatWs from '@/plugins/socket' // 聊天socket
 
 export default () => {
   const screenStore = useScreenStore()
@@ -23,7 +24,10 @@ export default () => {
     const classcourse = classcourseStore.classcourse
     if (!!classcourse) { //DOTO 有课堂，执行退相关操作
       console.log('退出放映状态')
-      window.close()
+      ChatWs?.close() // 关闭ws
+      setTimeout(() => {
+        window.close() // 关闭窗口
+      }, 1000)
     } else screenStore.setScreening(false)
     if (isFullscreen()) exitFullscreen()
   }

src/renderer/src/AixPPTist/src/utils/image.ts

@@ -72,4 +72,55 @@ export const isSVGString = (text: string): boolean => {
 export const svg2File = (svg: string): File => {
   const blob = new Blob([svg], { type: 'image/svg+xml' })
   return new File([blob], `${Date.now()}.svg`, { type: 'image/svg+xml' })
+}
+
+/**
+ * 获取当前的时间
+ * @returns 
+ */
+export const getTime=()=>{
+  const now = new Date();
+  const year = now.getFullYear();
+  const month = ('0' + (now.getMonth() + 1)).slice(-2);
+  const day = ('0' + now.getDate()).slice(-2);
+  const hours = ('0' + now.getHours()).slice(-2);
+  const minutes = ('0' + now.getMinutes()).slice(-2);
+  const seconds = ('0' + now.getSeconds()).slice(-2);
+  return `${year}-${month}-${day}_${hours}:${minutes}:${seconds}`;
+};
+
+/**
+* base64转图片File
+* @param {String} base64 图片base64
+* @param {String} fileName 图片名称| 默认 → myimg
+* @returns File 返回转换后的file数据类型
+*/
+export const base64ToFile = (base64: string, fileName = '试题图片') => {
+  // 将base64按照 , 进行分割 将前缀  与后续内容分隔开
+  let data = base64.split(','),
+  // 利用正则表达式 从前缀中获取图片的类型信息（image/png、image/jpeg、image/webp等）
+  type = data[0].match(/:(.*?);/)[1],
+  // 从图片的类型信息中 获取具体的文件格式后缀（png、jpeg、webp）
+  suffix = type.split('/')[1],
+  // 使用atob()对base64数据进行解码  结果是一个文件数据流 以字符串的格式输出
+  bstr = window.atob(data[1]),
+  // 获取解码结果字符串的长度
+  n = bstr.length,
+  // 根据解码结果字符串的长度创建一个等长的整形数字数组
+  // 但在创建时 所有元素初始值都为 0
+  u8arr = new Uint8Array(n)
+
+  // 将整形数组的每个元素填充为解码结果字符串对应位置字符的UTF-16 编码单元
+  while (n--) {
+      // charCodeAt()：获取给定索引处字符对应的 UTF-16 代码单元
+      u8arr[n] = bstr.charCodeAt(n)
+  }
+  const filename = fileName+getTime()
+  // 利用构造函数创建File文件对象
+  // new File(bits, name, options)
+  const file = new File([u8arr], `${filename}.${suffix}`, {
+      type: type
+  })
+  // 返回file
+  return file
 }

src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue

@@ -19,7 +19,8 @@
 import { ref, reactive, onMounted, computed } from 'vue';
 import { sessionStore } from '@/utils/store'
 import { getSmarttalkPage } from '@/api/file'
-import { getFileSuffix, urlToBase64 } from '@/utils/ruoyi.js'
+import * as commUtils from '@/utils/comm.js'
+import { getFileSuffix } from '@/utils/ruoyi.js'
 
 const emit = defineEmits(['insertMaterial', 'close'])
 
@@ -62,12 +63,15 @@ const fileUrl = computed(() => (item) =>{
 
 // 插入
 const onInsert = async (item) =>{
+  const res = await fetch(item.fileFullPath)
+  const bolb = await res.blob()
+  const file = commUtils.blobToFile(bolb, item.fileShowName)
+
   if(videoSuffix.indexOf(getFileSuffix(item.fileShowName)) != -1){
-    emit('insertMaterial',{ type: 'video', data: item.fileFullPath })
+    emit('insertMaterial',{ type: 'video', file })
   }
   else{
-    const base64 = await urlToBase64(item.fileFullPath)
+    emit('insertMaterial',{ type: 'img',  file })
-    emit('insertMaterial',{ type: 'img', data: base64 })
   }
 }
 

src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue

@@ -132,7 +132,7 @@
     <Modal
     v-model:visible="imgVisible" 
     :width="1300">
-      <TextCreateImg hasPPt @insertImg="(url: string) => { createImageElement(url); imgVisible = false }" />
+      <TextCreateImg hasPPt @insertImg="insertImg" />
     </Modal>
   </div>
 </template>
@@ -141,7 +141,7 @@
 import { ref } from 'vue'
 import { storeToRefs } from 'pinia'
 import { useMainStore, useSnapshotStore } from '../../../store'
-import { getImageDataURL } from '../../../utils/image'
+import { getImageDataURL, base64ToFile } from '../../../utils/image'
 import type { ShapePoolItem } from '../../../configs/shapes'
 import type { LinePoolItem } from '../../../configs/lines'
 import useScaleCanvas from '../../../hooks/useScaleCanvas'
@@ -165,6 +165,7 @@ import { PPTApi } from '../../../api'
 import TextCreateImg from '@/components/ai-kolors/index.vue'
 import { toPng } from 'html-to-image' // 引入html-to-image库
 
+
 const mainStore = useMainStore()
 const { creatingElement, creatingCustomShape, showSelectPanel, showSearchPanel, showNotesPanel } = storeToRefs(mainStore)
 const { canUndo, canRedo } = storeToRefs(useSnapshotStore())
@@ -208,57 +209,9 @@ const insertImageElement = (files: FileList) => {
   // })
 }
 
-//获取当前的时间
-const getTime=()=>{
-  const now = new Date();
-  const year = now.getFullYear();
-  const month = ('0' + (now.getMonth() + 1)).slice(-2);
-  const day = ('0' + now.getDate()).slice(-2);
-  const hours = ('0' + now.getHours()).slice(-2);
-  const minutes = ('0' + now.getMinutes()).slice(-2);
-  const seconds = ('0' + now.getSeconds()).slice(-2);
-  return `${year}-${month}-${day}_${hours}:${minutes}:${seconds}`;
-};
-
-/**
-* base64转图片File
-* @param {String} base64 图片base64
-* @param {String} fileName 图片名称| 默认 → myimg
-* @returns File 返回转换后的file数据类型
-*/
-const base64ToFile = (base64: string, fileName = '试题图片') => {
-    // 将base64按照 , 进行分割 将前缀  与后续内容分隔开
-    let data = base64.split(','),
-    // 利用正则表达式 从前缀中获取图片的类型信息（image/png、image/jpeg、image/webp等）
-    type = data[0].match(/:(.*?);/)[1],
-    // 从图片的类型信息中 获取具体的文件格式后缀（png、jpeg、webp）
-    suffix = type.split('/')[1],
-    // 使用atob()对base64数据进行解码  结果是一个文件数据流 以字符串的格式输出
-    bstr = window.atob(data[1]),
-    // 获取解码结果字符串的长度
-    n = bstr.length,
-    // 根据解码结果字符串的长度创建一个等长的整形数字数组
-    // 但在创建时 所有元素初始值都为 0
-    u8arr = new Uint8Array(n)
-
-    // 将整形数组的每个元素填充为解码结果字符串对应位置字符的UTF-16 编码单元
-    while (n--) {
-        // charCodeAt()：获取给定索引处字符对应的 UTF-16 代码单元
-        u8arr[n] = bstr.charCodeAt(n)
-    }
-    const filename = fileName+getTime()
-    // 利用构造函数创建File文件对象
-    // new File(bits, name, options)
-    const file = new File([u8arr], `${filename}.${suffix}`, {
-        type: type
-    })
-    // 返回file
-    return file
-}
-
-
 const onhtml2canvas = async (html: HTMLElement) => {
   const base64Dta = await toPng(html);
+  // base64转图片File
   const toFile = base64ToFile(base64Dta) 
   // 上传图片转为线上地址
   PPTApi.toRousrceUrl(toFile).then(data=>{
@@ -328,21 +281,31 @@ const toggleNotesPanel = () => {
 // 插入素材
 interface MaterialParams {
   type: string,
-  data: string
+  file: any
 }
 const insertMaterial = (item: MaterialParams) =>{
-  const { type, data } = item
+  const { type, file } = item
-  if(type == 'video'){
+  PPTApi.toRousrceUrl(file).then(data=>{
-    createVideoElement(data)
+    if(type == 'video'){
-  }
+      createVideoElement(data)
-  else{
+    }
-    createImageElement(data)
+    else{
-  }
+      createImageElement(data)
-  materiaVisible.value = false
+    }
+    materiaVisible.value = false
+  })
+  
 }
 
 // 文生图
 const imgVisible = ref(false)
+const insertImg = async (file: any) =>{
+  PPTApi.toRousrceUrl(file).then(data=>{
+    createImageElement(data)
+    imgVisible.value = false
+  })
+}
+
 </script>
 
 <style lang="scss" scoped>

src/renderer/src/AixPPTist/src/views/Editor/Toolbar/ElementStylePanel/Active/index.vue

@@ -305,10 +305,10 @@ const upDateData = async () => {
     // await PPTApi.updateSlide(paramData.value)
     loadingActive.value = true
     await updateEntpcoursefileNew(paramData.value)
-    const res = await homeworklist({ ids: paramData.value.activityContent, pageSize: 100 })
-    await formatClassWorkFile(res.rows)
     const resource = sessionStore.get('curr.resource')
     await PPTApi.getSlideList(resource.id)
+    const res = await homeworklist({ ids: paramData.value.activityContent, pageSize: 100 })
+    await formatClassWorkFile(res.rows)
 }
 // 判断是否做操作
 const objectsAreEqual = (obj1: Record<string, any>, obj2: Record<string, any>) => {

src/renderer/src/components/ai-kolors/index.vue

@@ -482,10 +482,7 @@ export default {
 
     //保存图片到素材库
     async saveImage(resultIndex, index, url, resultItem) {
-      if(this.hasPPt){
+
-        this.$emit('insertImg', url)
-        return
-      }
       this.buttonStates[resultIndex][index].disabled = true;
       this.buttonStates[resultIndex][index].text = "正在保存...";
       const numberIndex = url.indexOf('filename=');
@@ -494,6 +491,7 @@ export default {
       const finalPath = path.substring(0, pngIndex + 4);
       try {
         const blob = await this.getImageBlob(`https://ai.ysaix.com:7853/view?filename=${finalPath}&type=temp`);
+          
 
         const hash = CryptoJS.MD5(blob).toString();
 
@@ -502,7 +500,10 @@ export default {
         let file = new File([blob], `${resultItem}.png`, {
           type: 'image/png'
         })
-
+        if(this.hasPPt){
+          this.$emit('insertImg', file)
+          return
+        }
         // 添加参数
         formData.append('md5', hash);
         formData.append('file', file);

src/renderer/src/layout/components/Header.vue

@@ -44,7 +44,6 @@ const breadList = ref([])
 watch(
   () => router.currentRoute.value,
   (newValue) => {
-    console.log(newValue)
     const { showBread }  = newValue.meta
     if (showBread) {
       isShowBack.value = true

src/renderer/src/plugins/imChat/msgEnum.js

@@ -80,10 +80,10 @@ export class MsgEnum {
     MSG_anmationclick : 'anmationclick',
     /** @desc: 群组创建成功 */
     MSG_classcourseopen : 'classcourseopen',
-    /** @desc: 学生的测练结果反馈 */
-    MSG_classquizfeedback : 'classquizfeedback',
     /** @desc: 学生提交作业 */
     MSG_finishHomework : 'finishHomework',
+    /** @desc: 学生的测练结果反馈 */
+    MSG_classquizfeedback : 'classquizfeedback',
     /** @desc: 老师端：接收到学生反馈消息-课堂测练中的其他任务 */
     MSG_classtaskfeedback : 'classtaskfeedback',
     /** @desc: 老师端：学生反馈的消息，具体要看其中的feedbackkey，类别较繁杂 */
@@ -96,6 +96,12 @@ export class MsgEnum {
     MSG_classWorkOfPresentDataUpdate : 'classWorkOfPresentDataUpdate',
     /** @desc: 课堂讲授活动，选择不同的内容 */
     MSG_classlecturePagesrc : 'classlecturePagesrc',
+    /** @desc: 课堂作业|活动 */
+    MSG_homework : 'HOMEWORK',
+    /** @desc: 点赞 */
+    MSG_dz : 'dz',
+    /** @desc: 疑惑 */
+    MSG_yh : 'yh',
     // === 新定义-消息头 ===
     /** @desc: 课程创建-待开课 */
     MSG_0000: 0x0000,
@@ -140,4 +146,4 @@ export class MsgEnum {
   }
 }
 
-export { MsgEnum as default }
+export default MsgEnum;

src/renderer/src/plugins/socket/index.js

@@ -28,6 +28,7 @@ export class ChatWs {
         const userStore = useUserStore() // 用户信息
         const wsBase = import.meta.env.VITE_APP_WS_URL; // ws地址
         this.url = `${wsBase||ChatWs.base}/ws/websocket/${userStore.id}`;
+        this.closed = false; // 关闭状态 防止重连失败
         // this.init(url);
       }
       ChatWs.instance = this;
@@ -38,6 +39,7 @@ export class ChatWs {
   // 初始化
   init(url) {
     !!url && (this.url = url);
+    this.closed = false; // 关闭状态 防止重连失败
     this.ws = null;
     const _this = this
     this.heartCheck = {
@@ -64,43 +66,46 @@ export class ChatWs {
         }, this.timeout);
       },
     };
-    this.reconnect();
+    return this.reconnect();
   }
   // 重连
   reconnect() {
-    const self = this;
+    return new Promise((resolve, reject) => {
-    if (!!this.ws) { // 关闭之前的链接
+      const self = this;
-      this.ws.close()
+      if (!!this.ws) { // 关闭之前的链接
-      this.ws = null
+        this.ws.close()
-    }
+        this.ws = null
-    this.ws = new WebSocket(this.url);
+      }
-    this.ws.onopen = function () {
+      this.ws = new WebSocket(this.url);
-      console.log("websocket-连接成功")
+      this.ws.onopen = function () {
-      self.heartCheck.reset().start();
+        console.log("websocket-连接成功")
-    };
+        self.heartCheck.reset().start();
-    this.ws.onmessage = function (e) {
+        resolve()
-      // console.log("websocket-收到消息", e)
+      };
-      // 拿到任何消息都说明当前连接是正常的
+      this.ws.onmessage = function (e) {
-      const isBeat = e.data == 'pong'
+        // console.log("websocket-收到消息", e)
-      isBeat && self.heartCheck.reset().start();
+        // 拿到任何消息都说明当前连接是正常的
-      const isEmpty = !e.data
+        const isBeat = e.data == 'pong'
-      const isExts = e.data.includes('sessionId') || e.data == ('pong')
+        isBeat && self.heartCheck.reset().start();
-      if (isEmpty || isExts) return;
+        const isEmpty = !e.data
-      // 自定义处理
+        const isExts = e.data.includes('sessionId') || e.data == ('pong')
-      self.onmessage && self.onmessage(e.data, e);
+        if (isEmpty || isExts) return;
-    };
+        // 自定义处理
-    this.ws.onerror = function (e) {
+        self.onmessage && self.onmessage(e.data, e);
-      console.log("websocket-连接异常", e)
+      };
-      self.connectSocket() // 重连
+      this.ws.onerror = function (e) {
-    };
+        console.log("websocket-连接异常", e)
-    this.ws.onclose = function (e) {
+        self.connectSocket() // 重连
-      console.log("websocket-连接断开", e)
+      };
-      self.connectSocket() // 重连
+      this.ws.onclose = function (e) {
-    };
+        console.log("websocket-连接断开", e)
+        self.connectSocket() // 重连
+      };
+    })
   }
   connectSocket() {
     this.heartCheck.reset() // 重置心跳
-    if (self.closed) return; // 关闭状态不重连
+    if (this.closed) return this.ws = null; // 关闭状态不重连
     // if(self.errCount <= 0) return; // 超过重连次数
     // self.errCount--; // 重连次数减1
     if (this.errTime) {
@@ -157,6 +162,16 @@ export class ChatWs {
     this.closed = true;
     this.ws.close();
   }
+  // 下课
+  closedCourse(id) {
+    return new Promise((resolve, reject) => {
+      this.sendMsg('closed', '下课', null, 'group', id)
+      resolve()
+      // setTimeout(() => {
+      //   this.close() // 关闭链接
+      // }, 1000);
+    })
+  }
   // 延时 ms 毫秒
   sleep(ms){
     return new Promise(resolve => setTimeout(resolve, ms))

src/renderer/src/views/classManage/reserv-item-apt.vue

@@ -15,8 +15,7 @@
       </template>
       <template v-else-if="item.status === 'open'">
         <el-button :disabled="toolStore.isToolWin" size="small" type="primary" @click="startClassR(item)"
-        >继续上课</el-button
+        >继续上课</el-button>
-        >
         <!--<el-button v-if="item.status === '未开始'" @click="openEdit">编辑</el-button>-->
         <el-button :loading="loading" size="small" type="info" @click="endClassR(item)"
         >下课{{ loading?'中...':'' }}</el-button>

src/renderer/src/views/classTask/teachClassTask.vue

@@ -714,6 +714,7 @@ const closeDialog = () => {
 
 // im监听消息回调
 const msgHandle = (msg) => {
+  console.log('socket消息回调', msg)
   if (typeof msg === 'object'){
     const { head, content, ...other } = msg
     switch(head) {

src/renderer/src/views/prepare/container/class-start.vue

@@ -146,6 +146,7 @@ const open = async (id, classObj) => {
     await getAptInfo(id)
     // 获取班级列表
     getClassList()
+    console.log('classObj', classObj)
     // 继续上课
     if (!!classObj) {
       dt.ctCourse = classObj
@@ -304,11 +305,11 @@ const classTeachingStart = async () => {
   const { classcourseid:id } = teacherForm.form
   if (id) { // 开始上课
     // 新版-pptList 打开公屏
-    if (myClassActive.value.filetype == 'aptist') {
+    if (myClassActive.value.filetype == 'aippt') {
       const msgEl = ElMessage.warning({message:'正在打开公屏，请稍后...',duration: 0})
       setTimeout(async () => {
         msgEl.close()
-        const res = await Http_Classcourse.getClasscourse(teacherForm.form.classcourseid)
+        const res = await Http_Classcourse.getClasscourse(id)
         openPublicScreen(res.data)
       }, 2000);
     }else {
@@ -316,6 +317,8 @@ const classTeachingStart = async () => {
       toLinkWeb(url)        // 跳转web-公屏
       visible.value = false // 关闭弹窗
     }
+  } else {
+    ElMessage.warning('请先创建课程')
   }
 }
 // 获取二维码地址
@@ -354,9 +357,11 @@ const getQrUrl = async() => {
 // 打开公屏
 const openPublicScreen = (classcourse) => {
   console.log('打开公屏', classcourse)
-  // 发送app端待开课消息
+  if (!dt.ctCourse) { // 新开课需要发送消息-继续上课不需要直接打开
-  const data = { id: classcourse.id }
+    // 发送app端待开课消息
-  ChatWs.sendMsg(MsgEnum.HEADS.MSG_0000, data, {}, ChatWs.TYPES.single, userStore.id)
+    const data = { id: classcourse.id }
+    ChatWs.sendMsg(MsgEnum.HEADS.MSG_0000, data, {}, ChatWs.TYPES.single, userStore.id)
+  }
   // 缓存当前资源信息
   const resource = toRaw(myClassActive.value)
   sessionStore.set('curr.resource', resource) // 缓存当前资源信息

src/renderer/src/views/prepare/container/kj-list-item.vue

@@ -196,7 +196,7 @@ export default {
       }
     },*/
     clickStartClass(item) {
-      const isApt = item.fileFlag === 'apt'
+      const isApt = ['apt','aippt'].includes(item.fileFlag)
       this.getOpenCourse(isApt).then(res => {
         console.log(res)
         if(!res){

src/renderer/src/views/prepare/index.vue

@@ -380,7 +380,7 @@ export default {
         }
         case 'close': { // 关闭上课
           const head = MsgEnum.HEADS.MSG_closed // closed
-          const msgT = MsgEnum.TYPES.TEACHER    // teacher
+          // const msgT = MsgEnum.TYPES.TEACHER    // teacher
           const isApt = !row.bookImg // bookImg ppt 否则Apt
           row.ex3 == 'undefined' && (row.ex3 = null)
           const timgroupid = isApt ? row.timgroupid : row.ex3 // ex3 ppt 否则Apt
@@ -392,12 +392,13 @@ export default {
           }
           // 发送-下课消息
           if (!!timgroupid) {
-            const msg = { msgKey: head, actor: msgT, classcourseid: row.id }
+            // const msg = { msgKey: head, actor: msgT, classcourseid: row.id }
-            Chat.sendMsg(timgroupid, msg)
+            // Chat.sendMsg(timgroupid, msg)
+            await ChatWs.closedCourse(timgroupid)
           }
           if (isApt) { // Apt
             // 接口-修改状态
-            await updateClasscourse({ id: row.id, status: head, timgroupid: '' })
+            await updateClasscourse({ id: row.id, status: head })
           } else {  // PPT
             const toolStore = useToolState()
             // 窗口已打开，直接关闭
@@ -410,12 +411,12 @@ export default {
           }
           // 解散群
           setTimeout(async() => {
-            if (!!timgroupid) await Chat.dismissGroup(timgroupid)
+            // if (!!timgroupid) await Chat.dismissGroup(timgroupid)
             if (other.type == 1) { // 弹窗-下课
               other.instance.confirmButtonLoading = false
               other.instance.confirmButtonText = '下课'
               other.done()
-            } else {
+            } else { // 列表-下课
               other.loading.value = false
               row.status = isApt ? head : '已结束'
             }   

src/renderer/src/views/teachingDesign/container/right.vue

@@ -96,7 +96,6 @@ const pgDialog = reactive({ // 弹窗-进度条
   }
 })
 emitter.on('changeMode', (item) => {
-  console.log(item, 'item')
   resultList.value = item.child
   // conversation()
   getTempResult(item.id)
@@ -106,7 +105,6 @@ emitter.on('changeMode', (item) => {
 // 查询模板结果
 const getTempResult = (id) => {
   tempResult({ mainModelId: id }).then(res => {
-    console.log(res, 2000)
     let rows = res.rows
     if (rows.length > 0) {
       resultList.value.forEach(item => {
@@ -357,7 +355,6 @@ const toRousrceUrl = async(o) => {
 const curNode = reactive({})
 onMounted(() => {
   let data = sessionStore.get('subject.curNode')
-  console.log('data', sessionStore)
   Object.assign(curNode, data);
   courseObj.node = data