zhuhao
/
AIx_Smarttalk_WS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
朱浩 2024-12-13 10:06:23 +08:00
parent 82548ce937 b4864bc109
commit a62dde1b93
18 changed files with 233 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.production
View File

@ -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 = 'false'

5
src/renderer/src/AixPPTist/src/App.vue
View File

@ -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()

13
src/renderer/src/AixPPTist/src/api/classcourse.ts
View File

@ -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,

8
src/renderer/src/AixPPTist/src/api/types.ts
View File

@ -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,

83
src/renderer/src/AixPPTist/src/api/watcher.ts
View File

@ -10,39 +10,44 @@ 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') // 备课资源
import { Homework } from './index' // api-作业相关
import emitter from '@/utils/mitt' //mitt 事件总线
/**
* @description 监听器
*/
// 监听幻灯片内容变化
watch(() => slidesStore.slides, (newVal, oldVal) => {
PPTApi.updateSlides(newVal, oldVal) // 更新幻灯片内容
},{ deep: true })
export default () => {
const slidesStore = store.useSlidesStore()
const classcourseStore = store.useClasscourseStore() // 课堂信息-状态管理
const resource = sessionStore.get('curr.resource') // apt 资源
const smarttalk = sessionStore.get('curr.smarttalk') // 备课资源
// 监听标题变化
watch(() => slidesStore.title, (newVal, oldVal) => {
// 监听幻灯片内容变化
watch(() => slidesStore.slides, (newVal, oldVal) => {
PPTApi.updateSlides(newVal, oldVal) // 更新幻灯片内容
},{ deep: true })
// 监听标题变化
watch(() => slidesStore.title, (newVal, oldVal) => {
if (oldVal == '未命名演示文稿') return // 初始加载，不需要更新数据
updatePPT({title: newVal})
})
})
// 消息监听ws
console.log('监听器已开启', ChatWs)
if (ChatWs.ws) {
ChatWs.watch((msg, e) => {
// 消息监听ws
// console.log('监听器已开启', ChatWs)
if (!!ChatWs.ws) {
ChatWs.watch((data, e) => {
try {
handleMessage(JSON.parse(msg))
handleMessage(JSON.parse(data)?.msg)
} catch (error) {
console.error('socket 解析异常 ', error, e)
handleMessage(msg)
handleMessage(data)
}
})
}
}
// 更新ppt内容
const updatePPT = async (data) => {
// 更新ppt内容
const updatePPT = async (data) => {
if (!resource) return
data.id = resource.id
await PPTApi.updateSlide(data) // 更新ppt内容
@ -54,10 +59,11 @@ const updatePPT = async (data) => {
await PPTApi.updateSmarttalk(params) // 更新ppt内容
sessionStore.set('curr.smarttalk.fileShowName', params.fileShowName)
}
}
}
// ws消息处理
const handleMessage = (msg) => {
// ws消息处理
const handleMessage = (msg) => {
console.log('ws消息处理', msg)
if (typeof msg === 'object'){
const { head, content, ...other } = msg
switch (head) {
@ -66,10 +72,11 @@ const handleMessage = (msg) => {
if (Classcourse.id !== content.id) {
msgUtils.alertError('老师开课信息异常，请重新进入公屏！')
.then(() => { // 点击确定按钮，关闭窗口
window.close()
close()
})
} else { // 正常更新数据
classcourseStore.classcourse.status = 'open'
sessionStore.set('curr.classcourse.status', 'open')
// 更新课堂信息-关闭警告框
Classcourse?.msgObj?.onVanish()
}
@ -78,17 +85,31 @@ const handleMessage = (msg) => {
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: // 下课:
window.close() // 关闭窗口
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)

6
src/renderer/src/AixPPTist/src/hooks/useScreening.ts
View File

@ -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()
}

12
src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue
View File

@ -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', data: base64 })
emit('insertMaterial',{ type: 'img', file })
}
}

17
src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue
View File

@ -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>
@ -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())
@ -280,10 +281,11 @@ const toggleNotesPanel = () => {
// 插入素材
interface MaterialParams {
type: string,
data: string
file: any
}
const insertMaterial = (item: MaterialParams) =>{
const { type, data } = item
const { type, file } = item
PPTApi.toRousrceUrl(file).then(data=>{
if(type == 'video'){
createVideoElement(data)
}
@ -291,10 +293,19 @@ const insertMaterial = (item: MaterialParams) =>{
createImageElement(data)
}
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>

11
src/renderer/src/components/ai-kolors/index.vue
View File

@ -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=');
@ -495,6 +492,7 @@ export default {
try {
const blob = await this.getImageBlob(`https://ai.ysaix.com:7853/view?filename=${finalPath}&type=temp`);
const hash = CryptoJS.MD5(blob).toString();
const formData = new FormData();
@ -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);

1
src/renderer/src/layout/components/Header.vue
View File

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

12
src/renderer/src/plugins/imChat/msgEnum.js
View File

@ -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;

19
src/renderer/src/plugins/socket/index.js
View File

@ -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,10 +66,11 @@ export class ChatWs {
}, this.timeout);
},
};
this.reconnect();
return this.reconnect();
}
// 重连
reconnect() {
return new Promise((resolve, reject) => {
const self = this;
if (!!this.ws) { // 关闭之前的链接
this.ws.close()
@ -77,6 +80,7 @@ export class ChatWs {
this.ws.onopen = function () {
console.log("websocket-连接成功")
self.heartCheck.reset().start();
resolve()
};
this.ws.onmessage = function (e) {
// console.log("websocket-收到消息", e)
@ -97,10 +101,11 @@ export class ChatWs {
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))

3
src/renderer/src/views/classManage/reserv-item-apt.vue
View File

@ -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>

1
src/renderer/src/views/classTask/teachClassTask.vue
View File

@ -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) {

9
src/renderer/src/views/prepare/container/class-start.vue
View File

@ -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)
if (!dt.ctCourse) { // 新开课需要发送消息-继续上课不需要直接打开
// 发送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) // 缓存当前资源信息

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

@ -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){

13
src/renderer/src/views/prepare/index.vue
View File

@ -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 }
Chat.sendMsg(timgroupid, msg)
// const msg = { msgKey: head, actor: msgT, classcourseid: row.id }
// 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 : '已结束'
}

3
src/renderer/src/views/teachingDesign/container/right.vue
View File

@ -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