call-live-sdk1 0.0.32 → 0.0.34

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

@@ -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("摄像头切换失败");
@@ -290637,20 +290682,25 @@ const WaitingUserList = ({
   waitingUsers
 }) => {
   const {
-    callUsers,
+    updateCallUser,
     getter,
     kickRoomUser
   } = useCallStore();
   const handleAdmitUser = (userId) => {
     var _a2;
+    updateCallUser(userId, {
+      waiting_mode_state: WaitingModeState.ADMITTED
+    });
+    const latestCallUsers = getter().callUsers;
     (_a2 = getter().rtc) == null ? void 0 : _a2.engine.sendRoomMessage(JSON.stringify({
       type: "waiting_mode",
       data: {
         rtc_userid: userId,
         waiting_mode_state: WaitingModeState.ADMITTED,
-        users: callUsers.map((user) => ({
+        users: latestCallUsers.map((user) => ({
           rtc_userid: user.rtc_userid,
-          waiting_mode_state: user.waiting_mode_state
+          // 如果是当前准入的用户，使用最新的 ADMITTED 状态
+          waiting_mode_state: user.rtc_userid === userId ? WaitingModeState.ADMITTED : user.waiting_mode_state
         }))
       }
     }));
@@ -301766,9 +301816,17 @@ const useRoomMessageHandler = (params = {}) => {
     console.log("处理用户变更消息", {
       user,
       users,
-      action
+      action,
+      senderId: userid
     });
     try {
+      if (action === "confirm" && (user == null ? void 0 : user.waiting_mode_state) === WaitingModeState.ADMITTED) {
+        console.log(`[准入确认] 用户 ${userid} 确认准入`);
+        updateCallUser(userid, {
+          waiting_mode_state: WaitingModeState.ADMITTED
+        });
+        return;
+      }
       if (user) {
         updateCallUser(userid, {
           ...user
@@ -301801,7 +301859,7 @@ const useRoomMessageHandler = (params = {}) => {
         userid
       });
     }
-  }, [updateCallUser]);
+  }, [updateCallUser, callConfig.rtc_userid]);
   const handleChangeMediaMessage = reactExports.useCallback((data2, userid) => {
     var _a2;
     const mediaData = data2.data;