瀏覽代碼

优化joinRoom通知

gemercheung 3 年之前
父節點
當前提交
b6841bb54f
共有 2 個文件被更改,包括 13 次插入24 次删除
  1. 13 13
      src/controller/room/assistant.js
  2. 0 11
      src/controller/room/index.js

+ 13 - 13
src/controller/room/assistant.js

@@ -198,19 +198,19 @@ export class RoomAssistant {
       await this.buildRoom(roomId, userId, user);
       this.room.logger.error("不存在房间", roomId);
     }
-    if (!isJoinRoom) {
-      this.room.logger.info("加入房间 :", { userId, roomId, user });
-      this.socket.join(roomId);
-      const AllRoomUsers = await getAllRoomUsers(roomId);
-      const roomConfig = await getRoomConfig(roomId);
-      this.socket.broadcast.to(roomId).emit(EVENT.roomIn, {
-        user,
-        roomsPerson: AllRoomUsers,
-        roomsConfig: roomConfig,
-      });
-    } else {
-      this.room.logger.info(`已加入房间 :`, { userId });
-    }
+    // if (!isJoinRoom) {
+    this.room.logger.info("加入房间 :", { userId, roomId, user });
+    this.socket.join(roomId);
+    const AllRoomUsers = await getAllRoomUsers(roomId);
+    const roomConfig = await getRoomConfig(roomId);
+    this.socket.broadcast.to(roomId).emit(EVENT.roomIn, {
+      user,
+      roomsPerson: AllRoomUsers,
+      roomsConfig: roomConfig,
+    });
+    // } else {
+    //   this.room.logger.info(`已加入房间 :`, { userId });
+    // }
   }
 
   /**

+ 0 - 11
src/controller/room/index.js

@@ -319,17 +319,6 @@ export class RoomController extends BasicController {
             roomId: this.user.roomId,
           });
           //TODO someOneInRoom是用来触发语音与更新房间状态
-          setTimeout(() => {
-            // this.socket.emit("someOneInRoom", {
-            //   user: this.user,
-            //   roomsPerson: AllRoomUsers,
-            // });
-            this.socket.broadcast.to(roomId).emit(EVENT.roomPersonChange, {
-              user: this.user,
-              actionName: "inRoom",
-              roomsPerson: AllRoomUsers,
-            });
-          }, 500);
         }
         //TODO someOneInRoom是用来触发语音与更新房间状态
         // setTimeout(() => {