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

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

Reviewed-on: #152
This commit is contained in:
zhengdegang 2024-12-19 16:49:25 +08:00
parent 6128f267e1 dfc10aebbe
commit 6ef5d4575e
11 changed files with 212 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/renderer/src/AixPPTist/src/api/chat.ts
View File

@ -4,21 +4,51 @@
import ChatWs from '@/plugins/socket' // 聊天socket
import { sessionStore } from '@/utils/store' // electron-store 状态管理
import { useClasscourseStore } from '../store'
import * as API_classcourse from '@/api/teaching/classcourse' // 后端api
import { MsgEnum } from './types'
// import msgUtils from '@/plugins/modal' // 消息工具
export default () => {
const classcourse = sessionStore.get('curr.classcourse') // 课堂信息
const courseId = classcourse?.id // 课堂id
const timgroupid = classcourse?.timgroupid // 群组id
const classcourseStore = useClasscourseStore() // 课堂信息-状态管理
if (!ChatWs.ws) ChatWs.init()
// 开课消息
const startCourse = async() => {
// await API_classcourse.updateClasscourse({ id: classcourse.id, status: 'open' })
ChatWs.sendMsg('open', {id: courseId})
return Promise.resolve()
}
// 下课消息
const exitCourse = async() => {
if(!timgroupid) throw new Error('未获取到群组ID')
await API_classcourse.updateClasscourse({ id: classcourse.id, status: 'closed' })
await API_classcourse.updateClasscourse({ id: courseId, status: 'closed' })
return ChatWs.closedCourse(timgroupid)
}
// 翻页消息
const slideFlapping = (msg:object) => {
return new Promise(async (resolve, reject) => {
const isWs = !!ChatWs.ws && ChatWs.ws.readyState === 1 // 是否有socket连接
if(!timgroupid) return reject('未获取到群组ID')
else if(!isWs) return reject('信异常，请重试！')
const {current: paging, animation: cartoonTimes} = msg || {}
const head = MsgEnum.HEADS.MSG_slideFlapping
ChatWs.sendMsg(head, msg) // 发送消息
API_classcourse.setPaging({ id: courseId, paging, cartoonTimes})
// 更新本地缓存
sessionStore.set('curr.classcourse.paging', paging)
sessionStore.set('curr.classcourse.cartoonTimes', cartoonTimes)
classcourseStore.classcourse.paging = paging
classcourseStore.classcourse.cartoonTimes = cartoonTimes
return resolve(true)
})
}
return {
exitCourse,
classcourse,
groupid: timgroupid,
classcourse,
exitCourse,
slideFlapping,
}
}

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

@ -14,6 +14,7 @@ const slidesStore = useStore.useSlidesStore() // 幻灯片-状态管理
const screenStore = useStore.useScreenStore() // 全屏-状态管理
const classcourseStore = useStore.useClasscourseStore() // 课堂信息-状态管理
const classcourse = sessionStore.get('curr.classcourse') // 课堂信息
const isPublic = sessionStore.get('curr.isPublic') // 是否公屏开课
export class Classcourse {
msgObj:ElMessageBox = null // 提示消息对象
@ -36,8 +37,13 @@ export class Classcourse {
// 如果课堂信息有值，则连接socket
if (isCourse) {
// 连接socket
if (!ChatWs.ws) ChatWs.init()
ChatWs.id = classcourse.timgroupid // 群组id
if (!ChatWs.ws) {
ChatWs.init().then(_ => {
isPublic && ChatWs.sendMsg('open', {id: classcourse.id})
// isPublic && console.log('socket-开课消息-已发送')
})
}
this.classcourse = classcourse // 课堂信息
this.id = classcourse.id // 课堂id
// 如果课堂信息有paging，则更新当前页码
@ -46,7 +52,7 @@ export class Classcourse {
// 如果课堂信息有paging，则更新动画播放状态
const isAnim = !!cartoonTimes || cartoonTimes === 0
if (isPaging) slidesStore.updateSlideIndex(paging)
if (isAnim) slidesStore.updateAnimationIndex(cartoonTimes+1)
if (isAnim) slidesStore.updateAnimationIndex(cartoonTimes)
// 课堂信息-状态管理
classcourseStore.setClasscourse(classcourse)
// 待上课提示

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

@ -124,6 +124,8 @@ export class MsgEnum {
MSG_classlecturePagesrc : 'classlecturePagesrc',
/** @desc: 课堂作业|活动 */
MSG_homework : 'HOMEWORK',
/** @desc: 公屏 - 课堂作业|活动 */
MSG_pushSreen_work : 'pushSreen-work',
/** @desc: 点赞 */
MSG_dz : 'dz',
/** @desc: 疑惑 */

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

@ -23,7 +23,7 @@ export default () => {
const classcourseStore = store.useClasscourseStore() // 课堂信息-状态管理
const resource = sessionStore.get('curr.resource') // apt 资源
const smarttalk = sessionStore.get('curr.smarttalk') // 备课资源
const { execNext, turnPrevSlide } = useExecPlay()
const { execNext, turnPrevSlide } = useExecPlay(false) // 不加载钩子
// 监听幻灯片内容变化
watch(() => slidesStore.slides, (newVal, oldVal) => {
PPTApi.updateSlides(newVal, oldVal) // 更新幻灯片内容
@ -103,9 +103,10 @@ export default () => {
else if (type === 'Previoustep') turnPrevSlide() // 上一步清空-动画
else slidesStore.updateSlideIndex(slideIndex) // 更新幻灯片下标
break
case MsgEnum.HEADS.MSG_homework: // 作业|活动-布置
if (!content.classWorkId) return
Homework.showHomework(content.classWorkId)
// case MsgEnum.HEADS.MSG_homework: // 作业|活动-布置 不处理
case MsgEnum.HEADS.MSG_pushSreen_work: // 打开-作业|活动
if (!content.id) return
Homework.showHomework(content.id)
break
case MsgEnum.HEADS.MSG_closed: // 下课:
close()

48
src/renderer/src/AixPPTist/src/views/Screen/hooks/useExecPlay.ts
View File

@ -6,8 +6,13 @@ import { KEYS } from '../../../configs/hotkey'
import { ANIMATION_CLASS_PREFIX } from '../../../configs/animation'
import message from '../../../utils/message'
import emitter from '@/utils/mitt';
import Chat from '../../../api/chat' // 聊天封装
// import ChatWs from '@/plugins/socket' // 聊天socket
// import { MsgEnum } from '../../../api/types' // 消息枚举
export default () => {
export default (isLoader?: boolean = true) => {
// isLoader 是否执行 onMounted, onUnmounted
const chatApi = Chat()
const slidesStore = useSlidesStore()
const classcourseStore = useClasscourseStore() // 课堂信息-状态管理
const { slides, slideIndex, formatedAnimations, animationIndex } = storeToRefs(slidesStore)
@ -71,14 +76,15 @@ export default () => {
elRef.addEventListener('animationend', handleAnimationEnd, { once: true })
}
}
onMounted(() => {
const firstAnimations = formatedAnimations.value[0]
if (firstAnimations && firstAnimations.animations.length) {
const autoExecFirstAnimations = firstAnimations.animations.every(item => item.trigger === 'auto' || item.trigger === 'meantime')
if (autoExecFirstAnimations) runAnimation()
}
})
if (isLoader) { // 加载相关钩子
onMounted(() => {
const firstAnimations = formatedAnimations.value[0]
if (firstAnimations && firstAnimations.animations.length) {
const autoExecFirstAnimations = firstAnimations.animations.every(item => item.trigger === 'auto' || item.trigger === 'meantime')
if (autoExecFirstAnimations) runAnimation()
}
})
}
// 撤销元素动画，除了将索引前移外，还需要清除动画状态
const revokeAnimation = () => {
@ -142,7 +148,6 @@ export default () => {
inAnimation.value = false
}
const execNext = (isAsync: boolean) => {
console.log('execNext', isAsync)
if (formatedAnimations.value.length && animationIndex.value < formatedAnimations.value.length) {
runAnimation(isAsync)
}
@ -178,8 +183,7 @@ export default () => {
// 鼠标滚动翻页
const mousewheelListener = (e: WheelEvent) => {
// console.log('mousewheel', e)
// 课堂信息存在时，不允许翻页
if (!!classcourseStore.classcourse) e.preventDefault()
e.preventDefault() // 阻止默认事件
mousewheelListenerThrottle(e)
}
const mousewheelListenerThrottle = throttle(function(e: WheelEvent) {
@ -210,12 +214,17 @@ export default () => {
}
}
// 向上翻页/向下翻页
const turning = (e, type) => {
const turning = async (e, type) => {
e.preventDefault() // 阻止默认事件
// 课堂信息存在时，不允许翻页
if (!!classcourseStore.classcourse) return
if (type === 'prev') execPrev()
else if (type === 'next') execNext()
if (classcourseStore.classcourse) { // 上课中
const current = slideIndex.value
const animation = animationIndex.value
const animationSteps = type == 'next'?'Nextsteps':'Previoustep'
const msg = { current, animation, animationSteps}
chatApi.slideFlapping(msg)
}
}
// 快捷键翻页
const keydownListener = (e: KeyboardEvent) => {
@ -230,10 +239,11 @@ export default () => {
key === KEYS.PAGEDOWN
) turning(e, 'next')
}
onMounted(() => {document.addEventListener('keydown', keydownListener)})
onUnmounted(() => {document.removeEventListener('keydown', keydownListener)})
if (isLoader) { // 加载相关钩子
onMounted(() => {document.addEventListener('keydown', keydownListener)})
onUnmounted(() => {document.removeEventListener('keydown', keydownListener)})
}
// 切换到上一张/上一张幻灯片（无视元素的入场动画）
const turnPrevSlide = () => {
slidesStore.updateSlideIndex(slideIndex.value - 1)

8
src/renderer/src/api/teaching/classcourse.js
View File

@ -95,3 +95,11 @@ export function getCourseTeachingMsg(id) {
})
}
export function setPaging(data) {
return request({
url: '/education/classcourse/record/paging',
method: 'post',
data
})
}

26
src/renderer/src/directive/scroll.js Normal file
View File

@ -0,0 +1,26 @@
/**
* 无限滚动
*/
import { nextTick } from 'vue'
const mountedHook = async (el, binding) => {
console.log(el, binding)
const value = binding.value
if (typeof value !== 'function') return console.error('v-scroll must be a function')
await nextTick()
}
export default {
// Hooks for Vue3
mounted(el, binding) {
mountedHook(el, binding)
},
// Hooks for Vue2
inserted(el, binding) {
mountedHook(el, binding)
},
update(el, binding){
},
updated(el, binding){
},
}

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

@ -98,6 +98,8 @@ export class MsgEnum {
MSG_classlecturePagesrc : 'classlecturePagesrc',
/** @desc: 课堂作业|活动 */
MSG_homework : 'HOMEWORK',
/** @desc: 公屏 - 课堂作业|活动 */
MSG_pushSreen_work : 'pushSreen-work',
/** @desc: 点赞 */
MSG_dz : 'dz',
/** @desc: 疑惑 */

54
src/renderer/src/views/classManage/classReserv.vue
View File

@ -3,16 +3,16 @@
<!-- <div class="class-reserv-tabs">
<el-segmented v-model="tabActive" block :options="tabOptions" size="large" />
</div>-->
<div class="class-reserv-body">
<div class="class-reserv-body" v-infinite-scroll="load">
<template v-for="(item, index) in dataList" :key="index">
<reserv-item
<!-- <reserv-item
:style="{'background-color': index%2==0?'#f5f5f5':''}"
:item="item"
v-if="item.bookImg"
@open-edit="reservDialog.openDialog(item)"
@delete-reserv="deleteReserv(item)"
@change="(...o) => emit('change', ...o)"
></reserv-item>
></reserv-item> -->
<reserv-item-apt
v-if="!item.bookImg"
:style="{'background-color': index%2==0?'#f5f5f5':''}"
@ -22,13 +22,14 @@
@change="(...o) => emit('change', ...o)"
></reserv-item-apt>
</template>
<el-divider v-if="page.isEnd">到底了，没了</el-divider>
</div>
<reserv ref="reservDialog"></reserv>
</el-container>
</template>
<script setup>
import { ref, onMounted, computed, watch } from 'vue'
import { ref, onMounted, computed, watch, reactive } from 'vue'
import { getSelfReserv } from '@/api/classManage'
import { listClasscourseNew } from '@/api/teaching/classcourse' // api接口
import ReservItem from '@/views/classManage/reserv-item.vue'
@ -36,6 +37,7 @@ import Reserv from '@/views/prepare/container/reserv.vue'
import { useToolState } from '@/store/modules/tool'
import useUserStore from '@/store/modules/user'
import ReservItemApt from '@/views/classManage/reserv-item-apt.vue'
import vScroll from '@/directive/scroll' // 指令--滚动
// import Chat from '@/utils/chat' // im 登录初始化
// if (!Chat.imChat) Chat.init()
@ -44,6 +46,12 @@ const reservDialog = ref(null)
const tabOptions = ref(['进行中', '已结束'])
const tabActive = ref('进行中')
const dataList = ref([])
const page = reactive({
pageNum: 0, // 页码
pageSize: 10, // 每页条数
total: 0, // 总条数
isEnd: false // 是否加载完
})
const toolStore = useToolState()
const userStore = useUserStore()
@ -72,21 +80,42 @@ const deleteReserv = (item) => {
})*/
// 获取数据
const getData = () => {
Promise.all([listClasscourseNew({teacherid: userStore.id,evalid: props.curNode.id,pageSize:1000}), getSelfReserv({ex2:props.curNode.id})]).then(([res1,res2])=>{
let list = res2.data || []
let list2 = res1.rows || []
// list.sort((a,b) => { if(a.status=='上课中') return -1; else return 0 })
list = list.concat(list2)
const { pageNum, pageSize } = page
const params = {
evalid: props.curNode.id,
teacherid: userStore.id,
pageNum, pageSize
}
listClasscourseNew(params)
.then((res) => {
const list = res.rows || []
const total = res.total || 0
list.sort((a,b) => { return new Date(b.createTime) - new Date(a.createTime) })
dataList.value = list
dataList.value.push(...list)
page.total = total // 总条数
page.isEnd = dataList.value.length == total // 是否结束
})
// aippt+ppt 获取数据
// Promise.all([listClasscourseNew({teacherid: userStore.id,evalid: props.curNode.id,pageSize:1000}), getSelfReserv({ex2:props.curNode.id})]).then(([res1,res2])=>{
// let list = res2.data || []
// let list2 = res1.rows || []
// // list.sort((a,b) => { if(a.status=='上课中') return -1; else return 0 })
// list = list.concat(list2)
// list.sort((a,b) => { return new Date(b.createTime) - new Date(a.createTime) })
// dataList.value = list
// })
/*getSelfReserv().then((res) => {
const list = res.data || []
list.sort((a,b) => { if(a.status=='上课中') return -1; else return 0 })
dataList.value = list
})*/
}
// 列表加载更多
const load = () => {
if(page.isEnd) return console.log('已加载完-所有') // 结束
page.pageNum++
getData()
}
watch(
() => [dataList,toolStore.isToolWin,props.curNode],
() => {
@ -96,13 +125,14 @@ watch(
}
)
onMounted(() => {
getData() // 加载数据
// getData() // 加载数据
})
</script>
<style scoped lang="scss">
.class-reserv-wrap {
height: 100%;
// height: 300px;
display: flex;
flex-direction: column;
//padding: 15px 10px;

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

@ -61,7 +61,8 @@
<div>
<div v-if="myClassActive.filetype=='apt'">开始新的课堂，需要点击先创建课堂，才能显示手机二维码</div>
<div v-else>开始新的课堂，需要点击先创建课堂</div>
<el-button type="warning" :loading="dt.loading" @click="createClasscourse">创建课堂</el-button>
<el-button type="warning" :loading="dt.loading" @click="createClasscourse()">创建课堂</el-button>
<el-button type="success" @click="createClasscourse(true)">公屏上课</el-button>
</div>
</template>
<!-- 故障备用 -->
@ -146,7 +147,7 @@ const open = async (id, classObj) => {
await getAptInfo(id)
// 获取班级列表
getClassList()
console.log('classObj', classObj)
// console.log('classObj', classObj)
// 继续上课
if (!!classObj) {
dt.ctCourse = classObj
@ -245,8 +246,8 @@ const getClasscourseList = async type => {
}
}
}
// 创建课程
const createClasscourse = async () => {
// 创建课程 isPublic 公屏上课
const createClasscourse = async (isPublic = false) => {
const { classid } = classForm.form
if (!classid) {
ElMessage.warning('请选择班级')
@ -255,8 +256,8 @@ const createClasscourse = async () => {
dt.loading = true
const { entpcourseid, evalid, id, coursetitle } = myClassActive.value // 课件对象
const curDate = commUtil.getDateNow('yyyy-MM-dd')
const params = {
id: 0, coursetype: '', courseverid: 0, coursedesc: '', status: '',
const params = { // 公屏上课直接 status = open
id: 0, coursetype: '', courseverid: 0, coursedesc: '', status: isPublic?'open':'',
teacherid: userStore.id, entpcoursefileid: id, classid,
entpcourseid, evalid, coursetitle,
plandate: curDate, opendate: curDate
@ -274,7 +275,7 @@ const createClasscourse = async () => {
setTimeout(async() => {
msgEl.close()
const res = await Http_Classcourse.getClasscourse(teacherForm.form.classcourseid)
openPublicScreen(res.data)
openPublicScreen(res.data, isPublic)
}, 2000);
}, 1000);
}
@ -355,7 +356,7 @@ const getQrUrl = async() => {
}
// 打开公屏
const openPublicScreen = (classcourse) => {
const openPublicScreen = (classcourse, isPublic) => {
console.log('打开公屏', classcourse)
if (!dt.ctCourse) { // 新开课需要发送消息-继续上课不需要直接打开
// 发送app端待开课消息
@ -366,11 +367,14 @@ const openPublicScreen = (classcourse) => {
const resource = toRaw(myClassActive.value)
sessionStore.set('curr.resource', resource) // 缓存当前资源信息
sessionStore.set('curr.classcourse', classcourse) // 缓存当前当前上课
// 公屏开课
sessionStore.set('curr.isPublic', isPublic) // 缓存是否公屏开课
createWindow('open-win', {
url: '/pptist', // 窗口关闭时，清除缓存
close: () => {
sessionStore.set('curr.resource', null) // 清除缓存
sessionStore.set('curr.classcourse', null) // 清除缓存
sessionStore.set('curr.isPublic', null) // 清除缓存
}
})
visible.value = false // 关闭弹窗

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

@ -364,8 +364,8 @@ export default {
// 开始上课
startClass(item, classObj) {
// 关闭状态，打开上课相关功能(已打开，忽略)
// const id = sessionStore.has('activeClass.id') ? sessionStore.get('activeClass.id') : null
// if (id && id == item.id) return ElMessage.warning('当前正在上课，请勿重复操作')
const iscourse = !!sessionStore.get('curr.classcourse')
if (iscourse) return ElMessage.warning('公屏已打开，请勿重复操作')
// 当前上课-store
sessionStore.set('activeClass', item)
this.activeClass = item
@ -376,7 +376,8 @@ export default {
this.$refs.calssRef.open(item.fileId, classObj)
}
if(item.fileFlag === 'aippt') {
this.$refs.calssRef.open(item.fileId, classObj)
if (!!classObj) this.changeClass('continue', classObj) // 继续上课
else this.$refs.calssRef.open(item.fileId, classObj) // 新开课
}
},
// 继续上课-apt
@ -384,7 +385,19 @@ export default {
switch(type) {
case 'continue': { // 继续上课
const aptFileId = row.entpcoursefileid
this.$refs.calssRef.open(aptFileId, row)
const res = await getEntpcoursefile(aptFileId)
if (res.code == 200) {
const resource = res.data
if (resource.filetype != 'aippt') this.$refs.calssRef.open(aptFileId, row)
else {
if (!!sessionStore.get('curr.classcourse')) return ElMessage.warning('公屏已打开，请勿重复操作')
const msgEl = ElMessage.warning({message:'正在打开公屏，请稍后...',duration: 0})
setTimeout(()=>{
msgEl.close()
this.openPublicScreen('class', resource, row) // 打开公屏-窗口
}, 2000)
}
} else ElMessage.error(res.msg||'获取课件信息失败')
break
}
case 'close': { // 关闭上课
@ -437,16 +450,7 @@ export default {
if (row.fileFlag === 'aippt' && !!row.fileId) {
const res = await getEntpcoursefile(row.fileId)
if (res && res.code === 200) {
sessionStore.set('curr.resource', res.data) // 缓存当前资源信息
sessionStore.set('curr.smarttalk', row) // 缓存当前文件smarttalk
createWindow('open-win', {
url: '/pptist', // 窗口关闭时，清除缓存
close: () => {
sessionStore.set('curr.resource', null) // 清除缓存
sessionStore.set('curr.smarttalk', null) // 清除缓存
this.asyncAllFile() // 刷新资源列表
}
})
this.openPublicScreen('edit', res.data, row) // 打开公屏-窗口
} else {
ElMessage.warning(res.msg||'文件获取异常！')
}
@ -457,6 +461,8 @@ export default {
}
case 'wsApp': { // 发送app端待开课消息
// console.log('wsApp', row)
window.test = sessionStore
if (!!sessionStore.get('curr.classcourse')) return ElMessage.warning('公屏已打开，请勿重复操作')
const head = MsgEnum.HEADS.MSG_0000
const data = { id: row.id }
const type = ChatWs.TYPES.single
@ -471,24 +477,38 @@ export default {
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) // 清除缓存
}
})
this.openPublicScreen('class',resource, classcourse) // 打开公屏-窗口
break
}
default:
break
}
},
/**
* description 打开公屏
* @param {string} type 类型 edit 打开 class 上课
* @param {object} resource 资源信息
* @param {object} currData 当前数据 type: edit/class 备课信息 | 课堂信息
*/
openPublicScreen(type, resource, currData) {
sessionStore.set('curr.resource', resource) // 缓存当前资源信息
if (type=='edit') sessionStore.set('curr.smarttalk', currData) // 缓存当前文件smarttalk
else sessionStore.set('curr.classcourse', currData) // 缓存当前当前上课
createWindow('open-win', {
url: '/pptist', // 窗口关闭时，清除缓存
close: () => {
sessionStore.set('curr.resource', null) // 清除缓存
if (type=='edit') {
sessionStore.set('curr.smarttalk', null) // 清除缓存
this.asyncAllFile() // 刷新资源列表
} else sessionStore.set('curr.classcourse', null) // 清除缓存
}
})
},
closeChange() { // 上课弹窗被关闭-触发
// console.log('关闭上课弹窗')
// this.activeClass = null
this.activeClass = null
sessionStore.delete('activeClass')
},
initReserv(id) {
@ -904,6 +924,7 @@ export default {
return getSmarttalkPage({
...this.uploadData,
orderByColumn: 'createTime',
fileFlag: 'aippt',
isAsc: 'desc',
pageSize: 500
})