- {
- videoId &&
-
- }
-
-
-
+ visible={videoVisible}
+ setVisible={this.setVideoVisible}
+ className="showVideoModal"
+ width={800 - 1}
+ >
+ {videoId &&
}
+
+
+
{
upload ?
-
uploadVideo()}>
- :
-
- {
- videos && videos.length > 0 ?
-
- 共 {videoData && videoData.count} 个视频
-
- {
- videos.map((item,key)=>{
- return(
-
-
- )
- })
- }
+
uploadVideo()}>
+ :
+
+ {
+ videos && videos.length > 0 ?
+
+ 共 {videoData && videoData.count} 个视频
+
+ {
+ videos.map((item, key) => {
+ return (
+
+
+ )
+ })
+ }
+
+
+ :
+
+
+
+ }
+
+ {
+ videoData && videoData.count > pageSize &&
+
+
changePage(page, 'video')}>
- :
-
-
-
- }
-
- {
- videoData && videoData.count > pageSize &&
-
-
changePage(page,'video')}>
-
- }
-
+ }
+
}
diff --git a/public/react/src/modules/courses/Video/video-play.jsx b/public/react/src/modules/courses/Video/video-play.jsx
new file mode 100644
index 000000000..77ff99108
--- /dev/null
+++ b/public/react/src/modules/courses/Video/video-play.jsx
@@ -0,0 +1,18 @@
+import React, { Fragment } from 'react'
+import { ReactFlvPlayer } from 'react-flv-player'
+
+export default ({ src }) => {
+ const suf = src.split('.').pop()
+ const isFlv = suf === 'flv'
+ return (
+
+ {
+ isFlv ? :
+ }
+
+
+ )
+}
\ No newline at end of file
diff --git a/public/react/src/modules/user/usersInfo/video/InfosVideo.js b/public/react/src/modules/user/usersInfo/video/InfosVideo.js
index a3678e56e..1557b0686 100644
--- a/public/react/src/modules/user/usersInfo/video/InfosVideo.js
+++ b/public/react/src/modules/user/usersInfo/video/InfosVideo.js
@@ -1,16 +1,15 @@
import React, { useState, useEffect, useContext, useRef, memo } from 'react';
-import {Link} from 'react-router-dom';
-import {Pagination, Input, Button} from 'antd'
-import { getUrl2, isDev, ThemeContext, ActionBtn, NoneData } from 'educoder'
+import { Pagination, Input, Button } from 'antd'
+import { ThemeContext, ActionBtn, NoneData } from 'educoder'
import axios from 'axios'
import VideoInReviewItem from './VideoInReviewItem'
import EditVideoModal from './EditVideoModal'
import './InfosVideo.css'
import InfoTab from '../common/InfoTab'
import HeadlessModal from '../common/HeadlessModal'
-import CRoundSelect from '../common/CRoundSelect'
import ClipboardJS from 'clipboard'
+import VideoPlay from '../../../courses/Video/video-play';
function useModal(initValue) {
const [visible, setVisible] = useState(initValue)
@@ -45,11 +44,11 @@ const DEFAULT_VIDEO_WIDTH_IN_MD = "90%" // 400
const DEFAULT_VIDEO_HEIGHT_IN_MD = "55%" // 400
let videoId = {};
let _clipboard = null;
-const _items=[
- {key: 'published_at-desc', name: '最新上传'},
- {key: 'published_at-asc', name: '最早上传'},
+const _items = [
+ { key: 'published_at-desc', name: '最新上传' },
+ { key: 'published_at-asc', name: '最早上传' },
]
-function InfoVideo (props) {
+function InfoVideo(props) {
const [videos, setvideos] = useState(undefined)
const [reviewvideos, setReviewvideos] = useState(undefined)
const [count, setCount] = useState(0)
@@ -80,30 +79,30 @@ function InfoVideo (props) {
const fetchUrl = `/users/${username}/videos.json`
const sorts = sortKey.split('-')
setLoading(true)
- axios.get(fetchUrl, {
+ axios.get(fetchUrl, {
params: {
page: pageObj.current,
per_page: PAGE_SIZE,
sort_by: sorts[0],
sort_direction: sorts[1],
- //
+ //
}
})
- .then((response) => {
- setLoading(false)
- if (response.data.videos) {
- setvideos(response.data.videos)
- setCount(response.data.count)
- }
- }).catch(() => {
- setLoading(false)
- })
+ .then((response) => {
+ setLoading(false)
+ if (response.data.videos) {
+ setvideos(response.data.videos)
+ setCount(response.data.count)
+ }
+ }).catch(() => {
+ setLoading(false)
+ })
}
function fetchReviewvideos() {
const fetchUrl = `/users/${username}/videos/review.json`
const sorts = sortKey.split('-')
setLoading(true)
- axios.get(fetchUrl, {
+ axios.get(fetchUrl, {
params: {
page: pageObj.current,
per_page: PAGE_SIZE,
@@ -111,15 +110,15 @@ function InfoVideo (props) {
sort_direction: sorts[1],
}
})
- .then((response) => {
- setLoading(false)
- if (response.data.videos) {
- setReviewvideos(response.data.videos)
- setCount(response.data.count)
- }
- }).catch(() => {
+ .then((response) => {
+ setLoading(false)
+ if (response.data.videos) {
+ setReviewvideos(response.data.videos)
+ setCount(response.data.count)
+ }
+ }).catch(() => {
- })
+ })
}
useEffect(() => {
@@ -130,7 +129,7 @@ function InfoVideo (props) {
fetchReviewvideos()
}
} else {
- pageObj.onChange(1)
+ pageObj.onChange(1)
}
}, [categoryObj.category])
@@ -140,7 +139,7 @@ function InfoVideo (props) {
} else {
fetchReviewvideos()
}
- }, [ pageObj.current, sortKey ])
+ }, [pageObj.current, sortKey])
useEffect(() => {
if (videoModalObj.visible == false) {
@@ -158,9 +157,9 @@ function InfoVideo (props) {
_clipboard = new ClipboardJS('.copybtn');
_clipboard.on('success', (e) => {
showNotification('复制成功')
- });
+ });
}
- }, 200)
+ }, 200)
}
}, [videoModalObj.visible])
@@ -173,7 +172,7 @@ function InfoVideo (props) {
}
function onEditVideo(item) {
- videoId = {
+ videoId = {
videoId: item.id,
title: item.title
}
@@ -182,7 +181,7 @@ function InfoVideo (props) {
// this.refs['editVideoModal'].setVisible(true, video);
}
function onMaskClick(item) {
- videoId = {
+ videoId = {
videoId: item.id,
title: item.title,
file_url: item.file_url,
@@ -219,12 +218,12 @@ function InfoVideo (props) {
}
- function getCopyText (file_url, cover_url) {
+ function getCopyText(file_url, cover_url) {
return `
`
}
- const _inputValue = getCopyText(videoId.file_url, videoId.cover_url);
- const sorts = sortKey.split('-')
+ const _inputValue = getCopyText(videoId.file_url, videoId.cover_url);
+ const sorts = sortKey.split('-')
return (
@@ -238,12 +237,7 @@ function InfoVideo (props) {
className="showVideoModal"
width={800 - 1}
>
-
+
{ toUpload() }}
className="toUploadBtn"
- >
+ >
上传视频
}
>
-
+
共
- {count}
+ {count}
个视频
{/*{categoryObj.category == 'all' &&
}*/}
- {categoryObj.category == 'all' &&
-
- {"最新上传"}
-
-
-
- onSortChange("published_at-asc", 0)}>
-
-
-
-
- onSortChange("published_at-desc", 0)}>
-
-
-
- }
+ {categoryObj.category == 'all' &&
+
+ {"最新上传"}
+
+
+
+ onSortChange("published_at-asc", 0)}>
+
+
+
+
+ onSortChange("published_at-desc", 0)}>
+
+
+
+ }
- {categoryObj.category == 'all' ?
-
- {
- videos == undefined ? '' :
- videos.length ?
- videos.map((item, index) => {
- return (
- )
- })
- :
- }
-
- :
-
- {
- reviewvideos == undefined ? '' :
- reviewvideos.length ?
- reviewvideos.map((item, index) => {
- return (
- )
- })
- :
- }
-
+ {categoryObj.category == 'all' ?
+
+ {
+ videos == undefined ? '' :
+ videos.length ?
+ videos.map((item, index) => {
+ return (
+ )
+ })
+ :
+ }
+
+ :
+
+ {
+ reviewvideos == undefined ? '' :
+ reviewvideos.length ?
+ reviewvideos.map((item, index) => {
+ return (
+ )
+ })
+ :
+ }
+
}
- {/* categoryObj.category == 'all' && */}
+ {/* categoryObj.category == 'all' && */}
{
- count > PAGE_SIZE &&
+ count > PAGE_SIZE &&
}
-
+
)
}