call-live-sdk1 0.0.31 → 0.0.33

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 });
@@ -202847,6 +202847,48 @@ const useVideoSlotBinding = ({
     livePlayerRef,
     getter
   ]);
+  reactExports.useEffect(() => {
+    const handleLocalCameraChanged = () => {
+      var _a2;
+      if (item.objectType !== "videoSlot" || !selectedValue || !livePlayerRef.current)
+        return;
+      const [userId] = selectedValue.split(fenge);
+      const { callConfig } = useCallStore.getState();
+      if (userId !== callConfig.rtc_userid)
+        return;
+      console.log("检测到本地摄像头切换，重新绑定视频槽:", item.id);
+      const canvas = getter().fabricInstance;
+      if (!canvas) {
+        console.error("画布未初始化");
+        return;
+      }
+      const videoSlotObj = (_a2 = canvas.getObjects()) == null ? void 0 : _a2.find((o2) => o2.id === item.id);
+      if (!videoSlotObj) {
+        console.error("找不到对应的连麦嘉宾对象:", item.id);
+        return;
+      }
+      const [, streamIndex = "main"] = selectedValue.split(fenge);
+      const user = callUsers.find((user2) => user2.rtc_userid === userId);
+      if (user && user.isVideoEnabled) {
+        try {
+          livePlayerRef.current.bindVideoSlotToFirstEmpty({
+            id: item.id,
+            userId,
+            streamIndex: streamIndex === "screen" ? "screen" : "main",
+            userName: user.nickname
+          });
+          videoSlotObj.userId = userId;
+          videoSlotObj.streamIndex = streamIndex;
+        } catch (bindError) {
+          console.error("重新绑定视频流失败:", bindError);
+        }
+      }
+    };
+    eventBus.on("localCameraChanged", handleLocalCameraChanged);
+    return () => {
+      eventBus.off("localCameraChanged", handleLocalCameraChanged);
+    };
+  }, [item, selectedValue, fenge, livePlayerRef, getter, callUsers]);
   return {
     selectedValue,
     setSelectedValue,
@@ -279779,6 +279821,9 @@ const MediaSettings = () => {
               cameraId: newCameraId
             }
           });
+          eventBus.emit("localCameraChanged", {
+            cameraId: newCameraId
+          });
         } else {
           console.error("摄像头切换失败:", result.message);
           staticMethods.error("摄像头切换失败");
@@ -301593,7 +301638,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 +301765,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 +305040,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: {