Merge pull request 'zdg_dev' (#108) from zdg_dev into main

Reviewed-on: #108

.env.development

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

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

@@ -28,7 +28,6 @@ import * as API_entpcoursefile from '@/api/education/entpcoursefile' // 相关ap
 import { PPTApi } from './api'
 import { sessionStore } from '@/utils/store' // electron-store 状态管理
 import './api/watcher' // 监听
-import './api/classcourse' // 课程相关
 
 const loading = ref(true)
 const _isPC = isPC()

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

@@ -2,21 +2,51 @@
  * @author zdg
  * @description 上课相关内容
  */
-import type { Classcourse } from './types'
+// import type { Classcourse } from './types'
 import { sessionStore } from '@/utils/store' // electron-store 状态管理
 import * as useStore from '../store' // pptist-状态管理
-import { ChatWs } from '@/plugins/socket' // 聊天socket
+import ChatWs from '@/plugins/socket' // 聊天socket
+import msgUtils from '@/plugins/modal' // 消息工具
+
 const screenStore = useStore.useScreenStore() // 全屏-状态管理
 const classcourseStore = useStore.useClasscourseStore() // 课堂信息-状态管理
-const classcourse: Classcourse = sessionStore.get('curr.classcourse') // 课堂信息
+const classcourse = sessionStore.get('curr.classcourse') // 课堂信息
 
-// 如果课堂信息有值，则连接socket
+export class Classcourse {
-if (!!classcourse) {
+  msgObj:ElMessageBox = null // 提示消息对象
+
+  constructor() {
+    this.load()
+  }
+  /**
+   * @description 加载
+   */
+  load() {
+    // 打开全屏
+    screenStore.setScreening(!!classcourse)
+    // 如果课堂信息有值，则连接socket
+    if (!!classcourse) {
       // 连接socket
-  const ws = new ChatWs()
+      if (!ChatWs.ws) ChatWs.init()
-  console.log('ws- ',ws)
+      ChatWs.id = classcourse.timgroupid // 群组id
-  // ChatWs.connect(classcourse.id)
+      console.log('ws- ', classcourse)
       classcourseStore.setClasscourse(classcourse)
+      // 待上课提示
+      if (!classcourse.status) {
+        this.msgObj = {
+          type: 'success',
+          title: '系统提示',
+          message: '公屏课堂已准备完毕，请等待老师开启课堂！',
+          center: true,
+          showClose: false,
+          showCancelButton: false,
+          showConfirmButton: false,
+          beforeClose: () => {}
+        }
+        msgUtils.ElMessageBox(this.msgObj)
+      }
+    }
+  }
 }
-// 打开全屏
+
-screenStore.setScreening(!!classcourse)
+export default new Classcourse()

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

@@ -3,22 +3,22 @@
  * @author zdg
  * @date 2024-11-26
  */
-import { toRaw } from 'vue'
+import { toRaw, nextTick } from 'vue'
 import type { Result } from './types' // 接口类型
 import msgUtils from '@/plugins/modal' // 消息工具
 import * as API_entpcoursefile from '@/api/education/entpcoursefile' // 相关api
 import * as API_smarttalk from '@/api/file' // 相关api
+import * as Api_server from '@/api/apiService' // 相关api
+import * as CreateHomework from '@/views/tool/createHomework' // 统计相关
 import * as useStore from '../store' // pptist-状态管理
 import { sessionStore } from '@/utils/store' // electron-store 状态管理
 import useUserStore from '@/store/modules/user' // 外部-用户信息
-import * as Api_server from '@/api/apiService' // 相关api
+import { toPng, toJpeg } from 'html-to-image' // 引入html-to-image库
-import * as commUtils from '@/utils/comm.js'
+// import * as commUtils from '@/utils/comm.js'
+import { createWindow } from '@/utils/tool'
+import { useToolState } from '@/store/modules/tool'
 const slidesStore = useStore.useSlidesStore()
 const userStore = useUserStore()
-
-import { getClassWorkList,getStudentClassWorkData } from '@/views/tool/createHomework'
-import {createWindow} from '@/utils/tool'
-import { useToolState } from '@/store/modules/tool'
 const toolStore = useToolState()
 /** 工具类 */
 export class Utils {
@@ -147,6 +147,8 @@ export class PPTApi {
   // 更新幻灯片
   static updateSlide(data: object): Promise<Boolean> {
     return new Promise(async (resolve, reject) => {
+      const thumUrl = await this.getSlideThumUrl()
+      data.base64Code = thumUrl // 更新缩略图
       const res: Result = await API_entpcoursefile.updateEntpcoursefileNew(data)
       console.log(data,'data');
       console.log(res,'dresata');
@@ -191,30 +193,40 @@ export class PPTApi {
       else msgUtils.msgError(res.msg || '更新失败');return false
     })
   }
+  // thumbnail-slide thumbnail
+  static getSlideThumUrl(): Promise<Boolean> {
+    return nextTick().then(async() => {
+      const slideIndex = slidesStore.slideIndex
+      const elements = document.querySelectorAll('.thumbnail-slide')
+      if (elements.length && slideIndex >= 0) {
+        const element = elements[slideIndex]
+        return await toPng(element)
+      }
+      return null
+    })
+  }
 
   // 图片|音频|视频 转换为在线地址
-  static  toRousrceUrl =async (o:any) => {
+  static  toRousrceUrl =async (file: File|any) => {
     const formData = new FormData()
-      formData.append('file', o)
+    formData.append('file', file)
     const res = await Api_server.Other.uploadFile(formData)
     if (res && res.code == 200){
       const url = res?.url
       url &&(o.src = url)
       return url
     }
-   
+  }
-}
 }
 
 export class Homework{
   // 作业弹窗
   static async showHomework(id: any) {
-    let result = await getClassWorkList(id)
+    let result = await CreateHomework.getClassWorkList(id)
-      result = await getStudentClassWorkData()
+      result = await CreateHomework.getStudentClassWorkData()
-      localStorage.setItem('teachClassWorkItem', JSON.stringify(result[0]));
+      localStorage.setItem('teachClassWorkItem', JSON.stringify(result[0]));
-      toolStore.isTaskWin=true; // 设置打开批改窗口
+      toolStore.isTaskWin=true; // 设置打开批改窗口
-    //   emit('closeActive')
+      createWindow('open-taskwin',{url:'/teachClassTask'}); 
-      createWindow('open-taskwin',{url:'/teachClassTask'}); 
   }
 }
 export default PPTApi

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

@@ -19,6 +19,147 @@ export interface Classcourse {
   entpcoursefileid?: number|string, // 课程文件id
   classid?: number|string, // 班级id
   entpcourseid?: number|string, // 章节中间表id
+  timgroupid?: number|string, // ws 群组id
   plandate?: string, // 计划时间
   opendate?: string, // 开课时间
 }
+
+/**
+ * @description 消息枚举
+ * @author zdg
+ * @date 2021-07-05 14:07:01
+ */
+
+export class MsgEnum {
+  /**
+   * @description: 消息类型
+   * 
+   *  |  名称   | 含义   | 值（enum）    |
+   *  |  ----  | ----  | ----  |
+   *  | SYSTEM | 系统消息 | system |
+   *  | TEACHER | 老师消息 | teacher |
+   *  | STUDENT | 学生消息 | student |
+   *  | NOTICE  | 通知消息 | notice  |
+   */
+  static TYPES = {
+    /** @desc: 系统消息 */
+    SYSTEM: 'system',
+    /** @desc: 老师消息 */
+    TEACHER: 'teacher',
+    /** @desc: 学生消息 */
+    STUDENT: 'student',
+    /** @desc: 通知消息 */
+    NOTICE: 'notice'
+  }
+    /**
+   * @description: 消息头-类型
+   * 
+   *  |  名称   | 含义   | 值（enum）    |
+   *  |  ----  | ----  | ----  |
+   *  | --- | 以下为旧定义-消息头 | --- |
+   *  | MSG_closed | 结束课程(下课) | closed |
+   *  | MSG_onlineStatus | 在线状态 | onlineStatus |
+   *  | MSG_pushQuizOfClassWorkdata2Public | 老师端：把选中的学生习题作业，推到大屏 | pushQuizOfClassWorkdata2Public |
+   *  | MSG_pushClassWorkdata2Public | 老师端：把选中的学生作业，推到大屏 | pushClassWorkdata2Public |
+   *  | MSG_shareStudentPresentdata2All | 把某个学生的展示成果数据推给全班所有学生 | shareStudentPresentdata2All |
+   *  | MSG_pushStudentPresentdata2Public | 老师端：课堂展示活动，把选中的学生展示数据，推到大屏 | pushStudentPresentdata2Public |
+   *  | MSG_pushClassWorkPresentList2Public | 老师端：课堂展示活动，任务列表，推到大屏 | pushClassWorkPresentList2Public |
+   *  | MSG_activePageType | 课标研读-分页切换 | activePageType |
+   *  | MSG_slideFlapping | 幻灯片-切换 | slideFlapping |
+   *  | MSG_anmationclick | 幻灯片-动画切换 | anmationclick |
+   *  | MSG_classcourseopen | 群组创建成功 | classcourseopen |
+   *  | MSG_classquizfeedback | 学生的测练结果反馈 | classquizfeedback |
+   *  | MSG_classtaskfeedback | 老师端：接收到学生反馈消息-课堂测练中的其他任务 | classtaskfeedback |
+   *  | MSG_studentfeedback | 老师端：学生反馈的消息，具体要看其中的feedbackkey，类别较繁杂 | studentfeedback |
+   *  | MSG_studentfeedbackcancel | 老师端：学生反馈的消息取消，如取消学会了，取消困惑 | studentfeedbackcancel |
+   *  | MSG_classshowdata | 学生提交的课堂展示数据-要在老师端显示，再由老师选择推送到公屏上 | classshowdata |
+   *  | MSG_classWorkOfPresentDataUpdate | 学生在公屏上展示并完善后，保存后，老师端要更新 | classWorkOfPresentDataUpdate |
+   *  | MSG_classlecturePagesrc | 课堂讲授活动，选择不同的内容 | classlecturePagesrc |
+   *  | --- | 以下为新定义-消息头 | --- |
+   *  | MSG_0001 | 点赞 | 0x0001 |
+   *  | MSG_0002 | xx | 0x0002 |
+   *  | MSG_0003 | xx | 0x0003 |
+   */
+  static HEADS = {
+    // === 旧定义-消息头(兼容以前) ===
+    /** @desc: 开课 */
+    MSG_open : 'open',
+    /** @desc: 结束课程(下课) */
+    MSG_closed : 'closed',
+    /** @desc: 在线状态 */
+    MSG_onlineStatus : 'onlineStatus',
+    /** @desc: 老师端：把选中的学生习题作业，推到大屏 */
+    MSG_pushQuizOfClassWorkdata2Public : 'pushQuizOfClassWorkdata2Public',
+    /** @desc: 老师端：把选中的学生作业，推到大屏 */
+    MSG_pushClassWorkdata2Public : 'pushClassWorkdata2Public',
+    /** @desc: 把某个学生的展示成果数据推给全班所有学生 */
+    MSG_shareStudentPresentdata2All : 'shareStudentPresentdata2All',
+    /** @desc: 老师端：课堂展示活动，把选中的学生展示数据，推到大屏 */
+    MSG_pushStudentPresentdata2Public : 'pushStudentPresentdata2Public',
+    /** @desc: 老师端：课堂展示活动，任务列表，推到大屏 */
+    MSG_pushClassWorkPresentList2Public : 'pushClassWorkPresentList2Public',
+    /** @desc: 课标研读-分页切换 */
+    MSG_activePageType : 'activePageType',
+    /** @desc: 幻灯片-切换 */
+    MSG_slideFlapping : 'slideFlapping',
+    /** @desc: 幻灯片-动画切换 */
+    MSG_anmationclick : 'anmationclick',
+    /** @desc: 群组创建成功 */
+    MSG_classcourseopen : 'classcourseopen',
+    /** @desc: 学生的测练结果反馈 */
+    MSG_classquizfeedback : 'classquizfeedback',
+    /** @desc: 老师端：接收到学生反馈消息-课堂测练中的其他任务 */
+    MSG_classtaskfeedback : 'classtaskfeedback',
+    /** @desc: 老师端：学生反馈的消息，具体要看其中的feedbackkey，类别较繁杂 */
+    MSG_studentfeedback : 'studentfeedback',
+    /** @desc: 老师端：学生反馈的消息取消，如取消学会了，取消困惑 */
+    MSG_studentfeedbackcancel : 'studentfeedbackcancel',
+    /** @desc: 学生提交的课堂展示数据-要在老师端显示，再由老师选择推送到公屏上 */
+    MSG_classshowdata : 'classshowdata',
+    /** @desc: 学生在公屏上展示并完善后，保存后，老师端要更新 */
+    MSG_classWorkOfPresentDataUpdate : 'classWorkOfPresentDataUpdate',
+    /** @desc: 课堂讲授活动，选择不同的内容 */
+    MSG_classlecturePagesrc : 'classlecturePagesrc',
+    // === 新定义-消息头 ===
+    /** @desc: 课程创建-待开课 */
+    MSG_0000: 0x0000,
+    /** @desc: 点赞 */
+    MSG_0001: 0x0001,
+    /** @desc: 疑惑 */
+    MSG_0002: 0x0002,
+    MSG_0003: 0x0003,
+    MSG_0004: 0x0004,
+    MSG_0005: 0x0005,
+    MSG_0006: 0x0006,
+    MSG_0007: 0x0007,
+    MSG_0008: 0x0008,
+    MSG_0009: 0x0009,
+    MSG_0010: 0x000a,
+    MSG_0011: 0x000b,
+    MSG_0012: 0x000c,
+    MSG_0013: 0x000d,
+    MSG_0014: 0x000e,
+    MSG_0015: 0x000f,
+    /** @desc: 作业推送 */
+    MSG_0016: 0x0010,
+    MSG_0017: 0x0011,
+    MSG_0018: 0x0012,
+    MSG_0019: 0x0013,
+    MSG_0020: 0x0014,
+    MSG_0021: 0x0015,
+    MSG_0022: 0x0016,
+    MSG_0023: 0x0017,
+    MSG_0024: 0x0018,
+    MSG_0025: 0x0019,
+    MSG_0026: 0x001a,
+    MSG_0027: 0x001b,
+    MSG_0028: 0x001c,
+    MSG_0029: 0x001d,
+    MSG_0030: 0x001e,
+    MSG_0031: 0x001f,
+    MSG_0032: 0x0020,
+    MSG_0033: 0x0021,
+    MSG_0034: 0x0022,
+    MSG_0035: 0x0023,
+  }
+}

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

@@ -6,13 +6,17 @@ import { watch } from 'vue'
 import { PPTApi } from './index'
 import * as store from '../store'
 import { sessionStore } from '@/utils/store' // electron-store 状态管理
+import { MsgEnum } from './types' // 消息枚举
+import ChatWs from '@/plugins/socket' // 聊天socket
+import Classcourse from './classcourse' // 课程相关
+import msgUtils from '@/plugins/modal' // 消息工具
 const slidesStore = store.useSlidesStore()
+const classcourseStore = store.useClasscourseStore() // 课堂信息-状态管理
 const resource = sessionStore.get('curr.resource') // apt 资源
 const smarttalk = sessionStore.get('curr.smarttalk') // 备课资源
 /**
  * @description 监听器
  */
-
 // 监听幻灯片内容变化
 watch(() => slidesStore.slides, (newVal, oldVal) => {
   PPTApi.updateSlides(newVal, oldVal) // 更新幻灯片内容
@@ -24,6 +28,20 @@ watch(() => slidesStore.title, (newVal, oldVal) => {
   updatePPT({title: newVal})
 })
 
+// 消息监听ws
+console.log('监听器已开启', ChatWs)
+if (ChatWs.ws) {
+  ChatWs.watch((msg, e) => {
+    try {
+      handleMessage(JSON.parse(msg))
+    } catch (error) {
+      console.error('socket 解析异常 ', error, e)
+      handleMessage(msg)
+    }
+  })
+}
+
+// 更新ppt内容
 const updatePPT = async (data) => {
   if (!resource) return
   data.id = resource.id
@@ -37,3 +55,40 @@ const updatePPT = async (data) => {
     sessionStore.set('curr.smarttalk.fileShowName', params.fileShowName)
   }
 }
+
+// ws消息处理
+const handleMessage = (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(() => { // 点击确定按钮，关闭窗口
+            window.close()
+          })
+        } 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
+    }
+  }
+}
+// console.log('监听器已开启', Classcourse)
+// setTimeout(() => {
+//   console.log('关闭弹窗')
+//   // Classcourse.msgObj?.close()
+//   Classcourse?.msgObj?.onVanish()
+// }, 10 * 1000)

src/renderer/src/AixPPTist/src/store/classcourse.ts

@@ -2,7 +2,7 @@ import { defineStore } from 'pinia'
 import type { Classcourse } from '../api/types'
 
 export interface ClasscourseState {
-  classcourse: Classcourse
+  classcourse: Classcourse | any, // 课堂信息
 }
 
 export const useClasscourseStore = defineStore('classcourse', {

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

@@ -56,6 +56,8 @@ export class MsgEnum {
    */
   static HEADS = {
     // === 旧定义-消息头(兼容以前) ===
+    /** @desc: 开课 */
+    MSG_open : 'open',
     /** @desc: 结束课程(下课) */
     MSG_closed : 'closed',
     /** @desc: 在线状态 */
@@ -93,6 +95,8 @@ export class MsgEnum {
     /** @desc: 课堂讲授活动，选择不同的内容 */
     MSG_classlecturePagesrc : 'classlecturePagesrc',
     // === 新定义-消息头 ===
+    /** @desc: 课程创建-待开课 */
+    MSG_0000: 0x0000,
     /** @desc: 点赞 */
     MSG_0001: 0x0001,
     /** @desc: 疑惑 */

src/renderer/src/plugins/modal.js

@@ -5,51 +5,51 @@ let loadingInstance;
 export default {
   // 消息提示
   msg(content) {
-    ElMessage.info(content)
+    return ElMessage.info(content)
   },
   // 错误消息
   msgError(content) {
-    ElMessage.error(content)
+    return ElMessage.error(content)
   },
   // 成功消息
   msgSuccess(content) {
-    ElMessage.success(content)
+    return ElMessage.success(content)
   },
   // 警告消息
   msgWarning(content) {
-    ElMessage.warning(content)
+    return ElMessage.warning(content)
   },
   // 弹出提示
-  alert(content) {
+  alert(content, option = {}) {
-    ElMessageBox.alert(content, "系统提示")
+    return ElMessageBox.alert(content, "系统提示", option)
   },
   // 错误提示
-  alertError(content) {
+  alertError(content, option = {}) {
-    ElMessageBox.alert(content, "系统提示", { type: 'error' })
+    return ElMessageBox.alert(content, "系统提示", { type: 'error', ...option })
   },
   // 成功提示
-  alertSuccess(content) {
+  alertSuccess(content, option = {}) {
-    ElMessageBox.alert(content, "系统提示", { type: 'success' })
+    return ElMessageBox.alert(content, "系统提示", { type: 'success', ...option })
   },
   // 警告提示
-  alertWarning(content) {
+  alertWarning(content, option = {}) {
-    ElMessageBox.alert(content, "系统提示", { type: 'warning' })
+    return ElMessageBox.alert(content, "系统提示", { type: 'warning', ...option })
   },
   // 通知提示
   notify(content) {
-    ElNotification.info(content)
+    return ElNotification.info(content)
   },
   // 错误通知
   notifyError(content) {
-    ElNotification.error(content);
+    return ElNotification.error(content);
   },
   // 成功通知
   notifySuccess(content) {
-    ElNotification.success(content)
+    return ElNotification.success(content)
   },
   // 警告通知
   notifyWarning(content) {
-    ElNotification.warning(content)
+    return ElNotification.warning(content)
   },
   // 确认窗体
   confirm(content) {
@@ -78,5 +78,8 @@ export default {
   // 关闭遮罩层
   closeLoading() {
     loadingInstance.close();
-  }
+  },
+  // messageBox: opt => ElMessageBox(opt),
+  // 其他实例放出去，方便调用
+  ElMessage, ElMessageBox, ElNotification, ElLoading
 }

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

@@ -8,6 +8,7 @@ import useUserStore from '@/store/modules/user' // 用户信息
 export class ChatWs {
   instance = null; // 实例
   id = null; // 群聊id || 单聊id-用户id(userId)
+  url = null; // ws地址
   closed = false; // 关闭状态
   onmessage = null; // 自定义处理
   errCount = 5; // 重连次数 (ms) 暂时不使用
@@ -19,12 +20,16 @@ export class ChatWs {
     beat: 'heart_beat', // 心跳
   }
   static base = 'wss://file.ysaix.com:7868'
-  constructor() {
+
+  // 构造函数 是否自动连接
+  constructor(bool = true) {
     if (!ChatWs.instance) {
+      if (bool) { // 是否自动连接
         const userStore = useUserStore() // 用户信息
         const wsBase = import.meta.env.VITE_APP_WS_URL; // ws地址
-      const url = `${wsBase||ChatWs.base}/ws/websocket/${userStore.id}`;
+        this.url = `${wsBase||ChatWs.base}/ws/websocket/${userStore.id}`;
-      this.init(url);
+        // this.init(url);
+      }
       ChatWs.instance = this;
     }
     return ChatWs.instance;
@@ -32,11 +37,11 @@ export class ChatWs {
 
   // 初始化
   init(url) {
-    this.url = url;
+    !!url && (this.url = url);
     this.ws = null;
     const _this = this
     this.heartCheck = {
-      timeout: 1000 * 10, // 60s
+      timeout: 1000 * 60, // 60s
       timeoutObj: null,
       serverTimeoutObj: null,
       reset() {
@@ -78,10 +83,9 @@ export class ChatWs {
       // 拿到任何消息都说明当前连接是正常的
       const isBeat = e.data == 'pong'
       isBeat && self.heartCheck.reset().start();
-      const exts = ['sessionId', 'pong'] // 不处理的消息头
       const isEmpty = !e.data
-      const isExts = exts.some(item => e.data.includes(item))
+      const isExts = e.data.includes('sessionId') || e.data == ('pong')
-      if (isEmpty && isExts) return;
+      if (isEmpty || isExts) return;
       // 自定义处理
       self.onmessage && self.onmessage(e.data, e);
     };
@@ -118,12 +122,12 @@ export class ChatWs {
     this.ws.send(msg)
   }
   // 发送消息-带消息头(key)
-  sendMsg(head, content, option = {}) {
+  sendMsg(head, content, option = {}, ...arg) {
-    if (!head) throw new Error("head is not null")
+    if (!head && head!==0) throw new Error("head is not null")
-    if (!content) throw new Error("content is not null")
+    if (!content && content!==0) throw new Error("content is not null")
     let msg = { head, content, ...option }
     // 发送消息
-    this.send(this.getMsgObj(msg))
+    this.send(this.getMsgObj(msg, ...arg))
   }
   // 发送心跳
   sendMsgBeat() {
@@ -137,7 +141,7 @@ export class ChatWs {
    * @param {*} id 群聊id || 单聊id-用户id(userId)
    */
   getMsgObj(msg, chatType = 'group', id) {
-    if (typeof msg === "object") msg = JSON.stringify(msg)
+    // if (typeof msg === "object") msg = JSON.stringify(msg)
     const res = {msg, chatType}
     // if (!id) throw new Error(`${type=='group'?'群ID':'用户ID'} is not null`)
     if (chatType == 'group') res.groupId = id || this.id || ''
@@ -160,5 +164,6 @@ export class ChatWs {
 }
 // 连接socket
 export const connect = () => new ChatWs()
+export const getInstance = () => new ChatWs(false)
 // 默认实例
 export default new ChatWs()

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

@@ -7,15 +7,20 @@
       <span>{{item.caption}}</span>
     </div>
     <div class="class-reserv-item-tool" style="width: 200px;max-width: 300px">
-      <el-tag v-if="item.status === 'closed'" style="margin-right: 5px" type="success">已结束</el-tag>
+      <el-tag v-if="item.status === ''" style="margin-right: 5px" type="warning">待开课</el-tag>
-      <el-tag v-if="item.status === 'open'" style="margin-right: 5px" type="danger">上课中</el-tag>
+      <el-tag v-else-if="item.status === 'closed'" style="margin-right: 5px" type="success">已结束</el-tag>
-      <el-button v-if="item.status === 'open'" :disabled="toolStore.isToolWin" size="small" type="primary" @click="startClassR(item)"
+      <el-tag v-else-if="item.status === 'open'" style="margin-right: 5px" type="danger">上课中</el-tag>
+      <template v-if="!item.status">
+        <el-button size="small" type="primary" :icon="ChatDotRound" @click="chatSend()">上课(APP)</el-button>
+      </template>
+      <template v-else-if="item.status === 'open'">
+        <el-button :disabled="toolStore.isToolWin" size="small" type="primary" @click="startClassR(item)"
         >继续上课</el-button
         >
-      <!--      <el-button v-if="item.status === '未开始'" @click="openEdit">编辑</el-button>-->
+        <!--<el-button v-if="item.status === '未开始'" @click="openEdit">编辑</el-button>-->
-      <el-button v-if="item.status === 'open'" :loading="loading" size="small" type="info" @click="endClassR(item)"
+        <el-button :loading="loading" size="small" type="info" @click="endClassR(item)"
-      >下课{{ loading?'中...':'' }}</el-button
+        >下课{{ loading?'中...':'' }}</el-button>
-      >
+      </template>
     </div>
     <div class="class-reserv-item-tool" style="width: 50px;">
 <!--      <el-button v-if="item.status!='open'" size="small" type="danger" @click="deleteReserv">删除</el-button>-->
@@ -25,10 +30,12 @@
   </div>
 </template>
 <script setup>
-import { ref } from 'vue'
+import { ref, reactive } from 'vue'
 import { useToolState } from '@/store/modules/tool'
 import { deleteSmartReserv } from '@/api/classManage'
 import { ElMessage } from 'element-plus'
+import { ChatDotRound } from '@element-plus/icons-vue'
+
 const emit = defineEmits(['openEdit', 'deleteReserv', 'change'])
 const props = defineProps({
   item: {
@@ -39,6 +46,7 @@ const props = defineProps({
 const basePath = import.meta.env.VITE_APP_BUILD_BASE_PATH
 const toolStore = useToolState() // 获取状态管理-tool
 const loading = ref(false)  // 下课中的loading
+const msg = reactive({ id: null, time: null }) // 发送消息的对象
 const openEdit = () => {
   emit('openEdit', props.item)
 }
@@ -61,6 +69,18 @@ const startClassR = (item) => {
 const endClassR = (item) => {
   emit('change', 'close', item, { type: 2, loading })
 }
+// 发送上课消息
+const chatSend = () => {
+  const time = Date.now()
+  if(msg.id) { // 同一个人30秒内不能重复发送
+    const isEq = msg.id == props.item.id && (time - msg.time) < 30 * 1000
+    if(isEq) return ElMessage.warning('请勿重复发送(30秒内)!')
+  } else { // 记录发送信息
+    msg.id = props.item.id
+    msg.time = time
+  }
+  emit('change', 'wsApp', props.item)
+}
 
 </script>
 <style scoped lang="scss">

src/renderer/src/views/model/index.vue

@@ -199,8 +199,8 @@ const HTTP_SERVER_API = (type, params = {}) => {
     case 'addSmarttalk': { // 获取课程
       const def = {
         fileId: '', // 文件id - Entpcoursefile 对应id
-        fileFlag: 'aptist',
+        fileFlag: 'aippt',
-        fileShowName: courseObj.coursetitle + '.aptist',
+        fileShowName: courseObj.coursetitle + '.aippt',
         textbookId: courseObj.textbookId,
         levelFirstId: courseObj.levelFirstId,
         levelSecondId: courseObj.levelSecondId,

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

@@ -87,7 +87,8 @@ import { onMounted, reactive, ref, watchEffect, watch, nextTick, toRaw } from 'v
 import { Refresh } from '@element-plus/icons-vue'
 import { ElMessage, ElMessageBox } from 'element-plus'  // ui框架: 消息提示
 import vueQr from 'vue-qr/src/packages/vue-qr.vue'      // 插件: 二维码
-import imChat from '@/views/tool/components/imChat.vue' // im-chat-子组件
+// import imChat from '@/views/tool/components/imChat.vue' // im-chat-子组件
+import ChatWs from '@/plugins/socket' // 聊天socket
 import MsgEnum from '@/plugins/imChat/msgEnum'          // 消息头-相关定义(nuem)
 import * as commUtil from '@/utils/comm'                // 工具类-通用
 import { toLinkWeb, createWindow, getStaticUrl, sessionStore } from '@/utils/tool'  // 工具类-主进程相关
@@ -151,9 +152,11 @@ const open = async (id, classObj) => {
       teacherForm.form.classcourseid = classObj.id
     }
     // 初始化im-chat
-    // nextTick(async() => {
+    nextTick(async() => {
       // chat = await imChatRef.value?.initImChat()
-    // })
+      // 连接socket
+      if (!ChatWs.ws) ChatWs.init()
+    })
   }
 }
 // 关闭弹窗
@@ -267,10 +270,10 @@ const createClasscourse = async () => {
     setTimeout(() => {
       msgEl.close()
       msgEl = ElMessage.warning({message:'正在打开公屏，请稍后...',duration: 0})
-      setTimeout(() => {
+      setTimeout(async() => {
         msgEl.close()
-        const classcourse = {...params, id: teacherForm.form.classcourseid}
+        const res = await Http_Classcourse.getClasscourse(teacherForm.form.classcourseid)
-        openPublicScreen(classcourse)
+        openPublicScreen(res.data)
       }, 2000);
     }, 1000);
   }
@@ -303,9 +306,10 @@ const classTeachingStart = async () => {
     // 新版-pptList 打开公屏
     if (myClassActive.value.filetype == 'aptist') {
       const msgEl = ElMessage.warning({message:'正在打开公屏，请稍后...',duration: 0})
-      setTimeout(() => {
+      setTimeout(async () => {
         msgEl.close()
-        openPublicScreen({id})
+        const res = await Http_Classcourse.getClasscourse(teacherForm.form.classcourseid)
+        openPublicScreen(res.data)
       }, 2000);
     }else {
       const url = `/teaching/classteaching?classcourseid=${id}&actor=classTeachingOnPublicScreen`
@@ -350,6 +354,10 @@ const getQrUrl = async() => {
 // 打开公屏
 const openPublicScreen = (classcourse) => {
   console.log('打开公屏', classcourse)
+  // 发送app端待开课消息
+  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) // 缓存当前资源信息
   sessionStore.set('curr.classcourse', classcourse) // 缓存当前当前上课
@@ -367,25 +375,25 @@ const openPublicScreen = (classcourse) => {
 
 // ================== 监听 =======================
 // im-chat: 聊天事件 {type, data}
-const chatChange = (type, data, ...args) => {
+// const chatChange = (type, data, ...args) => {
-  if (type == 'msg') {   // im-chat 消息监听
+//   if (type == 'msg') {   // im-chat 消息监听
-    console.log('msg:===== ',data, args)
+//     console.log('msg:===== ',data, args)
-    // const msgId = (args||[])[0].message_msg_id
+//     // const msgId = (args||[])[0].message_msg_id
-    const { msgKey:head, msgcontent:msg, senduserid:sendId, msgType } = data
+//     const { msgKey:head, msgcontent:msg, senduserid:sendId, msgType } = data
-    switch(head) {
+//     switch(head) {
-      case MsgEnum.HEADS.MSG_classcourseopen:{ // 开课, 跳转公屏
+//       case MsgEnum.HEADS.MSG_classcourseopen:{ // 开课, 跳转公屏
-        const { classcourseid:id } = teacherForm.form
+//         const { classcourseid:id } = teacherForm.form
-        const { classcourseid: imId, status } = data
+//         const { classcourseid: imId, status } = data
-        if (imId == id && status == 'open') {
+//         if (imId == id && status == 'open') {
-          classTeachingStart() // 开始跳转
+//           classTeachingStart() // 开始跳转
-        }
+//         }
-        break}
+//         break}
-      default:
+//       default:
-        console.log('未知消息:', data)
+//         console.log('未知消息:', data)
-        break
+//         break
-    }
+//     }
-  }
+//   }
-}
+// }
 
 // 监听-班级id
 watch(() => classForm.form.classid, (val)=> {

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

@@ -202,17 +202,14 @@ import ClassReserv from '@/views/classManage/classReserv.vue'
 import TreeLog from '@/views/prepare/components/treeLog.vue'
 import classStart from './container/class-start.vue' // 预备上课
 import MsgEnum from '@/plugins/imChat/msgEnum'  // im 消息枚举
-import Chat from '@/utils/chat'
 import * as commUtils from "@/utils/comm";
 import * as Api_server from "@/api/apiService";
 import msgUtils from "@/plugins/modal";
-import * as API_entpcoursefile from "@/api/education/entpcoursefile"; // im 登录初始化
+import * as API_entpcoursefile from "@/api/education/entpcoursefile";
-if (!Chat.imChat) Chat.init()
+import ChatWs from '@/plugins/socket' // 聊天socket
+if (!ChatWs.ws) ChatWs.init()
 // import Chat from '@/utils/chat' // im 登录初始化
 // if (!Chat.imChat) Chat.init()
-// import ChatWs from '@/plugins/socket'
-// console.log('xxxx',ChatWs)
-// ChatWs.watch((data,e) => console.log('ws', data, e))
 
 const toolStore = useToolState()
 const fs = require('fs')
@@ -344,6 +341,8 @@ export default {
   //   }
   // },
   methods: {
+    // 延时
+    sleep(ms){return new Promise(resolve => setTimeout(resolve, ms))},
     addAiPPT(item) {
       this.currentFileList.unshift(item.resData)
       KjListItem.methods.openFileWin(item.resData);
@@ -446,6 +445,33 @@ export default {
           ElMessage.warning('该功能暂未开放！')
           break
         }
+        case 'wsApp': { // 发送app端待开课消息
+          // console.log('wsApp', row)
+          const head = MsgEnum.HEADS.MSG_0000
+          const data = { id: row.id }
+          const type = ChatWs.TYPES.single
+          const userId = this.userStore.userId
+          ElMessage.success('APP端待开课消息-发送成功！')
+          await this.sleep(1000) // 等待1s
+          // 打开公屏
+          const msgEl = ElMessage.warning({message:'正在打开公屏，请稍后...',duration: 0})
+          const res = await getEntpcoursefile(row.entpcoursefileid)
+          await this.sleep(2000) // 等待2s
+          ChatWs.sendMsg(head, data, null, type, userId)
+          msgEl.close() // 关闭提示
+          const resource = res?.data||{}
+          const classcourse = row
+          sessionStore.set('curr.resource', resource) // 缓存当前资源信息
+          sessionStore.set('curr.classcourse', classcourse) // 缓存当前当前上课
+          createWindow('open-win', {
+            url: '/pptist', // 窗口关闭时，清除缓存
+            close: () => {
+              sessionStore.set('curr.resource', null) // 清除缓存
+              sessionStore.set('curr.classcourse', null) // 清除缓存
+            }
+          })
+          break
+        }
         default:
           break
       }