gemercheung vor 2 Jahren
Ursprung
Commit
10fb105502

+ 2 - 1
src/components/chatRoom/chatroom.scss

@@ -60,7 +60,8 @@
     border-radius: 0.8rem;
     position: fixed;
     top: 0.56rem;
-    left: 0.64rem;
+    // left: 0.64rem;
+    left: 0.24rem;
     padding: 0;
     display: flex;
     align-items: center;

+ 11 - 0
src/components/chatRoom/roomControl.ts

@@ -68,6 +68,17 @@ export function initSocketEvent(socket: SocketIOClient.Socket): void {
           handleTimeOutError();
         }
       } else {
+        //火调项目放行
+        if (roomId.indexOf('fd_') > -1) {
+          if (rtcStore.role === 'leader') {
+            params.roomConfig = {
+              masterId: rtcStore.userId,
+              limit: limit,
+            };
+          }
+          socket.emit('join', params);
+          return;
+        }
         //临时房间放行
         if (roomId.indexOf('temp_') > -1) {
           if (rtcStore.role === 'leader') {

+ 14 - 3
src/hooks/useRoom.ts

@@ -169,11 +169,22 @@ export const shareRoom = async (roomId: string, userId: string) => {
 // if (roomId) {
 //   shopAxios.get('/takelook/roomAddView', { params: { roomId } });
 // }
-
-export const getSign = async (userId: string): Promise<getSignType> => {
-  const res = await shopAxios.get<AxiosResponse>('/takelook/tencentYun/getSign', {
+export const GET_COMMON_SIG = '/takelook/rtcMedia/getToken';
+
+export const getSign = async (
+  userId: string,
+  channelName: string,
+  roleId: string,
+): Promise<getSignType> => {
+  let role = 0;
+  if (roleId === 'leader') {
+    role = 1;
+  }
+  const res = await shopAxios.get<AxiosResponse>(GET_COMMON_SIG, {
     params: {
       userId,
+      roleId: role,
+      channelName,
     },
   });
   return res.data.data;