call-live-sdk1 0.0.6 → 0.0.7

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

@@ -25627,8 +25627,8 @@ const envConfig = {
   },
   guestConfig: {
     el: "",
-    liveId: envConfig$1.env === "development" ? null : 60974,
-    agentId: envConfig$1.env === "development" ? null : 38735989,
+    liveId: envConfig$1.env === "development" ? 60974 : null,
+    agentId: envConfig$1.env === "development" ? 38735989 : null,
     apiDomain: envConfig$1.liveProxyUrl
   },
   styleConfig: {
@@ -82442,7 +82442,7 @@ const renderGridLayout = (ctx2, canvas, layout, get4) => {
       ctx2.strokeStyle = "rgba(51, 51, 51, 0.6)";
       ctx2.lineWidth = 2;
       ctx2.strokeRect(drawX, drawY, drawWidth, drawHeight);
-      if (!area.isVideoEnabled && area.domId.includes("screen")) {
+      if (!area.isVideoEnabled && !area.domId.includes("screen")) {
         get4().renderEmptyUserArea(ctx2, area, drawX, drawY, drawWidth, drawHeight);
       } else {
         const container = document.getElementById(area.domId);
@@ -82483,7 +82483,7 @@ const renderMainPlusListLayout = (ctx2, canvas, originalCanvas, layout, callConf
         return user.videoList && user.videoList.includes(mainCanvasId);
       });
       if (targetUser) {
-        if (!targetUser.isVideoEnabled && mainCanvasId.includes("screen")) {
+        if (!targetUser.isVideoEnabled && !mainCanvasId.includes("screen")) {
           get4().renderEmptyUserArea(
             ctx2,
             targetUser,
@@ -83696,16 +83696,6 @@ const useCallStore = create$c()(
         updateCallUser((callCurrentUser == null ? void 0 : callCurrentUser.rtc_userid) || "", {
           isScreenEnabled: newScreenState
         });
-        if (rtc && rtc.engine) {
-          await rtc.engine.sendRoomMessage(
-            JSON.stringify({
-              type: "screenShare",
-              data: {
-                isSharing: newScreenState
-              }
-            })
-          );
-        }
         return {
           success: true,
           message: newScreenState ? "屏幕共享已开启" : "屏幕共享已关闭",
@@ -83752,13 +83742,32 @@ const useCallStore = create$c()(
       console.log("连麦音频混流", b2);
       set3({ callAudioStreamsRef: b2 });
     },
-    handleRemoteUserPublishScreen: async (userId, isPublishing) => {
-      const { updateCallUser, rtc, callConfig, callAudioMixing } = get4();
-      await rtc.engine.subscribeScreen(userId, MediaType$1.AUDIO);
-      updateCallUser(userId, { isScreenEnabled: isPublishing });
-      if (callConfig.rule === "main") {
-        callAudioMixing();
-        eventBus.emit("audioMixing");
+    handleRemoteUserPublishScreen: async (event) => {
+      var _a2;
+      const { userId } = event;
+      const {
+        updateCallUser,
+        rtc,
+        callConfig,
+        callAudioMixing,
+        findCallUserById
+      } = get4();
+      const user = findCallUserById(userId);
+      if (user) {
+        updateCallUser(userId, {
+          isScreenEnabled: true
+        });
+        setTimeout(() => {
+          rtc == null ? void 0 : rtc.setRemoteScreenCapture(userId, userId + "screen");
+        }, 1e3);
+        if ((callConfig == null ? void 0 : callConfig.rule) === "main") {
+          await ((_a2 = rtc.engine) == null ? void 0 : _a2.subscribeScreen(userId, MediaType$1.AUDIO));
+          callAudioMixing();
+          eventBus.emit("audioMixing");
+        }
+        console.log("[CallStore] 远程用户屏幕共享设置完成:", userId);
+      } else {
+        console.warn("[CallStore] 未找到用户，无法设置屏幕共享:", userId);
       }
     },
     // 处理远程用户停止屏幕共享
@@ -195122,7 +195131,6 @@ class RtcClient {
    * @param {string} domId - 用于渲染视频的DOM元素ID
    */
   async setRemoteVideoPlayer(remoteUserId, domId, renderMode = VideoRenderMode.RENDER_MODE_HIDDEN, isMirror = false) {
-    console.log("setRemoteVideoPlayer", remoteUserId, domId, renderMode, isMirror);
     if (isMirror) {
       await this.engine.setRemoteVideoMirrorType(
         remoteUserId,
@@ -265848,8 +265856,6 @@ const Document$1 = ({
         file_name: option.file.name
       }
     });
-    console.log(option.file.type);
-    console.log(res);
     setLoading(true);
     window.addEventListener("beforeunload", handleBeforeUnload);
     const source = axios.CancelToken.source();
@@ -266177,6 +266183,9 @@ const DocumentControler = ({
     setDocumentIndex(selectedScene.documentIndex);
     handleImageClick(selectedScene.documentIndex);
   }, [currentScene]);
+  reactExports.useEffect(() => {
+    handleImageClick(documentIndex);
+  }, [documentIndex]);
   reactExports.useEffect(() => {
     if (!documentInfo.name) {
       setDocumentScrollLeft(0);
@@ -268159,14 +268168,14 @@ const LivePlayer = ({
         originX: "left",
         originY: "top",
         id: selection.id,
-        imageName: `【连麦嘉宾】${selection.label || selection.userId}${selection.streamIndex === "screen" ? "·屏幕" : "·摄像头"}`,
+        imageName: `【连麦嘉宾】${selection.userName}${selection.streamIndex === "screen" ? "·屏幕" : "·摄像头"}`,
         objectType: "videoSlot",
         element: videoElement,
         // 保存视频元素引用
         userId: selection.userId,
         countt: targetObject.countt + 1,
         streamIndex: selection.streamIndex,
-        userName: targetObject.nickname,
+        userName: selection.userName,
         objectCaching: false,
         // 禁用缓存（6.x 必须设置，否则视频帧静止）
         width: targetObject.width,
@@ -269151,7 +269160,7 @@ const LivePlayer = ({
               children: [/* @__PURE__ */ jsxRuntimeExports.jsx("video", {
                 className: "w-full h-full object-cover",
                 ref: videoRef
-              }), !(isMainCanvasUser == null ? void 0 : isMainCanvasUser.isVideoEnabled) && /* @__PURE__ */ jsxRuntimeExports.jsx("div", {
+              }), !(isMainCanvasUser == null ? void 0 : isMainCanvasUser.isVideoEnabled) && !mainCanvasId.includes("screen") && /* @__PURE__ */ jsxRuntimeExports.jsx("div", {
                 className: "absolute inset-0 bg-gray-800 flex items-center justify-center",
                 children: /* @__PURE__ */ jsxRuntimeExports.jsx("div", {
                   className: "w-12 h-12 bg-gray-600 rounded-full flex items-center justify-center",
@@ -279524,11 +279533,19 @@ const CallUser = reactExports.memo(({
 }) => {
   const {
     toggleAudio,
+    callAudioMixing,
     callCurrentUser,
     callConfig,
     toggleVideo,
     getter
-  } = useCallStore();
+  } = useCallStore((state) => ({
+    toggleAudio: state.toggleAudio,
+    callAudioMixing: state.callAudioMixing,
+    callCurrentUser: state.callCurrentUser,
+    callConfig: state.callConfig,
+    toggleVideo: state.toggleVideo,
+    getter: state.getter
+  }));
   const [isEditing, setIsEditing] = reactExports.useState(false);
   const {
     handleUpdateName,
@@ -279665,7 +279682,12 @@ const CallUser = reactExports.memo(({
     }), /* @__PURE__ */ jsxRuntimeExports.jsxs("div", {
       className: "flex items-center space-x-2",
       children: [isCurrentUser ? /* @__PURE__ */ jsxRuntimeExports.jsx("span", {
-        onClick: () => toggleAudio(),
+        onClick: () => {
+          toggleAudio().then(() => {
+            callAudioMixing();
+            eventBus.emit("audioMixing");
+          });
+        },
         className: `cursor-pointer p-1 ${user.isAudioEnabled ? "text-green-500 hover:text-green-600" : "text-red-500 hover:text-red-600"}`,
         title: user.isAudioEnabled ? "点击静音" : "点击取消静音",
         children: user.isAudioEnabled ? /* @__PURE__ */ jsxRuntimeExports.jsx(RefIcon$1h, {
@@ -280306,7 +280328,7 @@ const MediaSettings = () => {
       staticMethods.error("美颜功能初始化失败");
     }
   }, [rtc]);
-  const handleBeautyToggle = reactExports.useCallback((enabled) => {
+  reactExports.useCallback((enabled) => {
     if (!beautyExtension || !beautyCompatible) {
       staticMethods.warning("美颜功能不可用");
       return;
@@ -280328,7 +280350,7 @@ const MediaSettings = () => {
       staticMethods.error("美颜开关操作失败");
     }
   }, [beautyExtension, beautyCompatible]);
-  const handleBeautyIntensityChange = reactExports.useCallback(
+  reactExports.useCallback(
     debounce$6((type4, value) => {
       if (!beautyExtension || !beautyCompatible) {
         return;
@@ -280534,102 +280556,6 @@ const MediaSettings = () => {
                   size: "small"
                 })]
               })
-            }), /* @__PURE__ */ jsxRuntimeExports.jsx("div", {
-              className: "mt-8 border-t pt-6",
-              children: /* @__PURE__ */ jsxRuntimeExports.jsxs("div", {
-                className: "mb-4",
-                children: [/* @__PURE__ */ jsxRuntimeExports.jsxs("h3", {
-                  className: "text-lg font-medium mb-4 flex items-center",
-                  children: [/* @__PURE__ */ jsxRuntimeExports.jsx("span", {
-                    className: "mr-2",
-                    children: "🎨"
-                  }), "美颜设置", !beautyCompatible && /* @__PURE__ */ jsxRuntimeExports.jsx("span", {
-                    className: "ml-2 text-xs text-red-500 bg-red-50 px-2 py-1 rounded",
-                    children: "不支持"
-                  })]
-                }), /* @__PURE__ */ jsxRuntimeExports.jsxs("div", {
-                  className: "flex items-center justify-between mb-4",
-                  children: [/* @__PURE__ */ jsxRuntimeExports.jsx("span", {
-                    className: "text-sm",
-                    children: "启用美颜"
-                  }), /* @__PURE__ */ jsxRuntimeExports.jsx(Switch, {
-                    checked: beautySettings.enabled,
-                    onChange: handleBeautyToggle,
-                    disabled: !beautyCompatible,
-                    size: "small"
-                  })]
-                }), beautySettings.enabled && beautyCompatible && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", {
-                  className: "space-y-4",
-                  children: [/* @__PURE__ */ jsxRuntimeExports.jsxs("div", {
-                    children: [/* @__PURE__ */ jsxRuntimeExports.jsxs("div", {
-                      className: "flex items-center justify-between mb-2",
-                      children: [/* @__PURE__ */ jsxRuntimeExports.jsx("span", {
-                        className: "text-sm",
-                        children: "美白强度"
-                      }), /* @__PURE__ */ jsxRuntimeExports.jsxs("span", {
-                        className: "text-xs text-gray-500",
-                        children: [Math.round(beautySettings.whiteIntensity * 100), "%"]
-                      })]
-                    }), /* @__PURE__ */ jsxRuntimeExports.jsx(Slider2, {
-                      min: 0,
-                      max: 1,
-                      step: 0.1,
-                      value: beautySettings.whiteIntensity,
-                      onChange: (value) => handleBeautyIntensityChange("white", value),
-                      tooltip: {
-                        formatter: (value) => `${Math.round((value || 0) * 100)}%`
-                      }
-                    })]
-                  }), /* @__PURE__ */ jsxRuntimeExports.jsxs("div", {
-                    children: [/* @__PURE__ */ jsxRuntimeExports.jsxs("div", {
-                      className: "flex items-center justify-between mb-2",
-                      children: [/* @__PURE__ */ jsxRuntimeExports.jsx("span", {
-                        className: "text-sm",
-                        children: "磨皮强度"
-                      }), /* @__PURE__ */ jsxRuntimeExports.jsxs("span", {
-                        className: "text-xs text-gray-500",
-                        children: [Math.round(beautySettings.smoothIntensity * 100), "%"]
-                      })]
-                    }), /* @__PURE__ */ jsxRuntimeExports.jsx(Slider2, {
-                      min: 0,
-                      max: 1,
-                      step: 0.1,
-                      value: beautySettings.smoothIntensity,
-                      onChange: (value) => handleBeautyIntensityChange("smooth", value),
-                      tooltip: {
-                        formatter: (value) => `${Math.round((value || 0) * 100)}%`
-                      }
-                    })]
-                  }), /* @__PURE__ */ jsxRuntimeExports.jsxs("div", {
-                    children: [/* @__PURE__ */ jsxRuntimeExports.jsxs("div", {
-                      className: "flex items-center justify-between mb-2",
-                      children: [/* @__PURE__ */ jsxRuntimeExports.jsx("span", {
-                        className: "text-sm",
-                        children: "锐化强度"
-                      }), /* @__PURE__ */ jsxRuntimeExports.jsxs("span", {
-                        className: "text-xs text-gray-500",
-                        children: [Math.round(beautySettings.sharpenIntensity * 100), "%"]
-                      })]
-                    }), /* @__PURE__ */ jsxRuntimeExports.jsx(Slider2, {
-                      min: 0,
-                      max: 1,
-                      step: 0.1,
-                      value: beautySettings.sharpenIntensity,
-                      onChange: (value) => handleBeautyIntensityChange("sharpen", value),
-                      tooltip: {
-                        formatter: (value) => `${Math.round((value || 0) * 100)}%`
-                      }
-                    })]
-                  })]
-                }), !beautyCompatible && /* @__PURE__ */ jsxRuntimeExports.jsx(Alert, {
-                  message: "美颜功能不可用",
-                  description: "您的浏览器不支持美颜功能，请使用 Chrome 78+ 或其他兼容浏览器",
-                  type: "warning",
-                  showIcon: true,
-                  icon: /* @__PURE__ */ jsxRuntimeExports.jsx(RefIcon, {}),
-                  className: "mt-4"
-                })]
-              })
             })]
           })
         })
@@ -291478,8 +291404,7 @@ const useRoomMessageHandler = (params = {}) => {
     getter,
     callConfig,
     setCallUsers,
-    callUsers,
-    callCurrentUser
+    callUsers
   } = useCallStore((state) => ({
     toggleAudio: state.toggleAudio,
     toggleVideo: state.toggleVideo,
@@ -291951,9 +291876,10 @@ const useRoomMessageHandler = (params = {}) => {
       const {
         users
       } = data2.data;
-      console.log("同步到的用户列表", users);
+      console.log("同步到的用户列表", userId, users);
       if (userId === callConfig.host_rtc_userid) {
-        setCallUsers(users.map((v3) => v3.rtc_userid === callConfig.rtc_userid ? callCurrentUser : v3));
+        console.log("callCurrentUser", getter().callCurrentUser);
+        setCallUsers(users.map((v3) => v3.rtc_userid === callConfig.rtc_userid ? getter().callCurrentUser : v3));
       }
     }
   }, []);
@@ -304605,9 +304531,6 @@ const MetaItem = ({
     }
   }, [callConfig.isCall]);
   const targetUser = reactExports.useMemo(() => availableStreams.find((user) => user.rtc_userid === (selectedValue == null ? void 0 : selectedValue.split(fenge)[0])), [selectedValue, availableStreams]);
-  console.log("selectedValue?.split(fenge)[0]", selectedValue == null ? void 0 : selectedValue.split(fenge)[0]);
-  console.log("availableStreams", availableStreams);
-  console.log("targetUser", targetUser);
   reactExports.useEffect(() => {
     var _a3;
     if (item.objectType !== "videoSlot" || !livePlayerRef.current)