call-live-sdk1 0.0.31 → 0.0.32

package/dist/call-live-sdk.es.js

@@ -202796,8 +202796,8 @@ const useVideoSlotBinding = ({
         return;
       }
       const [, streamIndex = "main"] = selectedValue.split(fenge);
-      if (!targetUser || streamIndex === "screen" && !targetUser.isScreenEnabled) {
-        console.log(`用户${item.userId}已退出，恢复为空连麦嘉宾`);
+      if (!targetUser || streamIndex === "screen" && !targetUser.isScreenEnabled || targetUser.waiting_mode_state === WaitingModeState.WAITING) {
+        console.log(`用户${item.userId}已退出或被移至等候状态，恢复为空连麦嘉宾`);
         setSelectedValue("");
         try {
           livePlayerRef.current.addEmptyVideoSlot({ id: item.id });
@@ -301593,7 +301593,7 @@ const useRoomMessageHandler = (params = {}) => {
         case "leave":
           return `${type4}`;
         case "waiting_mode":
-          return `${type4}_${(data2 == null ? void 0 : data2.rtc_userid) || userId}_${(data2 == null ? void 0 : data2.waiting_mode_state) || "unknown"}`;
+          return `${type4}_${(data2 == null ? void 0 : data2.rtc_userid) || userId}_${(data2 == null ? void 0 : data2.waiting_mode_state) || "unknown"}_${Date.now()}`;
         case "change_user":
           return `${type4}_${userId}_${(data2 == null ? void 0 : data2.action) || "unknown"}`;
         case "media":
@@ -301720,16 +301720,33 @@ const useRoomMessageHandler = (params = {}) => {
       }
       if (waiting_mode_state === WaitingModeState.ADMITTED) {
         console.log("收到准入消息", waitingData);
-        if (users) {
+        let userFoundInArray = false;
+        if (users && Array.isArray(users)) {
           users.forEach((user) => {
             if (user.rtc_userid === rtc_userid) {
               user.waiting_mode_state = waiting_mode_state;
+              userFoundInArray = true;
+              console.log("在 users 数组中找到目标用户，更新状态", user);
             }
             if (user.rtc_userid) {
               updateCallUser(user.rtc_userid, user);
             }
           });
         }
+        if (!userFoundInArray) {
+          console.warn("users 数组中未找到目标用户，直接使用消息数据更新状态", {
+            rtc_userid,
+            waiting_mode_state,
+            users
+          });
+          updateCallUser(rtc_userid, {
+            waiting_mode_state: WaitingModeState.ADMITTED
+          });
+          console.log("已直接更新用户状态为 ADMITTED", {
+            rtc_userid,
+            waiting_mode_state: WaitingModeState.ADMITTED
+          });
+        }
       }
     } catch (error2) {
       console.error("处理等候模式消息失败", {
@@ -304978,7 +304995,7 @@ const UserVideoContainer = reactExports.memo(({
       noMirror,
       shouldMirror: +!noMirror
     });
-    const isModeFit = user.rtc_userid === callConfig.drawing_board_id || (videoId == null ? void 0 : videoId.includes("screen")) || user.device === "pc";
+    const isModeFit = user.rtc_userid === callConfig.drawing_board_id || (videoId == null ? void 0 : videoId.includes("screen")) || user.device === "pc" || videoId.includes("self");
     window.log.push({
       com: "UserVideoContainer",
       params: {