zdg #146

Merged
zhengdegang merged 3 commits from zdg into main 2024-08-16 17:08:13 +08:00
4 changed files with 9 additions and 9 deletions
Showing only changes of commit 631fcf38f7 - Show all commits

View File

@ -3,7 +3,7 @@
*/ */
// import { ipcMain } from 'electron' // import { ipcMain } from 'electron'
// const TimMain = require('im_electron_sdk/dist/main') // const TimMain = require('im_electron_sdk/dist/main')
import TimMain from 'im_electron_sdk/dist/main' // import TimMain from 'im_electron_sdk/dist/main'
// import {TIMErrCode} from 'im_electron_sdk/dist/enumbers' // import {TIMErrCode} from 'im_electron_sdk/dist/enumbers'
const sdkappidDef = 1600034736 // 可以去腾讯云即时通信IM控制台申请 const sdkappidDef = 1600034736 // 可以去腾讯云即时通信IM控制台申请

View File

@ -3,7 +3,7 @@ import { join } from 'path'
import { electronApp, optimizer, is } from '@electron-toolkit/utils' import { electronApp, optimizer, is } from '@electron-toolkit/utils'
import icon from '../../resources/icon.png?asset' import icon from '../../resources/icon.png?asset'
import File from './file' import File from './file'
import chat from './chat' // chat封装 // import chat from './chat' // chat封装
// 代理 electron/remote // 代理 electron/remote
// 第一步引入remote // 第一步引入remote
import remote from '@electron/remote/main' import remote from '@electron/remote/main'
@ -230,15 +230,14 @@ app.on('window-all-closed', () => {
// 监听全局事件 // 监听全局事件
function handleAll() { function handleAll() {
// chat.initialize() // im-chat 实例 // const chatInstance = chat.initialize() // im-chat 实例
const chatInstance = chat.initialize() // im-chat 实例
// 新窗口创建-监听 // 新窗口创建-监听
ipcMain.on('new-window', (e, data) => { ipcMain.on('new-window', (e, data) => {
const { id, type } = data const { id, type } = data
const win = BrowserWindow.fromId(id) const win = BrowserWindow.fromId(id)
win.type = type // 绑定独立标识 win.type = type // 绑定独立标识
remote.enable(win.webContents) // 开启远程服务 remote.enable(win.webContents) // 开启远程服务
chatInstance.enable(win.webContents) // 开启im-chat // chatInstance.enable(win.webContents) // 开启im-chat
}) })
// 用于监听-状态管理变化-同步所有窗口 // 用于监听-状态管理变化-同步所有窗口
ipcMain.handle('pinia-state-change', (e, storeName, jsonStr) => { ipcMain.handle('pinia-state-change', (e, storeName, jsonStr) => {

View File

@ -1,10 +1,10 @@
import { contextBridge } from 'electron' import { contextBridge } from 'electron'
import { electronAPI } from '@electron-toolkit/preload' import { electronAPI } from '@electron-toolkit/preload'
import TimRender from 'im_electron_sdk/dist/renderer' // im渲染部分实例 // import TimRender from 'im_electron_sdk/dist/renderer' // im渲染部分实例
// Custom APIs for renderer // Custom APIs for renderer
const api = { const api = {
preloadPath: __dirname, // 当前preload地址 preloadPath: __dirname, // 当前preload地址
getTimRender: () => new TimRender(), // im渲染部分实例 // getTimRender: () => new TimRender(), // im渲染部分实例
} }
// Use `contextBridge` APIs to expose Electron APIs to // Use `contextBridge` APIs to expose Electron APIs to
// renderer only if context isolation is enabled, otherwise // renderer only if context isolation is enabled, otherwise

View File

@ -10,7 +10,7 @@
<upvote-vue ref="upvoteRef"></upvote-vue> <upvote-vue ref="upvoteRef"></upvote-vue>
<!-- im-chat 聊天组件 --> <!-- im-chat 聊天组件 -->
<im-chat ref="imChatRef" @change="chatChange" /> <!-- <im-chat ref="imChatRef" @change="chatChange" /> -->
<!-- 底部工具栏 --> <!-- 底部工具栏 -->
<div class="tool-bottom-all" @mouseenter="mouseChange(0)" @mouseleave="mouseChange(1)"> <div class="tool-bottom-all" @mouseenter="mouseChange(0)" @mouseleave="mouseChange(1)">
@ -78,7 +78,8 @@ const btnList = [ // 工具栏按钮列表
// === === // === ===
onMounted(async() => { onMounted(async() => {
setTimeout(() => { setTimeout(() => {
getClassInfo() // ex3 classManageApi.startClass(classObj.id) // -
// getClassInfo() // ex3
resetStatus() // - resetStatus() // -
}, 200); }, 200);
}) })