From 4142e6faf848cff64eaaca76ba1bfa8c42846179 Mon Sep 17 00:00:00 2001
From: al
Date: Tue, 6 Aug 2024 17:50:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E5=80=8D=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package-lock.json | 39 +++++++++++++++++--
package.json | 1 +
src/components/VideoPlayer/index.js | 17 ++++++++
src/components/VideoUploader/index.jsx | 11 ++----
src/pages/CommentsReview/index.jsx | 4 +-
src/pages/CreateAndEditPost/index.jsx | 13 +++----
src/pages/DeletedPostReview/index.jsx | 4 +-
src/pages/EditSpacePost/index.jsx | 13 +++----
src/pages/Feedback/index.jsx | 4 +-
src/pages/GoodsReview/index.jsx | 4 +-
src/pages/MediaReview/index.jsx | 4 +-
src/pages/PostMachineReview/index.jsx | 6 +--
src/pages/StreamerInformation/index.jsx | 10 ++---
.../StreamerInformationCompleteNew/index.jsx | 4 +-
src/pages/StreamerJoin/index.jsx | 6 +--
.../StreamerVideoMachineReview/index.jsx | 6 +--
src/pages/TopPosts/index.jsx | 4 +-
src/pages/ZonePostMachineReview/index.jsx | 4 +-
18 files changed, 94 insertions(+), 60 deletions(-)
create mode 100644 src/components/VideoPlayer/index.js
diff --git a/package-lock.json b/package-lock.json
index 7396e59..80bcda3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,6 +21,7 @@
"react": "^18.2.0",
"react-cookie": "^6.1.1",
"react-dom": "^18.2.0",
+ "react-player": "^2.16.0",
"react-router-dom": "^6.14.2",
"react-scripts": "5.0.1",
"web-vitals": "^2.1.4"
@@ -14552,6 +14553,11 @@
"resolved": "https://registry.npmmirror.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
},
+ "node_modules/load-script": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmmirror.com/load-script/-/load-script-1.0.0.tgz",
+ "integrity": "sha512-kPEjMFtZvwL9TaZo0uZ2ml+Ye9HUMmPwbYRJ324qF9tqMejwykJ5ggTyvzmrbBeapCAbk98BSbTeovHEEP1uCA=="
+ },
"node_modules/loader-runner": {
"version": "4.3.0",
"resolved": "https://registry.npmmirror.com/loader-runner/-/loader-runner-4.3.0.tgz",
@@ -14703,6 +14709,11 @@
"node": ">= 4.0.0"
}
},
+ "node_modules/memoize-one": {
+ "version": "5.2.1",
+ "resolved": "https://registry.npmmirror.com/memoize-one/-/memoize-one-5.2.1.tgz",
+ "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="
+ },
"node_modules/merge-descriptors": {
"version": "1.0.1",
"resolved": "https://registry.npmmirror.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@@ -17760,11 +17771,31 @@
"resolved": "https://registry.npmmirror.com/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
"integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
},
+ "node_modules/react-fast-compare": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmmirror.com/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
+ "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ=="
+ },
"node_modules/react-is": {
"version": "17.0.2",
"resolved": "https://registry.npmmirror.com/react-is/-/react-is-17.0.2.tgz",
"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
},
+ "node_modules/react-player": {
+ "version": "2.16.0",
+ "resolved": "https://registry.npmmirror.com/react-player/-/react-player-2.16.0.tgz",
+ "integrity": "sha512-mAIPHfioD7yxO0GNYVFD1303QFtI3lyyQZLY229UEAp/a10cSW+hPcakg0Keq8uWJxT2OiT/4Gt+Lc9bD6bJmQ==",
+ "dependencies": {
+ "deepmerge": "^4.0.0",
+ "load-script": "^1.0.0",
+ "memoize-one": "^5.1.1",
+ "prop-types": "^15.7.2",
+ "react-fast-compare": "^3.0.1"
+ },
+ "peerDependencies": {
+ "react": ">=16.6.0"
+ }
+ },
"node_modules/react-refresh": {
"version": "0.11.0",
"resolved": "https://registry.npmmirror.com/react-refresh/-/react-refresh-0.11.0.tgz",
@@ -19977,16 +20008,16 @@
}
},
"node_modules/typescript": {
- "version": "5.5.4",
- "resolved": "https://registry.npmmirror.com/typescript/-/typescript-5.5.4.tgz",
- "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
+ "version": "4.9.5",
+ "resolved": "https://registry.npmmirror.com/typescript/-/typescript-4.9.5.tgz",
+ "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
"peer": true,
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"
},
"engines": {
- "node": ">=14.17"
+ "node": ">=4.2.0"
}
},
"node_modules/unbox-primitive": {
diff --git a/package.json b/package.json
index a41801f..513ee9d 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
"react": "^18.2.0",
"react-cookie": "^6.1.1",
"react-dom": "^18.2.0",
+ "react-player": "^2.16.0",
"react-router-dom": "^6.14.2",
"react-scripts": "5.0.1",
"web-vitals": "^2.1.4"
diff --git a/src/components/VideoPlayer/index.js b/src/components/VideoPlayer/index.js
new file mode 100644
index 0000000..e3c6dc9
--- /dev/null
+++ b/src/components/VideoPlayer/index.js
@@ -0,0 +1,17 @@
+import React, { useState } from "react";
+import { Select } from "antd";
+import ReactPlayer from "react-player";
+export default function VideoPlayer({url,key,style}) {
+ const [rate, setRate] = useState(1);
+ return (
+
+
+
+
+ );
+}
diff --git a/src/components/VideoUploader/index.jsx b/src/components/VideoUploader/index.jsx
index 0c2b1c3..a7373c5 100644
--- a/src/components/VideoUploader/index.jsx
+++ b/src/components/VideoUploader/index.jsx
@@ -1,6 +1,6 @@
import React, { useState } from "react";
import { uploadVideo } from "../../utils/upload";
-
+import VideoPlayer from '../VideoPlayer';
const VideoUploader = ({ setIds }) => {
const [selectedVideos, setSelectedVideos] = useState([]);
const [uploading, setUploading] = useState(false);
@@ -64,17 +64,12 @@ const VideoUploader = ({ setIds }) => {
{selectedVideos.map((video, index) => (
-
+ }}/>
{video.uploadStatus === "success" && (
上传成功
diff --git a/src/pages/CommentsReview/index.jsx b/src/pages/CommentsReview/index.jsx
index c5f02a8..80daf1a 100644
--- a/src/pages/CommentsReview/index.jsx
+++ b/src/pages/CommentsReview/index.jsx
@@ -7,7 +7,7 @@ import {
useNavigate,
useLocation,
} from "react-router-dom";
-
+import VideoPlayer from '../../components/VideoPlayer';
const CommentsReviewContent = (props) => {
const current = props.current;
//表头
@@ -58,7 +58,7 @@ const CommentsReviewContent = (props) => {
style={{ marginBottom: 10 }}
/>
) : (
-
+
)
)
: "无"}
diff --git a/src/pages/CreateAndEditPost/index.jsx b/src/pages/CreateAndEditPost/index.jsx
index 1557655..94c777f 100644
--- a/src/pages/CreateAndEditPost/index.jsx
+++ b/src/pages/CreateAndEditPost/index.jsx
@@ -3,7 +3,7 @@ import { Form, Input, Table, Image, Space, Button, Modal, message } from "antd";
import baseRequest from "../../utils/baseRequest";
import ImageUploader from "../../components/ImageUploader";
import VideoUploader from "../../components/VideoUploader";
-
+import VideoPlayer from '../../components/VideoPlayer';
const CreateAndEditPostContent = (props) => {
const { TextArea } = Input;
//表头
@@ -46,7 +46,7 @@ const CreateAndEditPostContent = (props) => {
/>
))}
{data?.videos?.map((item, index) => (
-
+
))}
),
@@ -541,12 +541,9 @@ const CreateAndEditPostContent = (props) => {
{defaultMedia.video_ids.length !== 0 && (
-
+
+
+
))}
{data?.videos?.map((item, index) => (
-
+
))}
),
diff --git a/src/pages/EditSpacePost/index.jsx b/src/pages/EditSpacePost/index.jsx
index 4951c02..b822b47 100644
--- a/src/pages/EditSpacePost/index.jsx
+++ b/src/pages/EditSpacePost/index.jsx
@@ -4,7 +4,7 @@ import baseRequest from "../../utils/baseRequest";
import ImageUploader from "../../components/ImageUploader";
import VideoUploader from "../../components/VideoUploader";
import { useSearchParams } from "react-router-dom";
-
+import VideoPlayer from '../../components/VideoPlayer';
const EditSpacePostContent = (props) => {
const { TextArea } = Input;
const [searchParams, setSearchParams] = useSearchParams();
@@ -59,7 +59,7 @@ const EditSpacePostContent = (props) => {
))}
{data.media.videos.map((item, index) => (
-
+
))}
@@ -509,12 +509,9 @@ const EditSpacePostContent = (props) => {
{defaultMedia.video_ids.length !== 0 && (
-
+
+
+
),
diff --git a/src/pages/GoodsReview/index.jsx b/src/pages/GoodsReview/index.jsx
index 3a12807..e05b4bd 100644
--- a/src/pages/GoodsReview/index.jsx
+++ b/src/pages/GoodsReview/index.jsx
@@ -7,7 +7,7 @@ import {
useNavigate,
useLocation,
} from "react-router-dom";
-
+import VideoPlayer from '../../components/VideoPlayer';
const GoodsReviewContent = (props) => {
const { TextArea } = Input;
const current = props.current;
@@ -49,7 +49,7 @@ const GoodsReviewContent = (props) => {
style={{ marginBottom: 10 }}
/>
) : (
-
+
)
)
: "无"}
diff --git a/src/pages/MediaReview/index.jsx b/src/pages/MediaReview/index.jsx
index 9eda170..8857590 100644
--- a/src/pages/MediaReview/index.jsx
+++ b/src/pages/MediaReview/index.jsx
@@ -7,7 +7,7 @@ import {
useNavigate,
useLocation,
} from "react-router-dom";
-
+import VideoPlayer from '../../components/VideoPlayer';
const MediaReviewContent = (props) => {
const { TextArea } = Input;
const current = props.current;
@@ -59,7 +59,7 @@ const MediaReviewContent = (props) => {
style={{ marginBottom: 10 }}
/>
) : (
-
+
)
)
: "无"}
diff --git a/src/pages/PostMachineReview/index.jsx b/src/pages/PostMachineReview/index.jsx
index 95e61e8..7e9478d 100644
--- a/src/pages/PostMachineReview/index.jsx
+++ b/src/pages/PostMachineReview/index.jsx
@@ -8,7 +8,7 @@ import {
useLocation,
} from "react-router-dom";
import baseRequest from "../../utils/baseRequest";
-
+import VideoPlayer from '../../components/VideoPlayer';
const PostMachineReviewContent = (props) => {
const { TextArea } = Input;
const current = props.current;
@@ -47,7 +47,7 @@ const PostMachineReviewContent = (props) => {
))}
{data.media?.videos?.map((item, index) => (
-
+
))}
@@ -68,7 +68,7 @@ const PostMachineReviewContent = (props) => {
))}
{data.media?.videos?.map((item, index) => (
-
+
))}
diff --git a/src/pages/StreamerInformation/index.jsx b/src/pages/StreamerInformation/index.jsx
index ca7fc32..aa3c2c9 100644
--- a/src/pages/StreamerInformation/index.jsx
+++ b/src/pages/StreamerInformation/index.jsx
@@ -13,7 +13,7 @@ import Modal from "../../components/Modal";
import VideoUploader from "../../components/VideoUploader";
import ImageUploader from "../../components/ImageUploader";
import baseRequest from "../../utils/baseRequest";
-
+import VideoPlayer from '../../components/VideoPlayer';
//tab内容
const StreamerInformationContent = () => {
const { TextArea } = Input;
@@ -120,7 +120,7 @@ const StreamerInformationContent = () => {
dataIndex: "displayVideo",
key: "displayVideo",
render: (data) => (
-
+
),
};
case "displayGallery":
@@ -753,11 +753,7 @@ const StreamerInformationContent = () => {
{defaultMedia.displayVideo.length !== 0 && (
-
+
),
diff --git a/src/pages/ZonePostMachineReview/index.jsx b/src/pages/ZonePostMachineReview/index.jsx
index 582d397..237f908 100644
--- a/src/pages/ZonePostMachineReview/index.jsx
+++ b/src/pages/ZonePostMachineReview/index.jsx
@@ -8,7 +8,7 @@ import {
useLocation,
} from "react-router-dom";
import baseRequest from "../../utils/baseRequest";
-
+import VideoPlayer from '../../components/VideoPlayer';
const ZonePostMachineReviewContent = (props) => {
const { TextArea } = Input;
const current = props.current;
@@ -52,7 +52,7 @@ const ZonePostMachineReviewContent = (props) => {
))}
{data.media.videos.map((item, index) => (
-
+
))}