Browse Source

增加closeRoom silent开关

gemercheung 2 năm trước cách đây
mục cha
commit
87c0dd3b21

+ 1 - 1
src/controller/connectController.js

@@ -29,7 +29,7 @@ export class ConnectController extends BasicController {
         if (disMissRoomId === roomId) {
         if (disMissRoomId === roomId) {
           this.logger.info("subscribe-订阅-配对", disMissRoomId, userId, roomId, user);
           this.logger.info("subscribe-订阅-配对", disMissRoomId, userId, roomId, user);
           this.roomController.roomAssistant.notifyRoomDismiss(roomId);
           this.roomController.roomAssistant.notifyRoomDismiss(roomId);
-          this.roomController.roomAssistant.stopCall(roomId, userId, user);
+          this.roomController.roomAssistant.stopCall(roomId, userId, user, true);
           this.roomController.roomAssistant.destoryRoom(sessionId, roomConfigId);
           this.roomController.roomAssistant.destoryRoom(sessionId, roomConfigId);
         }
         }
       }
       }

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

@@ -271,11 +271,11 @@ export class RoomAssistant {
    * @param {*} userUniqueId
    * @param {*} userUniqueId
    * @param {*} roomUniqueId
    * @param {*} roomUniqueId
    */
    */
-  async closeRoom(roomId, userId, user) {
+  async closeRoom(roomId, userId, user, silent = false) {
     try {
     try {
       this.room.logger.info("房主关闭房间", userId);
       this.room.logger.info("房主关闭房间", userId);
       console.log("isInRoom", this.socket.rooms.has(roomId));
       console.log("isInRoom", this.socket.rooms.has(roomId));
-      this.socket.broadcast.to(roomId).emit(EVENT.roomClose, { code: 3002, msg: CODEMEG[3002] });
+      !silent && this.socket.broadcast.to(roomId).emit(EVENT.roomClose, { code: 3002, msg: CODEMEG[3002] });
       await removeRoomAllUsers(roomId);
       await removeRoomAllUsers(roomId);
       this.socket.leave(roomId);
       this.socket.leave(roomId);
     } catch (error) {
     } catch (error) {
@@ -417,11 +417,11 @@ export class RoomAssistant {
    * @param {*} user
    * @param {*} user
    */
    */
 
 
-  stopCall(roomId, userId, user) {
+  stopCall(roomId, userId, user, silent = false) {
     if (!this.room.isHoster(user.role)) {
     if (!this.room.isHoster(user.role)) {
       this.leaveRoom(roomId, userId, user);
       this.leaveRoom(roomId, userId, user);
     } else {
     } else {
-      this.closeRoom(roomId, userId, user);
+      this.closeRoom(roomId, userId, user, silent);
     }
     }
     this.removeRoomSession(this.room);
     this.removeRoomSession(this.room);
   }
   }