Merge pull request #233 from hepengwei/feat_he

调试
hepengwei · Dec 14, 2023 · bbd29ac · bbd29ac
2 parents ca347cb + dfa1699
commit bbd29ac
Show file tree

Hide file tree

Showing 10 changed files with 218 additions and 134 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="UTF-8"/><link rel="icon" href="public/favicon.ico"/><meta name="keywords" content="visualization,collection,css3,canvas,threejs,前端"/><meta name="description" content="一个专注于前端视觉效果的集合应用，包含CSS动效、Canvas动画、Three.js3D、人工智能应用等上百个案例"/><meta name="author" content="River,100741801@qq.com"/><meta name="copyright" content="River"/><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="renderer" content="webkit"/><meta http-equiv="cache-control" content="no-cache"/><meta http-equiv="Content-Security-Policy" content="frame-ancestors https://michellez.cn"/><title>Visualization Collection</title><script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-2891754467184980" crossorigin="anonymous"></script><script defer="defer" src="chunk-tensorflow_tfjs_core.js"></script><script defer="defer" src="chunk-tensorflow_tfjs_webgl.js"></script><script defer="defer" src="chunk-echarts.js"></script><script defer="defer" src="antd.js"></script><script defer="defer" src="chunk-tensorflow_models.js"></script><script defer="defer" src="501.js"></script><script defer="defer" src="main.js"></script><link href="styles/main.css" rel="stylesheet"></head><body><div id="root"></div></body><script src="https://cdn.jsdelivr.net/npm/echarts@5.4.0/dist/echarts.min.js" async></script></html>
+<!doctype html><html lang="en"><head><meta charset="UTF-8"/><link rel="icon" href="public/favicon.ico"/><meta name="keywords" content="visualization,collection,css3,canvas,threejs,前端"/><meta name="description" content="一个专注于前端视觉效果的集合应用，包含CSS动效、Canvas动画、Three.js3D、人工智能应用等上百个案例"/><meta name="author" content="River,100741801@qq.com"/><meta name="copyright" content="River"/><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="renderer" content="webkit"/><meta http-equiv="cache-control" content="no-cache"/><title>Visualization Collection</title><script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-2891754467184980" crossorigin="anonymous"></script><script defer="defer" src="chunk-tensorflow_tfjs_core.js"></script><script defer="defer" src="chunk-tensorflow_tfjs_webgl.js"></script><script defer="defer" src="chunk-echarts.js"></script><script defer="defer" src="antd.js"></script><script defer="defer" src="chunk-tensorflow_models.js"></script><script defer="defer" src="501.js"></script><script defer="defer" src="main.js"></script><link href="styles/main.css" rel="stylesheet"></head><body><div id="root"></div></body><script src="https://cdn.jsdelivr.net/npm/echarts@5.4.0/dist/echarts.min.js" async></script></html>
diff --git a/docs/main.js b/docs/main.js
diff --git a/docs/vc-service-worker.js b/docs/vc-service-worker.js
diff --git a/public/index.html b/public/index.html
@@ -17,10 +17,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="renderer" content="webkit" />
     <meta http-equiv="cache-control" content="no-cache" />
-    <meta
-      http-equiv="Content-Security-Policy"
-      content="frame-ancestors https://michellez.cn"
-    />
     <title>Visualization Collection</title>
     <script
       async

diff --git a/scripts/webpack.prod.js b/scripts/webpack.prod.js
@@ -23,7 +23,6 @@ const prodConfig = {
           },
         },
         resolveApp("CNAME"),
-        resolveApp("vc-service-worker.js"),
       ],
     }),
   ],

diff --git a/src/components/InteractionEyes/index.tsx b/src/components/InteractionEyes/index.tsx
@@ -4,22 +4,22 @@
 import React, { useRef, useMemo, useEffect } from "react";
 import { useGlobalContext } from "hooks/useGlobalContext";
 import useQuantumEntanglement from "hooks/useQuantumEntanglement";
-import { IFRAME_ID, THAT_PAGE_URL, SERVICE_WORKER_FILE } from "constants/common";
+import { IFRAME_ID, THAT_PAGE_URL, RECEIVE_SELF_KEY, RECEIVE_THAT_KEY } from "constants/common";
 import styles from "./index.module.scss";
 
-const receiveKey = "bPageInfo";
+
 const eyeSize = 28;
 const eyeballSize = 10;
 
 const InteractionEyes = () => {
   const { locale } = useGlobalContext();
   const containerRef = useRef<HTMLDivElement>(null);
 
-  const { thatPageInfo, resendMessage } = useQuantumEntanglement(
+  const { interactPageInfo, resendMessage } = useQuantumEntanglement(
     IFRAME_ID,
     THAT_PAGE_URL,
-    receiveKey,
-    SERVICE_WORKER_FILE,
+    RECEIVE_SELF_KEY,
+    RECEIVE_THAT_KEY,
     containerRef
   );
 
@@ -30,8 +30,8 @@ const InteractionEyes = () => {
 
   const eyebalInfo: { eyeballLeft: number; eyeballTop: number } | null =
     useMemo(() => {
-      if (containerRef.current && thatPageInfo) {
-        const { x, y } = thatPageInfo;
+      if (containerRef.current && interactPageInfo) {
+        const { x, y } = interactPageInfo;
         const { top, left, width, height } =
           containerRef.current.getBoundingClientRect();
         const selfX = left + window.screenLeft + width / 2;
@@ -47,7 +47,7 @@ const InteractionEyes = () => {
         return { eyeballLeft: 0, eyeballTop: 0 };
       }
       return null;
-    }, [thatPageInfo]);
+    }, [interactPageInfo]);
 
   return (
     <div className={styles.container} ref={containerRef}>

diff --git a/src/constants/common.ts b/src/constants/common.ts
@@ -12,7 +12,7 @@ export const ECHART_COMMON_COLOR = [
 ];
 
 export const IFRAME_ID = "bIframe";
-// export const THAT_PAGE_URL = "http://localhost:3003";
-export const THAT_PAGE_URL = "https://michellez.cn";
-export const THAT_PAGE_PASSWORD = '123456';
-export const SERVICE_WORKER_FILE = "vc-service-worker.js";
+export const THAT_PAGE_URL = "http://localhost:3003";
+export const RECEIVE_SELF_KEY = "selfPageInfoList";
+export const RECEIVE_THAT_KEY = "bPageInfo";
+