@cloud-app-dev/vidc 3.0.10 → 3.0.13

package/.prettierrc

@@ -1,7 +1,7 @@
 {
   "singleQuote": true,
   "trailingComma": "all",
-  "printWidth": 150,
+  "printWidth": 160,
   "overrides": [
     {
       "files": ".prettierrc",

package/.umirc.ts

@@ -2,7 +2,7 @@ import { defineConfig } from 'dumi';
 import path from 'path';
 
 const token =
-  'eyJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb25JZCI6IjEwMDEwMTAwMDQ0NSIsImV4dCI6MTY2MTY1NjgzMTU3MywidWlkIjoiMTAxMDAwMDAwNjk5IiwidmFsaWRTdGF0ZSI6MTA0NDA2LCJyb2xlSWQiOlsxMDAwMDAxMTA1MTgsMTAwMDAwMTEwNzI4XSwidmFsaWRUaW1lIjoxNzA0MzgzOTk5MDAwLCJvcHRDZW50ZXJJZCI6IjEwMDEwMDAwMDIzMyIsInVzZXJUeXBlIjoxMDA3MDQsImlhdCI6MTY2MTM5NzYzMTU3M30.OWPxfPgFBWqGJaRsYLSAZohn2AarhbkOuWLa1bwgZE4';
+  'eyJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb25JZCI6IjEwMDEwMTAwMDQ0NSIsImV4dCI6MTY2MjI1ODMwNzUxNSwidWlkIjoiMTAxMDAwMDAwNjk5IiwidmFsaWRTdGF0ZSI6MTA0NDA2LCJyb2xlSWQiOlsxMDAwMDAxMTA1MTgsMTAwMDAwMTEwNzI4XSwidmFsaWRUaW1lIjoxNzA0MzgzOTk5MDAwLCJvcHRDZW50ZXJJZCI6IjEwMDEwMDAwMDIzMyIsInVzZXJUeXBlIjoxMDA3MDQsImlhdCI6MTY2MTk5OTEwNzUxNX0.uk_G3vqBCFqxQM2jbV6CSN-z9YNVt_cx5nWXkSuCOIA';
 
 export default defineConfig({
   title: 'CloudApp VIDC',

package/clear-cache.sh

@@ -0,0 +1,4 @@
+#! /bin/sh
+
+rm -rf .mfsu
+rm -rf src/.umi*

package/es/CustomRenderSelect/index.d.ts

@@ -6,5 +6,5 @@ interface ICustomRenderSelectProps extends SelectProps {
     value: any;
     customRender: (value: any) => JSX.Element;
 }
-declare function CustomRenderSelect({ children, value, customRender, dropdownClassName, ...props }: ICustomRenderSelectProps): JSX.Element;
+declare function CustomRenderSelect({ children, value, customRender, dropdownClassName, getPopupContainer, ...props }: ICustomRenderSelectProps): JSX.Element;
 export default CustomRenderSelect;

package/es/CustomRenderSelect/index.js

@@ -25,7 +25,8 @@ function CustomRenderSelect(_a) {
       value = _a.value,
       customRender = _a.customRender,
       dropdownClassName = _a.dropdownClassName,
-      props = __rest(_a, ["children", "value", "customRender", "dropdownClassName"]);
+      getPopupContainer = _a.getPopupContainer,
+      props = __rest(_a, ["children", "value", "customRender", "dropdownClassName", "getPopupContainer"]);
 
   var classname = useMemo(function () {
     return "custom-render-select-dropdown-".concat(_uuid());
@@ -57,11 +58,16 @@ function CustomRenderSelect(_a) {
   }, /*#__PURE__*/React.createElement(_Select, Object.assign({}, props, {
     value: value,
     dropdownClassName: "custom-render-select-dropdown ".concat(classname, " ").concat(dropdownClassName),
+    getPopupContainer: getPopupContainer ? getPopupContainer : function () {
+      return domRef.current.parentElement.parentElement;
+    },
     open: open
   }), children), /*#__PURE__*/React.createElement("div", {
     className: "custom-render-box",
     onClick: toggle
-  }, customRender(value)));
+  }, customRender(value)), /*#__PURE__*/React.createElement("div", {
+    className: "popup-container"
+  }));
 }
 
 export default CustomRenderSelect;

package/es/List/DynamicGridList/index.js

@@ -1,7 +1,8 @@
 import "antd/lib/message/style";
 import _message from "antd/lib/message";
+import _useUpdateEffect from "ahooks/es/useUpdateEffect";
 import { __rest } from "tslib";
-import React, { useEffect, useMemo, useRef } from 'react';
+import React, { useMemo, useRef } from 'react';
 import GridList from '../GridList';
 import useInfiniteScroll from '../../useInfiniteScroll';
 
@@ -28,8 +29,8 @@ function DynamicGridList(_a) {
       data = _useInfiniteScroll.data,
       noMore = _useInfiniteScroll.noMore;
 
-  useEffect(function () {
-    return _message.success('数据已全部加载完成！');
+  _useUpdateEffect(function () {
+    return noMore && _message.success('数据已全部加载完成！');
   }, [noMore]);
 
   function getItemData(data) {

package/es/List/DynamicList/utils.d.ts

@@ -1,4 +1,4 @@
-export declare const LIMIT = 30;
+export declare const LIMIT = 10;
 export declare const skeletonList: {
     skeleton: boolean;
 }[];

package/es/List/DynamicList/utils.js

@@ -1,4 +1,4 @@
-export var LIMIT = 30;
+export var LIMIT = 10;
 export var skeletonList = Array.from(new Array(LIMIT)).map(function () {
   return {
     skeleton: true

package/es/List/GridList/Demo.js

@@ -33,7 +33,7 @@ function getWindowMargin(windowHeight) {
 
 function getItemData(image, columnWidth) {
   return {
-    key: image.url,
+    key: image.index,
     height: 400,
     width: ITEM_WIDTH,
     url: image.url

package/es/Player/api/index.d.ts

@@ -1,4 +1,4 @@
-import flvjs from 'flv.zv.js';
+import Flvjs from '@cloud-app-dev/flv.js';
 import Hls, { HlsConfig } from 'hls.js';
 import type { FlvPlayerConfig } from '../player';
 declare class Api {
@@ -57,9 +57,9 @@ declare class Api {
 }
 export declare type TypeAndPlay = {
     type?: string;
-    flv?: flvjs.Player;
+    flv?: Flvjs.Player;
     hls?: Hls;
 };
-export declare function useTypeAndPlay(url?: string, type?: string, isLive?: boolean, container?: HTMLElement, segments?: flvjs.MediaSegment[], flvConfig?: FlvPlayerConfig, hlsConfig?: HlsConfig): [string, flvjs.Player, Hls];
-export declare function usePlayerApi(url?: string, type?: string, isLive?: boolean, container?: HTMLElement, segments?: flvjs.MediaSegment[], flvConfig?: FlvPlayerConfig, hlsConfig?: HlsConfig): [Api, [string, flvjs.Player, Hls]];
+export declare function useTypeAndPlay(url?: string, type?: string, isLive?: boolean, container?: HTMLElement, segments?: Flvjs.MediaSegment[], flvConfig?: FlvPlayerConfig, hlsConfig?: HlsConfig): [string, Flvjs.Player, Hls];
+export declare function usePlayerApi(url?: string, type?: string, isLive?: boolean, container?: HTMLElement, segments?: Flvjs.MediaSegment[], flvConfig?: FlvPlayerConfig, hlsConfig?: HlsConfig): [Api, [string, Flvjs.Player, Hls]];
 export default Api;

package/es/Player/contraller_bar/contraller_event.js

@@ -47,7 +47,7 @@ function ContrallerEvent(_ref) {
       container.removeEventListener('mouseenter', showContraller, false);
       container.removeEventListener('mouseleave', hideContraller, false);
     };
-  }, [event]);
+  }, [container, event]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, React.Children.map(children, function (child) {
     return /*#__PURE__*/React.isValidElement(child) ? /*#__PURE__*/React.cloneElement(child, {
       visibel: visibel

package/es/Player/event/errorEvent.d.ts

@@ -1,13 +1,13 @@
 /// <reference types="react" />
 import type VideoEventInstance from '.';
 import type Api from '../api';
-import flvjs from 'flv.zv.js';
+import Flvjs from '@cloud-app-dev/flv.js';
 import Hls from 'hls.js';
 interface IErrorEventProps {
     event: VideoEventInstance;
     api: Api;
     errorReloadTimer: number;
-    flv: flvjs.Player;
+    flv: Flvjs.Player;
     hls: Hls;
     reload: () => void;
     unload: () => void;

package/es/Player/event/errorEvent.js

@@ -20,7 +20,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useState, useEffect, useRef } from 'react';
 import EventName from './eventName';
-import flvjs from 'flv.zv.js';
+import Flvjs from '@cloud-app-dev/flv.js';
 import Hls from 'hls.js';
 
 function ErrorEvent(_ref) {
@@ -70,7 +70,7 @@ function ErrorEvent(_ref) {
     };
 
     if (flv) {
-      flv.on(flvjs.Events.ERROR, errorHandle);
+      flv.on(Flvjs.Events.ERROR, errorHandle);
     }
 
     if (hls) {

package/es/Player/frontend_player.js

@@ -60,6 +60,7 @@ function FrontendPlayer(_a) {
     reload: reload,
     onCanPlayerInit: onInit,
     isLive: false,
+    type: "flv",
     customTimeLine: hasReady ? timeline : /*#__PURE__*/React.createElement(React.Fragment, null)
   }, props));
 }

package/es/Player/live_heart.d.ts

@@ -1,6 +1,8 @@
 /// <reference types="react" />
-import Api from './api';
-declare function LiveHeart({ api }: {
+import type Api from './api';
+import type VideoEventInstance from './event';
+declare function LiveHeart({ api, event }: {
     api: Api;
+    event: VideoEventInstance;
 }): JSX.Element;
 export default LiveHeart;

package/es/Player/live_heart.js

@@ -1,9 +1,16 @@
 import _useRafInterval from "ahooks/es/useRafInterval";
-import React, { useEffect } from 'react';
-import BrowserTab from './event/browserTabEvent';
+import _useUpdateEffect from "ahooks/es/useUpdateEffect";
+import _useDocumentVisibility from "ahooks/es/useDocumentVisibility";
+import React, { useRef } from 'react';
+import Events from './event/eventName';
 
 function LiveHeart(_ref) {
-  var api = _ref.api;
+  var api = _ref.api,
+      event = _ref.event;
+
+  var documentVisibility = _useDocumentVisibility();
+
+  var cTimeRef = useRef(null);
 
   var run = function run() {
     var current = api.getCurrentTime();
@@ -16,21 +23,26 @@ function LiveHeart(_ref) {
     }
   };
 
-  useEffect(function () {
-    var browserTabChange = function browserTabChange() {
-      BrowserTab.visibilityState() === 'visible' && run();
-    };
+  _useUpdateEffect(function () {
+    return run();
+  }, [documentVisibility]);
 
-    BrowserTab.addEventListener(browserTabChange);
-    return function () {
-      BrowserTab.removeEventListener(browserTabChange);
-    }; // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [api]);
+  _useRafInterval(function () {
+    return cTimeRef.current = api.getCurrentTime();
+  }, 1 * 1000);
 
   _useRafInterval(function () {
     return run();
   }, 30 * 1000);
 
+  _useRafInterval(function () {
+    var cuurentTime = api.getCurrentTime();
+
+    if (!api.video.paused && cuurentTime === cTimeRef.current) {
+      event.emit(Events.ERROR);
+    }
+  }, 20 * 1000);
+
   return /*#__PURE__*/React.createElement(React.Fragment, null);
 }
 

package/es/Player/message.js

@@ -110,8 +110,8 @@ function VideoMessage(_ref) {
       api.pause();
     };
 
-    event.addEventListener('loadstart', openLoading);
-    event.addEventListener('waiting', openLoading); // event.addEventListener('seeking', openLoading)
+    event.addEventListener('loadstart', openLoading); // event.addEventListener('waiting', openLoading);
+    // event.addEventListener('seeking', openLoading)
 
     event.addEventListener('loadeddata', closeLoading);
     event.addEventListener('canplay', closeLoading);
@@ -122,8 +122,8 @@ function VideoMessage(_ref) {
     event.on(EventName.HISTORY_PLAY_END, playEnd);
     event.on(EventName.CLEAR_ERROR_TIMER, reloadSuccess);
     return function () {
-      event.removeEventListener('loadstart', openLoading);
-      event.removeEventListener('waiting', openLoading); // event.removeEventListener('seeking', openLoading)
+      event.removeEventListener('loadstart', openLoading); // event.removeEventListener('waiting', openLoading);
+      // event.removeEventListener('seeking', openLoading)
 
       event.removeEventListener('loadeddata', closeLoading);
       event.removeEventListener('canplay', closeLoading);

package/es/Player/player.d.ts

@@ -1,12 +1,12 @@
-import type FlvJs from 'flv.zv.js';
+import type Flvjs from '@cloud-app-dev/flv.js';
 import type Hls, { HlsConfig } from 'hls.js';
 import type React from 'react';
 import type Api from './api';
 import type VideoEventInstance from './event';
 
 export type FlvPlayerConfig = {
-  mediaDataSource: FlvJs.MediaDataSource;
-  config: FlvJs.Config;
+  mediaDataSource: Flvjs.MediaDataSource;
+  config: Flvjs.Config;
 };
 
 export interface ISinglePlayerProps {
@@ -198,7 +198,7 @@ export type ExportPlayerType = {
   container: HTMLElement;
   api: Api;
   event: VideoEventInstance;
-  plugins: [FlvJs.Player, Hls];
+  plugins: [Flvjs.Player, Hls];
   fit?: string;
   setIndex?: (i: number) => void;
   seekTo?: (i: number) => void;

package/es/Player/single_player.js

@@ -213,7 +213,8 @@ var SinglePlayer = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     reload: reload,
     errorReloadTimer: errorReloadTimer
   }), isLive && /*#__PURE__*/React.createElement(LiveHeart, {
-    api: playApi
+    api: playApi,
+    event: playEvent
   })), children);
 });
 SinglePlayer.defaultProps = {

package/es/Player/util.d.ts

@@ -1,4 +1,4 @@
-import Flvjs from 'flv.zv.js';
+import Flvjs from '@cloud-app-dev/flv.js';
 import Hls, { HlsConfig } from 'hls.js';
 import type VideoEventInstance from './event';
 import type { FlvPlayerConfig } from './player';

package/es/Player/util.js

@@ -3,7 +3,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 
 import { __awaiter } from "tslib";
-import Flvjs from 'flv.zv.js';
+import Flvjs from '@cloud-app-dev/flv.js';
 import Hls from 'hls.js';
 import Events from './event/eventName';
 /**
@@ -39,21 +39,17 @@ export function createFlvPlayer(video, url, isLive, flvConfig) {
     return undefined;
   }
 
+  Flvjs.LoggingControl.enableDebug = false;
+  Flvjs.LoggingControl.enableVerbose = false;
+  Flvjs.LoggingControl.enableWarn = false;
   var mediaDataSource = Object.assign({
     type: 'flv',
     url: url
   }, flvConfig.mediaDataSource);
   var config = Object.assign({
     enableWorker: true,
-    // lazyLoad: false,
-    // Indicates how many seconds of data to be kept for lazyLoad.
-    // lazyLoadMaxDuration: 0,
-    // autoCleanupMaxBackwardDuration: 3,
-    // autoCleanupMinBackwardDuration: 2,
-    // autoCleanupSourceBuffer: true,
-    enableStashBuffer: false,
-    stashInitialSize: 128,
-    isLive: isLive !== null && isLive !== void 0 ? isLive : true
+    isLive: isLive !== null && isLive !== void 0 ? isLive : true,
+    enableStashBuffer: !isLive
   }, flvConfig.config);
   var player = Flvjs.createPlayer(mediaDataSource, config);
   player.attachMediaElement(video);
@@ -65,21 +61,21 @@ export var playReload = function playReload(video, event, flv, hls, url) {
   video.removeAttribute('src');
 
   if (flv) {
-    flv.unload();
-    flv.load();
     tryCatch(function () {
-      return flv.play();
+      flv.unload();
+      flv.load();
+      flv.play();
     });
   }
 
   if (hls) {
-    hls.swapAudioCodec();
-    hls.recoverMediaError();
-    hls.stopLoad();
-    hls.startLoad();
-    hls.loadSource(url);
     tryCatch(function () {
-      return video.play();
+      hls.swapAudioCodec();
+      hls.recoverMediaError();
+      hls.stopLoad();
+      hls.startLoad();
+      hls.loadSource(url);
+      video.play();
     });
   }
 
@@ -145,15 +141,14 @@ export function tryCatch(fn) {
             return fn();
 
           case 3:
-            _context.next = 8;
+            _context.next = 7;
             break;
 
           case 5:
             _context.prev = 5;
             _context.t0 = _context["catch"](0);
-            console.debug(_context.t0);
 
-          case 8:
+          case 7:
           case "end":
             return _context.stop();
         }

package/es/ScreenPlayer/Live.d.ts

@@ -1,5 +1,10 @@
 /// <reference types="react" />
 import type { ILivePlayerProps } from './interface';
 import './index.less';
-declare function LivePlayer({ list, children, onIndexChange, onClose, onCloseAll }: ILivePlayerProps): JSX.Element;
+declare function LivePlayer({ list, children, onIndexChange, onClose, onCloseAll, snapshot, defaultScreen, screenChange, defaultSelectIndex }: ILivePlayerProps): JSX.Element;
+declare namespace LivePlayer {
+    var defaultProps: {
+        list: any[];
+    };
+}
 export default LivePlayer;

package/es/ScreenPlayer/Live.js

@@ -1,3 +1,5 @@
+import _useUpdateEffect from "ahooks/es/useUpdateEffect";
+
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -26,16 +28,19 @@ import useVideoFit from './useVideoFit';
 import "./index.css";
 
 function LivePlayer(_ref) {
-  var _ref$list = _ref.list,
-      list = _ref$list === void 0 ? [] : _ref$list,
+  var list = _ref.list,
       children = _ref.children,
       onIndexChange = _ref.onIndexChange,
       onClose = _ref.onClose,
-      onCloseAll = _ref.onCloseAll;
+      onCloseAll = _ref.onCloseAll,
+      snapshot = _ref.snapshot,
+      defaultScreen = _ref.defaultScreen,
+      screenChange = _ref.screenChange,
+      defaultSelectIndex = _ref.defaultSelectIndex;
 
   var _useState = useState({
-    screenNum: 4,
-    selectIndex: 0,
+    screenNum: defaultScreen !== null && defaultScreen !== void 0 ? defaultScreen : 4,
+    selectIndex: defaultSelectIndex !== null && defaultSelectIndex !== void 0 ? defaultSelectIndex : 0,
     modes: []
   }),
       _useState2 = _slicedToArray(_useState, 2),
@@ -87,18 +92,50 @@ function LivePlayer(_ref) {
     setState(function (old) {
       return Object.assign(Object.assign({}, old), obj);
     });
-  }; // index变化同步到父组件
-  // eslint-disable-next-line react-hooks/exhaustive-deps
+  }; // 当前窗口信息
+
 
+  var segmentItem = useMemo(function () {
+    return list[state.selectIndex] || {};
+  }, [state.selectIndex, list]);
+  /**
+   * 同步外部的selectIndex变化
+   */
 
   useEffect(function () {
-    return onIndexChange(state.selectIndex);
+    if (typeof defaultSelectIndex !== 'number') {
+      return;
+    }
+
+    setState(function (old) {
+      if (old.selectIndex !== defaultSelectIndex) {
+        return Object.assign(Object.assign({}, old), {
+          selectIndex: defaultSelectIndex
+        });
+      }
+
+      return old;
+    });
+  }, [defaultSelectIndex]); // index变化同步到父组件
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+
+  _useUpdateEffect(function () {
+    return onIndexChange && onIndexChange(state.selectIndex);
   }, [state.selectIndex]);
+  /**
+   * 通知screenNum变化
+   */
+
+
+  _useUpdateEffect(function () {
+    return screenChange && onIndexChange(state.screenNum);
+  }, [state.screenNum]);
+
   return /*#__PURE__*/React.createElement("div", {
-    className: "split-screen-player-wrapper",
-    ref: domRef
+    className: "split-screen-player-wrapper split-screen-player-live-wrapper"
   }, /*#__PURE__*/React.createElement("div", {
-    className: "player-layout"
+    className: "player-layout",
+    ref: domRef
   }, screenList.map(function (item, index) {
     var _a;
 
@@ -126,15 +163,20 @@ function LivePlayer(_ref) {
     onClose: onClose,
     onCloseAll: onCloseAll,
     fit: fit,
+    disabled: !segmentItem.url,
     toggleFit: toggleFit,
     getPlayerItem: getPlayerItem,
     screenNum: state.screenNum,
     mode: state.modes[state.selectIndex],
     containerRef: domRef,
-    updateState: updateState
+    updateState: updateState,
+    snapshot: snapshot
   }), children && /*#__PURE__*/React.cloneElement(children, {
     selectIndex: state.selectIndex
   }));
 }
 
+LivePlayer.defaultProps = {
+  list: []
+};
 export default LivePlayer;

package/es/ScreenPlayer/LiveTools.d.ts

@@ -14,6 +14,8 @@ interface IToolsProps {
     toggleFit?: () => void;
     onClose?: () => void;
     onCloseAll?: () => void;
+    disabled: boolean;
+    snapshot?: (base64?: string) => void;
 }
-declare function LiveTools({ containerRef, updateState, screenNum, getPlayerItem, mode, toggleFit, fit, onClose, onCloseAll }: IToolsProps): JSX.Element;
+declare function LiveTools({ containerRef, updateState, screenNum, getPlayerItem, mode, toggleFit, fit, onClose, onCloseAll, disabled, snapshot }: IToolsProps): JSX.Element;
 export default LiveTools;

package/es/ScreenPlayer/LiveTools.js

@@ -16,6 +16,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React from 'react';
 import IconFont from '../Player/iconfont';
 import ScreenSelect from './ScreenSelect';
+import DisableMark from '../DisableMark';
 
 function LiveTools(_ref) {
   var containerRef = _ref.containerRef,
@@ -26,7 +27,9 @@ function LiveTools(_ref) {
       toggleFit = _ref.toggleFit,
       fit = _ref.fit,
       onClose = _ref.onClose,
-      onCloseAll = _ref.onCloseAll;
+      onCloseAll = _ref.onCloseAll,
+      disabled = _ref.disabled,
+      snapshot = _ref.snapshot;
 
   var _useFullscreen = _useFullscreen3(containerRef),
       _useFullscreen2 = _slicedToArray(_useFullscreen, 2),
@@ -50,14 +53,17 @@ function LiveTools(_ref) {
     player ? player.reload ? player.reload() : player.api.reload() : undefined;
   };
 
-  var snapshot = function snapshot() {
+  var snapshotaction = function snapshotaction() {
     var player = getPlayerItem();
-    return player ? player.api.snapshot() : undefined;
+    var base64 = player ? player.api.snapshot() : undefined;
+    snapshot && snapshot(base64);
   };
 
   var player = getPlayerItem();
   return /*#__PURE__*/React.createElement("div", {
     className: "player-tools"
+  }, /*#__PURE__*/React.createElement(DisableMark, {
+    disabled: disabled
   }, /*#__PURE__*/React.createElement("div", {
     className: "player-tools-left"
   }, /*#__PURE__*/React.createElement("span", {
@@ -70,7 +76,7 @@ function LiveTools(_ref) {
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "lm-player-xiangji1fill",
     title: "\u622A\u56FE",
-    onClick: snapshot
+    onClick: snapshotaction
   })), /*#__PURE__*/React.createElement("span", {
     className: "player-tools-item",
     onClick: reload
@@ -92,9 +98,7 @@ function LiveTools(_ref) {
     },
     type: "lm-player-S_Device_shezhi",
     title: "\u5207\u6362".concat(mode === 1 ? '插件' : '浏览器', "\u6A21\u5F0F")
-  }))), /*#__PURE__*/React.createElement("div", {
-    className: "player-tools-mid"
-  }, /*#__PURE__*/React.createElement("div", {
+  })), /*#__PURE__*/React.createElement("div", {
     className: "player-tools-item",
     onClick: onClose,
     style: {
@@ -104,11 +108,13 @@ function LiveTools(_ref) {
     type: "lm-player-tingzhi",
     title: "\u505C\u6B62",
     style: {
-      fontSize: 16,
+      fontSize: 14,
       position: 'relative',
       top: 1
     }
-  })), /*#__PURE__*/React.createElement("div", {
+  }))), /*#__PURE__*/React.createElement("div", {
+    className: "player-tools-mid"
+  }, /*#__PURE__*/React.createElement("div", {
     className: "player-tools-item",
     onClick: playToggle,
     style: {
@@ -163,7 +169,7 @@ function LiveTools(_ref) {
   }) : /*#__PURE__*/React.createElement(IconFont, {
     type: "lm-player-quanping",
     title: "\u5168\u5C4F"
-  }))));
+  })))));
 }
 
 export default LiveTools;