zhuhao
/
AIx_Smarttalk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 26 Wiki Activity

Merge pull request 'zdg' (#332) from zdg into main 

Reviewed-on: #332
This commit is contained in:
zhengdegang 2024-10-18 17:08:45 +08:00
parent e02f67e3e5 a3b940f138
commit e8763793a7
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/renderer/src/plugins/imChat/index.js
View File

@ -285,8 +285,11 @@ export class ImChat {
// callback: (data) => {} // callback: (data) => {}
} }
// console.log('发送消息', option) // console.log('发送消息', option)
this.setConsole('%cim-chat: 发送消息', option) this.setConsole('%cim-chat: 发送消息【req】', conv_id, msg)
return this.timChat.TIMMsgSendMessageV2(option) return this.timChat.TIMMsgSendMessageV2(option).then(res => {
this.setConsole('%cim-chat: 发送消息【res】', JSON.stringify(res))
return res
})
} }
/** /**
* @description 发送群消息 * @description 发送群消息

2
src/renderer/src/views/tool/components/homework.vue
View File

@ -128,7 +128,7 @@ const closeHomework = async() => {
const successHomework = (data)=>{ const successHomework = (data)=>{
// console.log('推送成功', data) // console.log('推送成功', data)
// 发送im消息-推送作业(app|平板) // 发送im消息-推送作业(app|平板)
ipcMsgInvoke('im-chat:msg', data, MsgEnum.HEADS.MSG_0016) // ipcMsgInvoke('im-chat:msg', data, MsgEnum.HEADS.MSG_0016)
} }
// 章节目录change // 章节目录change
const changeChapter = async (data)=>{ const changeChapter = async (data)=>{

2
src/renderer/src/views/tool/components/imChat.vue
View File

@ -12,7 +12,7 @@ const props = defineProps({
}) })
const imChatObj = reactive({imChat:null}) const imChatObj = reactive({imChat:null})
onMounted(() => { onMounted(() => {
ipcMainHandle() // 绑定-监听ipcMain im相关消息 // ipcMainHandle() // 绑定-监听ipcMain im相关消息
}) })
// 初始化 im-chat // 初始化 im-chat
const initImChat = async (timGroupId) => { const initImChat = async (timGroupId) => {

4
src/renderer/src/views/tool/sphere.vue
View File

@ -105,7 +105,7 @@ const getClassInfo = async () => {
const chat = await imChatRef.value?.initImChat(timGroupId) // 初始化im-chat const chat = await imChatRef.value?.initImChat(timGroupId) // 初始化im-chat
if (!timGroupId) timGroupId = chat?.timGroupId if (!timGroupId) timGroupId = chat?.timGroupId
if (!timGroupId) return ElMessage.error('房间创建-失败') if (!timGroupId) return ElMessage.error('房间创建-失败')
classManageApi.startClass(classObj.id, timGroupId) // 开始上课 if (data.status != '上课中') classManageApi.startClass(classObj.id, timGroupId) // 开始上课
} }
// 切换tab-change // 切换tab-change
const tabChange = (val) => { const tabChange = (val) => {
@ -158,7 +158,7 @@ const touchChange = (e) => {
const chatChange = (type, data, ...args) => { const chatChange = (type, data, ...args) => {
if (type == 'createGroup') { // 创建群-监听 if (type == 'createGroup') { // 创建群-监听
console.log('创建群:', data) console.log('创建群:', data)
!!data && classManageApi.startClass(classObj.id, data) // !!data && classManageApi.startClass(classObj.id, data)
} else if (type == 'msg') { // im-chat 消息监听 } else if (type == 'msg') { // im-chat 消息监听
if (!data) return // 没有msg数据 message_msg_id if (!data) return // 没有msg数据 message_msg_id
const msgId = (args||[])[0].message_msg_id const msgId = (args||[])[0].message_msg_id