diff --git a/utils/request.js b/utils/request.js index 1845291..b2450d6 100644 --- a/utils/request.js +++ b/utils/request.js @@ -1,4 +1,5 @@ const apiBase = "https://meeting-api.23544.com/pc" +// const apiBase = "http://192.168.2.9:5192" import { Message } from 'tdesign-miniprogram'; export const Request = (params) => { return new Promise((resolve, reject) => { diff --git a/utils/singlr.ts b/utils/singlr.ts index 26e8fc0..0983b2e 100644 --- a/utils/singlr.ts +++ b/utils/singlr.ts @@ -1,4 +1,6 @@ let connection = '' as any; +// let url = 'http://192.168.2.9:5192' +let url = 'https://meeting-api.23544.com/pc' import * as signalR from "signalr-for-wx"; import { agora } from "./agora"; export const startSignalr = async (callBack: Function) => { @@ -6,7 +8,7 @@ export const startSignalr = async (callBack: Function) => { key: "user", success(res: any) { connection = new signalR.HubConnectionBuilder() - .withUrl(`https://meeting-api.23544.com/pc/session-manage`, { + .withUrl(`${url}/session-manage`, { skipNegotiation: true, transport: signalR.HttpTransportType.WebSockets, accessTokenFactory: () => res.data.token @@ -61,6 +63,10 @@ export const onInvoke = async (str: string, data: any) => { // 离开房间 await connection.invoke(str, data.roomNum) break; + case 'SetSpeakerCallback': + // 发言人设置成功 + await connection.invoke(str, data) + break; } } export const onSignalr = (callBack: Function) => { @@ -190,6 +196,13 @@ export const onSignalr = (callBack: Function) => { driversJsonString }) }); + // 设置发言人 + connection.on("SetSpeaker", (RoomManagerInputDTO) => { + callBack({ + key: 'SetSpeaker', + RoomManagerInputDTO + }) + }); } } export const onStop = async () => { @@ -246,6 +259,7 @@ export const offSignalr = () => { connection.off('DriverList'); connection.off('SetDriver'); connection.off('ShowDriverList'); + connection.off('SetSpeaker'); } }