From a249e940ff7320cf24e2f1a5d9c0da61e5ffc39a Mon Sep 17 00:00:00 2001 From: Yang Luo Date: Sun, 22 May 2022 16:39:14 +0800 Subject: [PATCH] Add tagOnPause. --- object/video.go | 7 ++++--- web/src/Video.js | 1 + web/src/VideoEditPage.js | 22 +++++++++++++++++++++- web/src/locales/en/data.json | 1 + web/src/locales/zh/data.json | 1 + 5 files changed, 28 insertions(+), 4 deletions(-) diff --git a/object/video.go b/object/video.go index 3ccf00c..956b2b9 100644 --- a/object/video.go +++ b/object/video.go @@ -20,9 +20,10 @@ type Video struct { CreatedTime string `xorm:"varchar(100)" json:"createdTime"` DisplayName string `xorm:"varchar(500)" json:"displayName"` - VideoId string `xorm:"varchar(100)" json:"videoId"` - CoverUrl string `xorm:"varchar(200)" json:"coverUrl"` - Labels []*Label `xorm:"mediumtext" json:"labels"` + VideoId string `xorm:"varchar(100)" json:"videoId"` + CoverUrl string `xorm:"varchar(200)" json:"coverUrl"` + Labels []*Label `xorm:"mediumtext" json:"labels"` + TagOnPause bool `json:"tagOnPause"` PlayAuth string `xorm:"-" json:"playAuth"` } diff --git a/web/src/Video.js b/web/src/Video.js index 2cce8ec..355d3e5 100644 --- a/web/src/Video.js +++ b/web/src/Video.js @@ -134,6 +134,7 @@ class Video extends React.Component { onPause() { this.state.screen.pause(); + this.props.onPause(); } initPlayer(player) { diff --git a/web/src/VideoEditPage.js b/web/src/VideoEditPage.js index 67f1fb0..0645edf 100644 --- a/web/src/VideoEditPage.js +++ b/web/src/VideoEditPage.js @@ -1,5 +1,5 @@ import React from "react"; -import {Affix, Button, Card, Col, Input, Row} from 'antd'; +import {Affix, Button, Card, Col, Input, Row, Switch} from 'antd'; import * as VideoBackend from "./backend/VideoBackend"; import * as Setting from "./Setting"; import i18next from "i18next"; @@ -18,6 +18,8 @@ class VideoEditPage extends React.Component { screen: null, videoObj: null, }; + + this.labelTable = React.createRef(); } componentWillMount() { @@ -51,6 +53,12 @@ class VideoEditPage extends React.Component { }); } + onPause() { + if (this.state.video.tagOnPause) { + this.labelTable.current.addRow(this.state.video.labels); + } + } + renderVideoContent() { let task = {}; task.video = { @@ -78,6 +86,7 @@ class VideoEditPage extends React.Component { onCreatePlayer={(player) => {this.setState({player: player})}} onCreateScreen={(screen) => {this.setState({screen: screen})}} onCreateVideo={(videoObj) => {this.setState({videoObj: videoObj})}} + onPause={() => {this.onPause()}} />
{i18next.t("video:Current time (second)")}: {" "} @@ -155,6 +164,16 @@ class VideoEditPage extends React.Component { + + + {i18next.t("video:Tag on pause")}: + + + { + this.updateVideoField('tagOnPause', checked); + }} /> + + {i18next.t("video:Video")}: @@ -168,6 +187,7 @@ class VideoEditPage extends React.Component {