@cloud-app-dev/vidc 3.0.11 → 3.0.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.prettierrc +1 -1
- package/es/CheckGroupFixed/index.js +1 -1
- package/es/DomMove/demo.d.ts +1 -1
- package/es/DomMove/demo.js +1 -1
- package/es/DomMove/index.js +4 -3
- package/es/FullScreen/index.js +5 -5
- package/es/Input/index.js +4 -4
- package/es/List/VList/index.d.ts +1 -1
- package/es/LoaderScript/index.js +3 -3
- package/es/LoaderScript/utils.js +4 -2
- package/es/Map/LevelCenter/DragMarker/index.js +2 -2
- package/es/Map/LoaderMap/index.js +3 -3
- package/es/Picture/component/DefaultRects/index.js +1 -1
- package/es/Picture/component/DrawRect/index.js +1 -1
- package/es/Picture/component/RectMenu/index.js +1 -1
- package/es/Picture/index.js +1 -2
- package/es/Player/contraller_bar/right_bar.js +2 -3
- package/es/Player/frontend_player.js +3 -2
- package/es/Player/frontend_timeline.js +1 -1
- package/es/Player/segment_player.js +1 -1
- package/es/Player/single_player.js +2 -2
- package/es/ScreenPlayer/Live.d.ts +6 -1
- package/es/ScreenPlayer/Live.js +8 -6
- package/es/ScreenPlayer/LiveTools.d.ts +1 -1
- package/es/ScreenPlayer/LiveTools.js +6 -7
- package/es/ScreenPlayer/PlayerWithExt.js +33 -19
- package/es/ScreenPlayer/Record.js +3 -3
- package/es/ScreenPlayer/RecordTools.js +3 -4
- package/es/ScreenPlayer/SegmentTimeLine.d.ts +2 -2
- package/es/ScreenPlayer/SegmentTimeLine.js +17 -36
- package/es/ScreenPlayer/TimeSlider.d.ts +2 -2
- package/es/ScreenPlayer/TimeSlider.js +21 -17
- package/es/ScreenPlayer/demo.js +3 -3
- package/es/ScreenPlayer/index.css +1 -0
- package/es/ScreenPlayer/useTimeSlider.d.ts +22 -0
- package/es/ScreenPlayer/useTimeSlider.js +519 -0
- package/es/Tree/index.js +24 -21
- package/es/index.d.ts +1 -0
- package/es/index.js +1 -0
- package/es/useFullscreen/index.d.ts +12 -0
- package/es/useFullscreen/index.js +95 -0
- package/es/utils.js +1 -1
- package/package.json +3 -2
- package/es/List/renderItem.d.ts +0 -20
- package/es/List/renderItem.js +0 -71
package/.prettierrc
CHANGED
|
@@ -76,7 +76,7 @@ function CheckGroupFixed(_ref) {
|
|
|
76
76
|
}, [state.sider, state.w, state.pos]);
|
|
77
77
|
|
|
78
78
|
_useUpdateEffect(function () {
|
|
79
|
-
return onChange
|
|
79
|
+
return onChange === null || onChange === void 0 ? void 0 : onChange(state.selectKeys);
|
|
80
80
|
}, [state.selectKeys]);
|
|
81
81
|
|
|
82
82
|
useLayoutEffect(function () {
|
package/es/DomMove/demo.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
|
-
export default function (): JSX.Element;
|
|
2
|
+
export default function App(): JSX.Element;
|
package/es/DomMove/demo.js
CHANGED
package/es/DomMove/index.js
CHANGED
|
@@ -43,7 +43,7 @@ function DomMove(_ref) {
|
|
|
43
43
|
y: y
|
|
44
44
|
};
|
|
45
45
|
update();
|
|
46
|
-
onDragChange
|
|
46
|
+
onDragChange === null || onDragChange === void 0 ? void 0 : onDragChange({
|
|
47
47
|
x: x,
|
|
48
48
|
y: y
|
|
49
49
|
});
|
|
@@ -57,7 +57,8 @@ function DomMove(_ref) {
|
|
|
57
57
|
width: reSize.width,
|
|
58
58
|
height: reSize.height
|
|
59
59
|
};
|
|
60
|
-
}, [reSize.width, reSize.height]);
|
|
60
|
+
}, [reSize.width, reSize.height]); // eslint-disable-next-line react-hooks/exhaustive-deps
|
|
61
|
+
|
|
61
62
|
useImperativeHandle(forwordRef, function () {
|
|
62
63
|
return {
|
|
63
64
|
updatePosition: updatePosition
|
|
@@ -93,7 +94,7 @@ function DomMove(_ref) {
|
|
|
93
94
|
|
|
94
95
|
_useEventListener('mouseup', function (event) {
|
|
95
96
|
ref.current.isDrag = false;
|
|
96
|
-
onDragEnd
|
|
97
|
+
onDragEnd === null || onDragEnd === void 0 ? void 0 : onDragEnd(event, ref.current.position);
|
|
97
98
|
}, {
|
|
98
99
|
target: document.body
|
|
99
100
|
});
|
package/es/FullScreen/index.js
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import _useFullscreen3 from "ahooks/es/useFullscreen";
|
|
2
|
-
|
|
3
1
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
4
2
|
|
|
5
3
|
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
@@ -13,6 +11,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
|
|
|
13
11
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
14
12
|
|
|
15
13
|
import React, { useEffect } from 'react';
|
|
14
|
+
import useFullscreen from '../useFullscreen';
|
|
16
15
|
import IconFont from '../IconFont';
|
|
17
16
|
import "./index.css";
|
|
18
17
|
|
|
@@ -22,15 +21,16 @@ function FullScreen(_ref) {
|
|
|
22
21
|
fullScreenChange = _ref.fullScreenChange,
|
|
23
22
|
hasText = _ref.hasText;
|
|
24
23
|
|
|
25
|
-
var _useFullscreen =
|
|
24
|
+
var _useFullscreen = useFullscreen(getContainer),
|
|
26
25
|
_useFullscreen2 = _slicedToArray(_useFullscreen, 2),
|
|
27
26
|
isFullscreen = _useFullscreen2[0],
|
|
28
27
|
toggleFullscreen = _useFullscreen2[1].toggleFullscreen;
|
|
29
28
|
|
|
30
29
|
useEffect(function () {
|
|
31
30
|
if (isFullscreen) {
|
|
32
|
-
fullScreenChange
|
|
33
|
-
}
|
|
31
|
+
fullScreenChange === null || fullScreenChange === void 0 ? void 0 : fullScreenChange(isFullscreen);
|
|
32
|
+
} // eslint-disable-next-line react-hooks/exhaustive-deps
|
|
33
|
+
|
|
34
34
|
}, [isFullscreen]);
|
|
35
35
|
return /*#__PURE__*/React.createElement("span", {
|
|
36
36
|
className: "tools-screen-layer ".concat(className !== null && className !== void 0 ? className : ''),
|
package/es/Input/index.js
CHANGED
|
@@ -44,7 +44,7 @@ function Input(_a) {
|
|
|
44
44
|
});
|
|
45
45
|
|
|
46
46
|
_useUpdateEffect(function () {
|
|
47
|
-
return onChange
|
|
47
|
+
return onChange === null || onChange === void 0 ? void 0 : onChange(debouncedValue);
|
|
48
48
|
}, [debouncedValue]);
|
|
49
49
|
|
|
50
50
|
return /*#__PURE__*/React.createElement(_Input, Object.assign({}, props, {
|
|
@@ -60,9 +60,9 @@ function Input(_a) {
|
|
|
60
60
|
prefix: prefix,
|
|
61
61
|
suffix: suffix,
|
|
62
62
|
value: state.value,
|
|
63
|
-
onPressEnter:
|
|
64
|
-
return onEnter(state.value);
|
|
65
|
-
}
|
|
63
|
+
onPressEnter: function onPressEnter() {
|
|
64
|
+
return onEnter === null || onEnter === void 0 ? void 0 : onEnter(state.value);
|
|
65
|
+
}
|
|
66
66
|
}));
|
|
67
67
|
}
|
|
68
68
|
|
package/es/List/VList/index.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ interface IVListProps<T> {
|
|
|
4
4
|
data?: Array<T>;
|
|
5
5
|
rowHeight?: number;
|
|
6
6
|
className?: string;
|
|
7
|
-
renderItem
|
|
7
|
+
renderItem(item: T, index: number): JSX.Element;
|
|
8
8
|
overscan?: number;
|
|
9
9
|
}
|
|
10
10
|
declare function VList<T>({ className, rowHeight, data, renderItem }: IVListProps<T>): JSX.Element;
|
package/es/LoaderScript/index.js
CHANGED
|
@@ -31,14 +31,14 @@ function LoaderScripts(_ref) {
|
|
|
31
31
|
return setInitStatus(true);
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
-
runAsyncIterable(createAsyncIterable(options), function (
|
|
35
|
-
return console.debug('LoaderScript -> Iterable加载完成!',
|
|
34
|
+
runAsyncIterable(createAsyncIterable(options), function (index) {
|
|
35
|
+
return console.debug('LoaderScript -> Iterable加载完成!', options[index]);
|
|
36
36
|
}, function () {
|
|
37
37
|
return onLoadEnd ? onLoadEnd().then(function () {
|
|
38
38
|
return setInitStatus(true);
|
|
39
39
|
}) : setInitStatus(true);
|
|
40
40
|
});
|
|
41
|
-
}, [options]);
|
|
41
|
+
}, [onLoadEnd, options]);
|
|
42
42
|
return /*#__PURE__*/React.createElement(React.Fragment, null, !initStatus ? Spin : children);
|
|
43
43
|
}
|
|
44
44
|
|
package/es/LoaderScript/utils.js
CHANGED
|
@@ -192,7 +192,7 @@ export function runAsyncIterable(Iterables, runtime, callback) {
|
|
|
192
192
|
}
|
|
193
193
|
|
|
194
194
|
x = Iterables_1_1.value;
|
|
195
|
-
runtime
|
|
195
|
+
runtime === null || runtime === void 0 ? void 0 : runtime(x);
|
|
196
196
|
|
|
197
197
|
case 8:
|
|
198
198
|
_context3.next = 2;
|
|
@@ -238,7 +238,9 @@ export function runAsyncIterable(Iterables, runtime, callback) {
|
|
|
238
238
|
return _context3.finish(15);
|
|
239
239
|
|
|
240
240
|
case 25:
|
|
241
|
-
|
|
241
|
+
_nextTick(function () {
|
|
242
|
+
return callback === null || callback === void 0 ? void 0 : callback();
|
|
243
|
+
});
|
|
242
244
|
|
|
243
245
|
case 26:
|
|
244
246
|
case "end":
|
|
@@ -28,7 +28,7 @@ function DragMarker(_ref) {
|
|
|
28
28
|
marker.on('dragend', function (e) {
|
|
29
29
|
var latlng = type.leaflet ? e.target.getLatLng() : e.target.getPosition();
|
|
30
30
|
instance.setCenter(latlng);
|
|
31
|
-
onChange
|
|
31
|
+
onChange === null || onChange === void 0 ? void 0 : onChange({
|
|
32
32
|
center: latlng,
|
|
33
33
|
zoom: instance.getZoom()
|
|
34
34
|
});
|
|
@@ -36,7 +36,7 @@ function DragMarker(_ref) {
|
|
|
36
36
|
instance.map.on('zoomend', function (e) {
|
|
37
37
|
var zoom = e.target.getZoom();
|
|
38
38
|
var latlng = type.leaflet ? marker.getLatLng() : marker.getPosition();
|
|
39
|
-
onChange
|
|
39
|
+
onChange === null || onChange === void 0 ? void 0 : onChange({
|
|
40
40
|
center: latlng,
|
|
41
41
|
zoom: zoom
|
|
42
42
|
});
|
|
@@ -35,15 +35,15 @@ function LoaderMap(_a) {
|
|
|
35
35
|
var isL = useMemo(function () {
|
|
36
36
|
return glaobalKey === 'L';
|
|
37
37
|
}, [glaobalKey]);
|
|
38
|
-
var
|
|
38
|
+
var isLoaded = useMemo(function () {
|
|
39
39
|
return !!window[glaobalKey];
|
|
40
40
|
}, [glaobalKey]);
|
|
41
41
|
var options = useMemo(function () {
|
|
42
42
|
return isL ? L_SCRIPTS : AMAP_SCRIPTS;
|
|
43
43
|
}, [isL]);
|
|
44
44
|
var Parent = useMemo(function () {
|
|
45
|
-
return
|
|
46
|
-
}, [
|
|
45
|
+
return isLoaded ? EmptyParent : LoaderScript;
|
|
46
|
+
}, [isLoaded]);
|
|
47
47
|
return /*#__PURE__*/React.createElement(Parent, {
|
|
48
48
|
options: options
|
|
49
49
|
}, /*#__PURE__*/React.cloneElement(children, Object.assign(Object.assign({}, props), {
|
|
@@ -13,7 +13,7 @@ function DefaultRects(_ref) {
|
|
|
13
13
|
}, [rects]);
|
|
14
14
|
var rectClick = useCallback(function (e, item) {
|
|
15
15
|
e.stopPropagation();
|
|
16
|
-
onClickRect
|
|
16
|
+
onClickRect === null || onClickRect === void 0 ? void 0 : onClickRect(Object.assign(Object.assign({}, item), {
|
|
17
17
|
base64: getRectImage(item.rect)
|
|
18
18
|
}));
|
|
19
19
|
}, [getRectImage, onClickRect]);
|
|
@@ -17,7 +17,7 @@ function DrawRect(_ref) {
|
|
|
17
17
|
return rect[1] + rect[3];
|
|
18
18
|
}, [rect]);
|
|
19
19
|
var onMenuClickAction = useCallback(function (item) {
|
|
20
|
-
onMenuClick
|
|
20
|
+
onMenuClick === null || onMenuClick === void 0 ? void 0 : onMenuClick(Object.assign(Object.assign({}, item), {
|
|
21
21
|
base64: getRectImage(rect)
|
|
22
22
|
}));
|
|
23
23
|
}, [getRectImage, onMenuClick, rect]);
|
|
@@ -56,7 +56,7 @@ function RectMenu(_ref) {
|
|
|
56
56
|
}, [handleCancelB]);
|
|
57
57
|
var onClickMenu = useCallback(function (e, item) {
|
|
58
58
|
e.stopPropagation();
|
|
59
|
-
onMenuClick
|
|
59
|
+
onMenuClick === null || onMenuClick === void 0 ? void 0 : onMenuClick(item);
|
|
60
60
|
}, [onMenuClick]);
|
|
61
61
|
return /*#__PURE__*/React.createElement("div", {
|
|
62
62
|
className: "select-rect-menu-layout",
|
package/es/Picture/index.js
CHANGED
|
@@ -27,7 +27,6 @@ import Tools from './component/Tools';
|
|
|
27
27
|
import DrawRect from './component/DrawRect';
|
|
28
28
|
import WheelScale from './component/WheelScale';
|
|
29
29
|
import DefaultRects from './component/DefaultRects';
|
|
30
|
-
import { isFunction } from 'lodash-es';
|
|
31
30
|
import "./index.css";
|
|
32
31
|
|
|
33
32
|
function Picture(_a) {
|
|
@@ -334,7 +333,7 @@ function Picture(_a) {
|
|
|
334
333
|
}), /*#__PURE__*/React.createElement(WheelScale, {
|
|
335
334
|
setScale: setScale,
|
|
336
335
|
dom: layoutRef.current
|
|
337
|
-
})),
|
|
336
|
+
})), children === null || children === void 0 ? void 0 : children(renderOptions));
|
|
338
337
|
}
|
|
339
338
|
|
|
340
339
|
Picture.defaultProps = {
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import _useFullscreen3 from "ahooks/es/useFullscreen";
|
|
2
|
-
|
|
3
1
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
4
2
|
|
|
5
3
|
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
@@ -15,13 +13,14 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
|
15
13
|
import React from 'react';
|
|
16
14
|
import IconFont from '../iconfont';
|
|
17
15
|
import Bar from './bar';
|
|
16
|
+
import useFullscreen from '../../useFullscreen';
|
|
18
17
|
|
|
19
18
|
function RightBar(_ref) {
|
|
20
19
|
var container = _ref.container,
|
|
21
20
|
rightExtContents = _ref.rightExtContents,
|
|
22
21
|
rightMidExtContents = _ref.rightMidExtContents;
|
|
23
22
|
|
|
24
|
-
var _useFullscreen =
|
|
23
|
+
var _useFullscreen = useFullscreen(container),
|
|
25
24
|
_useFullscreen2 = _slicedToArray(_useFullscreen, 2),
|
|
26
25
|
isFullScreen = _useFullscreen2[0],
|
|
27
26
|
_useFullscreen2$ = _useFullscreen2[1],
|
|
@@ -36,13 +36,13 @@ function FrontendPlayer(_a) {
|
|
|
36
36
|
|
|
37
37
|
var reload = function reload() {
|
|
38
38
|
playRef.current.event.emit(Events.RELOAD);
|
|
39
|
-
onSeek
|
|
39
|
+
onSeek === null || onSeek === void 0 ? void 0 : onSeek(begin);
|
|
40
40
|
playRef.current.api.reload();
|
|
41
41
|
};
|
|
42
42
|
|
|
43
43
|
var onInit = useCallback(function () {
|
|
44
44
|
update();
|
|
45
|
-
onCanPlayerInit
|
|
45
|
+
onCanPlayerInit === null || onCanPlayerInit === void 0 ? void 0 : onCanPlayerInit(); // eslint-disable-next-line react-hooks/exhaustive-deps
|
|
46
46
|
}, []);
|
|
47
47
|
var hasReady = api && event;
|
|
48
48
|
var timeline = customTimeLine !== null && customTimeLine !== void 0 ? customTimeLine : /*#__PURE__*/React.createElement(FrontendTimeLine, {
|
|
@@ -60,6 +60,7 @@ function FrontendPlayer(_a) {
|
|
|
60
60
|
reload: reload,
|
|
61
61
|
onCanPlayerInit: onInit,
|
|
62
62
|
isLive: false,
|
|
63
|
+
type: "flv",
|
|
63
64
|
customTimeLine: hasReady ? timeline : /*#__PURE__*/React.createElement(React.Fragment, null)
|
|
64
65
|
}, props));
|
|
65
66
|
}
|
|
@@ -71,7 +71,7 @@ function FrontendTimeLine(_ref) {
|
|
|
71
71
|
var rect = e.currentTarget.getBoundingClientRect();
|
|
72
72
|
var current = e.pageX - rect.left;
|
|
73
73
|
var cTime = current / rect.width * duration;
|
|
74
|
-
onSeek
|
|
74
|
+
onSeek === null || onSeek === void 0 ? void 0 : onSeek(begin + cTime * 1000); //时间轴进度条rTime是要加上currentTime,这里要减去一下,包装交互一致性
|
|
75
75
|
|
|
76
76
|
setState(function (old) {
|
|
77
77
|
return Object.assign(Object.assign({}, old), {
|
|
@@ -224,7 +224,7 @@ function SegmentPlayer(_a) {
|
|
|
224
224
|
});
|
|
225
225
|
var onInit = useCallback(function () {
|
|
226
226
|
update();
|
|
227
|
-
onCanPlayerInit
|
|
227
|
+
onCanPlayerInit === null || onCanPlayerInit === void 0 ? void 0 : onCanPlayerInit(); // eslint-disable-next-line react-hooks/exhaustive-deps
|
|
228
228
|
}, []);
|
|
229
229
|
return /*#__PURE__*/React.createElement(SinglePlayer, Object.assign({
|
|
230
230
|
ref: playRef,
|
|
@@ -103,7 +103,7 @@ var SinglePlayer = /*#__PURE__*/React.forwardRef(function (_a, ref) {
|
|
|
103
103
|
}, []); // url 变化清理错误次数
|
|
104
104
|
|
|
105
105
|
useEffect(function () {
|
|
106
|
-
event
|
|
106
|
+
event === null || event === void 0 ? void 0 : event.emit(EventName.CLEAR_ERROR_TIMER); // eslint-disable-next-line react-hooks/exhaustive-deps
|
|
107
107
|
}, [url]); // 特殊接口实现 reload是可能被重写的,但是API只暴露原生的方法
|
|
108
108
|
|
|
109
109
|
var reload = function reload() {
|
|
@@ -164,7 +164,7 @@ var SinglePlayer = /*#__PURE__*/React.forwardRef(function (_a, ref) {
|
|
|
164
164
|
}, [video, state.container, playApi, playEvent, flv, hls, fit]);
|
|
165
165
|
useEffect(function () {
|
|
166
166
|
if (api && event && video) {
|
|
167
|
-
onCanPlayerInit
|
|
167
|
+
onCanPlayerInit === null || onCanPlayerInit === void 0 ? void 0 : onCanPlayerInit();
|
|
168
168
|
} // eslint-disable-next-line react-hooks/exhaustive-deps
|
|
169
169
|
|
|
170
170
|
}, [api, event, video]);
|
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import type { ILivePlayerProps } from './interface';
|
|
3
3
|
import './index.less';
|
|
4
|
-
declare function LivePlayer({ list, children, onIndexChange, onClose, onCloseAll, snapshot, defaultScreen, screenChange, defaultSelectIndex
|
|
4
|
+
declare function LivePlayer({ list, children, onIndexChange, onClose, onCloseAll, snapshot, defaultScreen, screenChange, defaultSelectIndex }: ILivePlayerProps): JSX.Element;
|
|
5
|
+
declare namespace LivePlayer {
|
|
6
|
+
var defaultProps: {
|
|
7
|
+
list: any[];
|
|
8
|
+
};
|
|
9
|
+
}
|
|
5
10
|
export default LivePlayer;
|
package/es/ScreenPlayer/Live.js
CHANGED
|
@@ -28,8 +28,7 @@ import useVideoFit from './useVideoFit';
|
|
|
28
28
|
import "./index.css";
|
|
29
29
|
|
|
30
30
|
function LivePlayer(_ref) {
|
|
31
|
-
var
|
|
32
|
-
list = _ref$list === void 0 ? [] : _ref$list,
|
|
31
|
+
var list = _ref.list,
|
|
33
32
|
children = _ref.children,
|
|
34
33
|
onIndexChange = _ref.onIndexChange,
|
|
35
34
|
onClose = _ref.onClose,
|
|
@@ -121,7 +120,7 @@ function LivePlayer(_ref) {
|
|
|
121
120
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
122
121
|
|
|
123
122
|
_useUpdateEffect(function () {
|
|
124
|
-
return onIndexChange
|
|
123
|
+
return onIndexChange === null || onIndexChange === void 0 ? void 0 : onIndexChange(state.selectIndex);
|
|
125
124
|
}, [state.selectIndex]);
|
|
126
125
|
/**
|
|
127
126
|
* 通知screenNum变化
|
|
@@ -129,7 +128,7 @@ function LivePlayer(_ref) {
|
|
|
129
128
|
|
|
130
129
|
|
|
131
130
|
_useUpdateEffect(function () {
|
|
132
|
-
return
|
|
131
|
+
return onIndexChange === null || onIndexChange === void 0 ? void 0 : onIndexChange(state.screenNum);
|
|
133
132
|
}, [state.screenNum]);
|
|
134
133
|
|
|
135
134
|
return /*#__PURE__*/React.createElement("div", {
|
|
@@ -148,13 +147,13 @@ function LivePlayer(_ref) {
|
|
|
148
147
|
return playerRef.current[index] = player;
|
|
149
148
|
},
|
|
150
149
|
className: state.selectIndex === index ? 'player-current-index' : '',
|
|
151
|
-
onClick: function
|
|
150
|
+
onClick: index !== state.selectIndex ? function () {
|
|
152
151
|
return setState(function (old) {
|
|
153
152
|
return Object.assign(Object.assign({}, old), {
|
|
154
153
|
selectIndex: index
|
|
155
154
|
});
|
|
156
155
|
});
|
|
157
|
-
},
|
|
156
|
+
} : undefined,
|
|
158
157
|
style: {
|
|
159
158
|
width: screenType.width,
|
|
160
159
|
height: screenType.height
|
|
@@ -177,4 +176,7 @@ function LivePlayer(_ref) {
|
|
|
177
176
|
}));
|
|
178
177
|
}
|
|
179
178
|
|
|
179
|
+
LivePlayer.defaultProps = {
|
|
180
|
+
list: []
|
|
181
|
+
};
|
|
180
182
|
export default LivePlayer;
|
|
@@ -17,5 +17,5 @@ interface IToolsProps {
|
|
|
17
17
|
disabled: boolean;
|
|
18
18
|
snapshot?: (base64?: string) => void;
|
|
19
19
|
}
|
|
20
|
-
declare function LiveTools({ containerRef, updateState, screenNum, getPlayerItem, mode, toggleFit, fit, onClose, onCloseAll, disabled, snapshot
|
|
20
|
+
declare function LiveTools({ containerRef, updateState, screenNum, getPlayerItem, mode, toggleFit, fit, onClose, onCloseAll, disabled, snapshot }: IToolsProps): JSX.Element;
|
|
21
21
|
export default LiveTools;
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import _useUpdate from "ahooks/es/useUpdate";
|
|
2
|
-
import _useFullscreen3 from "ahooks/es/useFullscreen";
|
|
3
2
|
|
|
4
3
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
5
4
|
|
|
@@ -17,6 +16,7 @@ import React from 'react';
|
|
|
17
16
|
import IconFont from '../Player/iconfont';
|
|
18
17
|
import ScreenSelect from './ScreenSelect';
|
|
19
18
|
import DisableMark from '../DisableMark';
|
|
19
|
+
import useFullscreen from '../useFullscreen';
|
|
20
20
|
|
|
21
21
|
function LiveTools(_ref) {
|
|
22
22
|
var containerRef = _ref.containerRef,
|
|
@@ -31,7 +31,7 @@ function LiveTools(_ref) {
|
|
|
31
31
|
disabled = _ref.disabled,
|
|
32
32
|
snapshot = _ref.snapshot;
|
|
33
33
|
|
|
34
|
-
var _useFullscreen =
|
|
34
|
+
var _useFullscreen = useFullscreen(containerRef),
|
|
35
35
|
_useFullscreen2 = _slicedToArray(_useFullscreen, 2),
|
|
36
36
|
isFullscreen = _useFullscreen2[0],
|
|
37
37
|
toggleFullscreen = _useFullscreen2[1].toggleFullscreen;
|
|
@@ -48,15 +48,14 @@ function LiveTools(_ref) {
|
|
|
48
48
|
|
|
49
49
|
|
|
50
50
|
var reload = function reload() {
|
|
51
|
-
var player = getPlayerItem();
|
|
52
|
-
|
|
53
|
-
player ? player.reload ? player.reload() : player.api.reload() : undefined;
|
|
51
|
+
var player = getPlayerItem();
|
|
52
|
+
player === null || player === void 0 ? void 0 : player.api.reload();
|
|
54
53
|
};
|
|
55
54
|
|
|
56
55
|
var snapshotaction = function snapshotaction() {
|
|
57
56
|
var player = getPlayerItem();
|
|
58
|
-
var base64 = player ? player.api.snapshot()
|
|
59
|
-
snapshot
|
|
57
|
+
var base64 = player === null || player === void 0 ? void 0 : player.api.snapshot();
|
|
58
|
+
snapshot === null || snapshot === void 0 ? void 0 : snapshot(base64);
|
|
60
59
|
};
|
|
61
60
|
|
|
62
61
|
var player = getPlayerItem();
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import _useUpdate from "ahooks/es/useUpdate";
|
|
2
2
|
|
|
3
3
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
4
4
|
|
|
@@ -19,6 +19,7 @@ import SegmentPlayer from '../Player/segment_player';
|
|
|
19
19
|
import FrontendPlayer from '../Player/frontend_player';
|
|
20
20
|
import ExtModel from '../PlayerExt';
|
|
21
21
|
import moment from 'moment';
|
|
22
|
+
import useFullscreen from '../useFullscreen';
|
|
22
23
|
export function LivePlayerWithExt(_a) {
|
|
23
24
|
var _b;
|
|
24
25
|
|
|
@@ -33,12 +34,16 @@ export function LivePlayerWithExt(_a) {
|
|
|
33
34
|
pluginDownloadUrl = _a.pluginDownloadUrl,
|
|
34
35
|
props = __rest(_a, ["mode", "isLive", "url", "type", "style", "className", "updatePlayer", "onClick", "pluginDownloadUrl"]);
|
|
35
36
|
|
|
37
|
+
var forceUpdate = _useUpdate();
|
|
38
|
+
|
|
36
39
|
var ref = useRef();
|
|
37
|
-
var update = useCallback(function () {
|
|
38
|
-
return updatePlayer(ref);
|
|
39
|
-
}, [updatePlayer]);
|
|
40
40
|
|
|
41
|
-
var
|
|
41
|
+
var update = function update() {
|
|
42
|
+
updatePlayer(ref);
|
|
43
|
+
forceUpdate();
|
|
44
|
+
};
|
|
45
|
+
|
|
46
|
+
var _useFullscreen = useFullscreen((_b = ref.current) === null || _b === void 0 ? void 0 : _b.container),
|
|
42
47
|
_useFullscreen2 = _slicedToArray(_useFullscreen, 2),
|
|
43
48
|
toggleFullscreen = _useFullscreen2[1].toggleFullscreen;
|
|
44
49
|
|
|
@@ -72,14 +77,18 @@ export function SegmentPlayerWithExt(_a) {
|
|
|
72
77
|
mode = _a.mode,
|
|
73
78
|
props = __rest(_a, ["begin", "style", "className", "segments", "updatePlayer", "onClick", "mode"]);
|
|
74
79
|
|
|
80
|
+
var forceUpdate = _useUpdate();
|
|
81
|
+
|
|
75
82
|
var ref = useRef();
|
|
76
|
-
var update = useCallback(function () {
|
|
77
|
-
return updatePlayer(ref);
|
|
78
|
-
}, [updatePlayer]);
|
|
79
83
|
|
|
80
|
-
var
|
|
81
|
-
|
|
82
|
-
|
|
84
|
+
var update = function update() {
|
|
85
|
+
updatePlayer(ref);
|
|
86
|
+
forceUpdate();
|
|
87
|
+
};
|
|
88
|
+
|
|
89
|
+
var _useFullscreen3 = useFullscreen((_b = ref.current) === null || _b === void 0 ? void 0 : _b.container),
|
|
90
|
+
_useFullscreen4 = _slicedToArray(_useFullscreen3, 2),
|
|
91
|
+
toggleFullscreen = _useFullscreen4[1].toggleFullscreen;
|
|
83
92
|
|
|
84
93
|
return /*#__PURE__*/React.createElement("div", {
|
|
85
94
|
className: "player-with-ext-layout ".concat(className),
|
|
@@ -142,7 +151,7 @@ export function FrontendPlayerWithExt(_ref) {
|
|
|
142
151
|
return;
|
|
143
152
|
}
|
|
144
153
|
|
|
145
|
-
var endTime = moment(
|
|
154
|
+
var endTime = moment().unix();
|
|
146
155
|
var beginTime = moment(time).unix();
|
|
147
156
|
var videoUrl = new URL(state.url);
|
|
148
157
|
videoUrl.searchParams.set('begin', "".concat(beginTime));
|
|
@@ -152,15 +161,20 @@ export function FrontendPlayerWithExt(_ref) {
|
|
|
152
161
|
url: videoUrl.toString()
|
|
153
162
|
});
|
|
154
163
|
});
|
|
155
|
-
}, [
|
|
164
|
+
}, [state.url]);
|
|
165
|
+
|
|
166
|
+
var forceUpdate = _useUpdate();
|
|
167
|
+
|
|
156
168
|
var ref = useRef();
|
|
157
|
-
var update = useCallback(function () {
|
|
158
|
-
return updatePlayer(ref);
|
|
159
|
-
}, [updatePlayer]);
|
|
160
169
|
|
|
161
|
-
var
|
|
162
|
-
|
|
163
|
-
|
|
170
|
+
var update = function update() {
|
|
171
|
+
updatePlayer(ref);
|
|
172
|
+
forceUpdate();
|
|
173
|
+
};
|
|
174
|
+
|
|
175
|
+
var _useFullscreen5 = useFullscreen((_a = ref.current) === null || _a === void 0 ? void 0 : _a.container),
|
|
176
|
+
_useFullscreen6 = _slicedToArray(_useFullscreen5, 2),
|
|
177
|
+
toggleFullscreen = _useFullscreen6[1].toggleFullscreen;
|
|
164
178
|
|
|
165
179
|
return /*#__PURE__*/React.createElement("div", {
|
|
166
180
|
className: "player-with-ext-layout ".concat(className),
|
|
@@ -337,11 +337,11 @@ function RecordPlayer(_ref) {
|
|
|
337
337
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
338
338
|
|
|
339
339
|
_useUpdateEffect(function () {
|
|
340
|
-
return onIndexChange
|
|
340
|
+
return onIndexChange === null || onIndexChange === void 0 ? void 0 : onIndexChange(state.selectIndex);
|
|
341
341
|
}, [state.selectIndex]);
|
|
342
342
|
|
|
343
343
|
_useUpdateEffect(function () {
|
|
344
|
-
return screenChange
|
|
344
|
+
return screenChange === null || screenChange === void 0 ? void 0 : screenChange(state.screenNum);
|
|
345
345
|
}, [state.screenNum]);
|
|
346
346
|
|
|
347
347
|
return /*#__PURE__*/React.createElement("div", {
|
|
@@ -413,7 +413,7 @@ function RecordPlayer(_ref) {
|
|
|
413
413
|
}), /*#__PURE__*/React.createElement(SegmentTimeLine, {
|
|
414
414
|
begin: timeBegin,
|
|
415
415
|
updateState: updateState,
|
|
416
|
-
|
|
416
|
+
segments: segmentItem.segments,
|
|
417
417
|
key: state.selectIndex,
|
|
418
418
|
onTimeChange: onTimeChange,
|
|
419
419
|
timeMode: state.timeMode
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import _useUpdate from "ahooks/es/useUpdate";
|
|
2
|
-
import _useFullscreen3 from "ahooks/es/useFullscreen";
|
|
3
2
|
|
|
4
3
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
5
4
|
|
|
@@ -18,6 +17,7 @@ import IconFont from '../Player/iconfont';
|
|
|
18
17
|
import ScreenSelect from './ScreenSelect';
|
|
19
18
|
import TimeSelect from './TimeSelect';
|
|
20
19
|
import TimeMode from './TimeMode';
|
|
20
|
+
import useFullscreen from '../useFullscreen';
|
|
21
21
|
|
|
22
22
|
function RecordTools(_ref) {
|
|
23
23
|
var containerRef = _ref.containerRef,
|
|
@@ -35,7 +35,7 @@ function RecordTools(_ref) {
|
|
|
35
35
|
onCloseAll = _ref.onCloseAll,
|
|
36
36
|
snapshot = _ref.snapshot;
|
|
37
37
|
|
|
38
|
-
var _useFullscreen =
|
|
38
|
+
var _useFullscreen = useFullscreen(containerRef),
|
|
39
39
|
_useFullscreen2 = _slicedToArray(_useFullscreen, 2),
|
|
40
40
|
isFullscreen = _useFullscreen2[0],
|
|
41
41
|
toggleFullscreen = _useFullscreen2[1].toggleFullscreen;
|
|
@@ -59,8 +59,7 @@ function RecordTools(_ref) {
|
|
|
59
59
|
|
|
60
60
|
var snapshotaction = function snapshotaction() {
|
|
61
61
|
var player = getPlayerItem();
|
|
62
|
-
|
|
63
|
-
snapshot && snapshot(base64);
|
|
62
|
+
snapshot === null || snapshot === void 0 ? void 0 : snapshot(player === null || player === void 0 ? void 0 : player.api.snapshot());
|
|
64
63
|
};
|
|
65
64
|
|
|
66
65
|
var player = getPlayerItem();
|
|
@@ -2,12 +2,12 @@
|
|
|
2
2
|
import { ISegmentType } from '../Player/player';
|
|
3
3
|
interface ISegmentTimeLineProps {
|
|
4
4
|
begin?: number;
|
|
5
|
-
|
|
5
|
+
segments?: ISegmentType[];
|
|
6
6
|
onTimeChange?: (time: number) => void;
|
|
7
7
|
timeMode: number;
|
|
8
8
|
updateState: (state: {
|
|
9
9
|
timeMode: number;
|
|
10
10
|
}) => void;
|
|
11
11
|
}
|
|
12
|
-
declare function SegmentTimeLine({ begin,
|
|
12
|
+
declare function SegmentTimeLine({ begin, segments, onTimeChange, timeMode, updateState }: ISegmentTimeLineProps): JSX.Element;
|
|
13
13
|
export default SegmentTimeLine;
|