diff --git a/components/ImagesMask/index.jsx b/components/ImagesMask/index.jsx index 3745ae3..904c6fa 100644 --- a/components/ImagesMask/index.jsx +++ b/components/ImagesMask/index.jsx @@ -227,6 +227,10 @@ const ImagesMaskContaint = forwardRef( return newImages; }); + Toast.show({ + content: "已切换至原图", + position: "top", + }); }; return ( diff --git a/components/Websocket/index.jsx b/components/Websocket/index.jsx index 79d3748..7fd4081 100644 --- a/components/Websocket/index.jsx +++ b/components/Websocket/index.jsx @@ -21,7 +21,7 @@ const WebSocketComponent = ({ getData, authInfo }) => { if (!socketRef.current && account) { retryInterval = Math.min(retryInterval * 2, maxInterval); const timer = setInterval(() => { - if (socketRef.current?.readyState !== 1) { + if (socketRef.current?.readyState !== 1 && account) { if (socketRef.current) { socketRef.current?.close(); socketRef.current = null; @@ -47,7 +47,8 @@ const WebSocketComponent = ({ getData, authInfo }) => { const connect_socket = () => { const base = baseRequest(); const account = get("account"); - if (socketRef.current?.readyState === 1) return; + // console.log(account); + if (socketRef.current?.readyState === 1 || !account) return; // 创建WebSocket连接 socketRef.current = new WebSocket( `${process.env.NEXT_PUBLIC_WEBSOCKET_URL}/ws?b_mid=${base.b_mid}&b_dt=1&b_token=${base.b_token}&b_ch=h5` @@ -69,7 +70,7 @@ const WebSocketComponent = ({ getData, authInfo }) => { reader.readAsText(event.data, "utf-8"); reader.onload = function (e) { if (reader.result === "pong") { - console.log("pong received"); + // console.log("pong received"); } try { const data = JSON.parse(reader.result); @@ -97,11 +98,11 @@ const WebSocketComponent = ({ getData, authInfo }) => { // 连接关闭时触发 socketRef.current.onclose = () => { - console.log("WebSocket closed.", socketRef.current.readyState); + // console.log("WebSocket closed.", socketRef.current.readyState); clearInterval(interval); if (account) { - console.log("WebSocket closed--------.", account); + // console.log("WebSocket closed--------.", account); setTimeout(connect_socket, 1000); // retryInterval = Math.min(retryInterval * 2, maxInterval); }