@cloud-app-dev/vidc 4.0.3 → 4.0.4

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.
@@ -1,21 +1,13 @@
1
1
  function _construct(Parent, args, Class) { if (_isNativeReflectConstruct()) { _construct = Reflect.construct.bind(); } else { _construct = function _construct(Parent, args, Class) { var a = [null]; a.push.apply(a, args); var Constructor = Function.bind.apply(Parent, a); var instance = new Constructor(); if (Class) _setPrototypeOf(instance, Class.prototype); return instance; }; } return _construct.apply(null, arguments); }
2
-
3
2
  function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
4
-
5
3
  function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
6
-
7
4
  function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
8
-
9
5
  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."); }
10
-
11
6
  function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
12
-
13
7
  function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
14
-
15
8
  function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
16
-
17
- function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
18
-
9
+ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
10
+ /* eslint-disable @typescript-eslint/triple-slash-reference */
19
11
  /// <reference path="../AMap.d.ts" />
20
12
  import React, { useContext, useEffect, useRef } from 'react';
21
13
  import ReactDOM from 'react-dom';
@@ -24,24 +16,22 @@ import useMapType from "../hook/useMapType";
24
16
  import { jsx as _jsx } from "react/jsx-runtime";
25
17
  import { Fragment as _Fragment } from "react/jsx-runtime";
26
18
  import { jsxs as _jsxs } from "react/jsx-runtime";
27
- export default function InfoWindow(_ref) {
19
+ function InfoWindow(_ref) {
28
20
  var children = _ref.children,
29
- visible = _ref.visible,
30
- center = _ref.center,
31
- width = _ref.width,
32
- height = _ref.height;
33
-
21
+ visible = _ref.visible,
22
+ center = _ref.center,
23
+ width = _ref.width,
24
+ height = _ref.height;
34
25
  var _useContext = useContext(mapContext),
35
- instance = _useContext.instance;
36
-
26
+ instance = _useContext.instance;
37
27
  var domref = useRef(null);
38
- var infoWindowRef = useRef(null);
28
+ var infoWindowRef = useRef();
39
29
  var type = useMapType();
40
30
  useEffect(function () {
41
31
  if (!instance.map) {
42
32
  return;
43
- } // leaflet下还未实现
44
-
33
+ }
34
+ // leaflet下还未实现
45
35
 
46
36
  if (type.AMap && !infoWindowRef.current) {
47
37
  var infoWindow = new AMap.InfoWindow({
@@ -51,30 +41,27 @@ export default function InfoWindow(_ref) {
51
41
  offset: [0, -32]
52
42
  });
53
43
  infoWindowRef.current = infoWindow;
54
- } // eslint-disable-next-line react-hooks/exhaustive-deps
55
-
44
+ }
45
+ // eslint-disable-next-line react-hooks/exhaustive-deps
56
46
  }, [instance.map, visible, center]);
57
47
  useEffect(function () {
58
48
  var infoWindow = infoWindowRef.current;
59
-
60
49
  if (!infoWindow || !center) {
61
50
  return undefined;
62
51
  }
63
-
64
52
  if (type.AMap) {
65
53
  var map = instance.map;
66
-
67
54
  var lnglat = _construct(AMap.LngLat, _toConsumableArray(center));
68
-
69
- map.setCenter(lnglat); // eslint-disable-next-line @typescript-eslint/no-unused-expressions
70
-
55
+ map.setCenter(lnglat);
56
+ // eslint-disable-next-line @typescript-eslint/no-unused-expressions
71
57
  visible ? !infoWindow.getIsOpen() ? (infoWindow.close(), infoWindow.open(instance.map, lnglat)) : infoWindow.open(instance.map, lnglat) : infoWindow.close();
72
- } // eslint-disable-next-line react-hooks/exhaustive-deps
73
-
58
+ }
59
+ // eslint-disable-next-line react-hooks/exhaustive-deps
74
60
  }, [visible, center, instance.map]);
75
61
  return /*#__PURE__*/_jsxs(_Fragment, {
76
62
  children: [/*#__PURE__*/_jsx("div", {
77
63
  ref: domref
78
64
  }), domref.current && /*#__PURE__*/ReactDOM.createPortal(children, domref.current)]
79
65
  });
80
- }
66
+ }
67
+ export default InfoWindow;
@@ -0,0 +1,3 @@
1
+ /// <reference types="react" />
2
+ declare const App: () => JSX.Element;
3
+ export default App;
@@ -0,0 +1,16 @@
1
+ import React from 'react';
2
+ import SinglePoint from "./index";
3
+ import { jsx as _jsx } from "react/jsx-runtime";
4
+ var App = function App() {
5
+ return /*#__PURE__*/_jsx("div", {
6
+ style: {
7
+ width: '100%',
8
+ height: 800
9
+ },
10
+ children: /*#__PURE__*/_jsx(SinglePoint, {
11
+ center: [112.94477421092171, 38.499347690146514],
12
+ title: "\u8BBE\u7F6E1111"
13
+ })
14
+ });
15
+ };
16
+ export default App;
package/es/Map/index.d.ts CHANGED
@@ -1,10 +1,10 @@
1
1
  /// <reference types="react" />
2
+ import BasicMap from './BasicMap';
2
3
  import ClusterLayer from './ClusterLayer';
3
4
  import Config from './Config';
4
5
  import Context from './Context';
5
6
  import FindPio from './FindPio';
6
7
  import LoaderMap from './LoaderMap';
7
- import BasicMap from './BasicMap';
8
8
  import ResetTools from './ResetTools';
9
9
  import useMarker from './useMarker';
10
10
  import withMap from './withMap';
package/es/Map/index.js CHANGED
@@ -1,10 +1,10 @@
1
+ import BasicMap from "./BasicMap";
1
2
  import ClusterLayer from "./ClusterLayer";
2
3
  import Config from "./Config";
3
4
  import Context from "./Context";
4
5
  import FindPio from "./FindPio";
5
6
  import LevelCenter from "./LevelCenter";
6
7
  import LoaderMap from "./LoaderMap";
7
- import BasicMap from "./BasicMap";
8
8
  import ResetTools from "./ResetTools";
9
9
  import SinglePoint from "./SinglePoint";
10
10
  import useMarker from "./useMarker";
@@ -0,0 +1,3 @@
1
+ /// <reference types="react" />
2
+ declare const App: () => JSX.Element;
3
+ export default App;
@@ -0,0 +1,13 @@
1
+ import React from 'react';
2
+ import Map3D from '.';
3
+ import { jsx as _jsx } from "react/jsx-runtime";
4
+ var App = function App() {
5
+ return /*#__PURE__*/_jsx("div", {
6
+ style: {
7
+ width: 1000,
8
+ height: 400
9
+ },
10
+ children: /*#__PURE__*/_jsx(Map3D, {})
11
+ });
12
+ };
13
+ export default App;
@@ -0,0 +1,4 @@
1
+ /// <reference types="react" />
2
+ import './index.less';
3
+ declare function withLoadMap(): JSX.Element;
4
+ export default withLoadMap;
@@ -0,0 +1,84 @@
1
+ import React, { useEffect, useRef } from 'react';
2
+ import LoaderScript from "../LoaderScript";
3
+ import "./index.less";
4
+
5
+ // const options: IOptionsLoader[] = [
6
+ // { scripts: ['http://192.168.101.38:8888/twinmap/resources/TwinMap3D/lib/Cesium/Cesium.js'] },
7
+ // { scripts: ['http://192.168.101.38:8888/twinmap/resources/TwinMap3D/TwinMap3D.js'] },
8
+ // ];
9
+ import { jsx as _jsx } from "react/jsx-runtime";
10
+ var options = [{
11
+ scripts: []
12
+ }, {
13
+ scripts: []
14
+ }];
15
+ var _this = window;
16
+ function Map3D() {
17
+ var ref = useRef(null);
18
+ useEffect(function () {
19
+ var viewer = new _this.Cesium.Viewer(ref.current, {
20
+ infoBox: false,
21
+ selectionIndicator: false,
22
+ navigation: false,
23
+ animation: false,
24
+ shouldAnimate: false,
25
+ timeline: false,
26
+ baseLayerPicker: false,
27
+ geocoder: false,
28
+ homeButton: false,
29
+ sceneModePicker: false,
30
+ navigationHelpButton: false,
31
+ fullscreenButton: !1
32
+ });
33
+ var url = 'http://192.168.101.38:8888/twinmap/twin3dMap/model/b3dms/tileset.json';
34
+ var tileset = new _this.Cesium.Cesium3DTileset({
35
+ url: url
36
+ });
37
+ viewer.scene.primitives.add(tileset).readyPromise.then(function (t) {
38
+ console.log(t);
39
+ viewer.zoomTo(t);
40
+ tileset.maximumScreenSpaceError = 1;
41
+ var plotDraw = new _this.TwinMap3D.Tools.GeoPlotDraw(viewer);
42
+ plotDraw.activate('marker');
43
+
44
+ // const params = {
45
+ // tx: 116.044332, //模型中心X轴坐标(经度,单位:十进制度)
46
+ // ty: 30.110653, //模型中心Y轴坐标(纬度,单位:十进制度)
47
+ // tz: 0, //模型中心Z轴坐标(高程,单位:米)
48
+ // rx: 0, //X轴(经度)方向旋转角度(单位:度)
49
+ // ry: 0, //Y轴(纬度)方向旋转角度(单位:度)
50
+ // rz: 0, //Z轴(高程)方向旋转角度(单位:度)
51
+ // };
52
+ //平移、贴地、旋转模型
53
+ //旋转
54
+ // const mx = _this.Cesium.Matrix3.fromRotationX(_this.Cesium.Math.toRadians(params.rx));
55
+ // const my = _this.Cesium.Matrix3.fromRotationY(_this.Cesium.Math.toRadians(params.ry));
56
+ // const mz = _this.Cesium.Matrix3.fromRotationZ(_this.Cesium.Math.toRadians(params.rz));
57
+ // const rotationX = _this.Cesium.Matrix4.fromRotationTranslation(mx);
58
+ // const rotationY = _this.Cesium.Matrix4.fromRotationTranslation(my);
59
+ // const rotationZ = _this.Cesium.Matrix4.fromRotationTranslation(mz);
60
+ //平移
61
+ // const position = _this.Cesium.Cartesian3.fromDegrees(params.tx, params.ty, params.tz);
62
+ // const m = _this.Cesium.Transforms.eastNorthUpToFixedFrame(position);
63
+ //旋转、平移矩阵相乘
64
+ // _this.Cesium.Matrix4.multiply(m, rotationX, m);
65
+ // _this.Cesium.Matrix4.multiply(m, rotationY, m);
66
+ // _this.Cesium.Matrix4.multiply(m, rotationZ, m);
67
+ //赋值给tileset
68
+ // tileset._root.transform = m;
69
+ }).otherwise(function (e) {
70
+ console.log(e);
71
+ });
72
+ }, []);
73
+ return /*#__PURE__*/_jsx("div", {
74
+ className: "map-3d-container",
75
+ ref: ref
76
+ });
77
+ }
78
+ function withLoadMap() {
79
+ return /*#__PURE__*/_jsx(LoaderScript, {
80
+ options: options,
81
+ children: /*#__PURE__*/_jsx(Map3D, {})
82
+ });
83
+ }
84
+ export default withLoadMap;
@@ -0,0 +1,4 @@
1
+ .map-3d-container {
2
+ width: 100%;
3
+ height: 100%;
4
+ }
@@ -9,6 +9,9 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
9
9
  function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
10
10
  function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
11
11
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
12
+ 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, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $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 defineProperty(generator, "_invoke", { value: makeInvokeMethod(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; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(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); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), 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, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), 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 (val) { var object = Object(val), 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; }
13
+ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
14
+ function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
12
15
  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
13
16
  function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
14
17
  function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -16,7 +19,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
16
19
  function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
17
20
  function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
18
21
  import { useEffect, useMemo, useState } from 'react';
19
- import { tryCatch } from "../../utils";
22
+ import { likeGo } from "../../utils";
20
23
  import { createFlvPlayer, createHlsPlayer } from "../util";
21
24
  var Api = /*#__PURE__*/function () {
22
25
  function Api(container) {
@@ -24,10 +27,18 @@ var Api = /*#__PURE__*/function () {
24
27
  _classCallCheck(this, Api);
25
28
  _defineProperty(this, "container", void 0);
26
29
  _defineProperty(this, "play", function () {
27
- tryCatch(function () {
30
+ likeGo( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
28
31
  var _this$video;
29
- return (_this$video = _this.video) === null || _this$video === void 0 ? void 0 : _this$video.play();
30
- });
32
+ return _regeneratorRuntime().wrap(function _callee$(_context) {
33
+ while (1) switch (_context.prev = _context.next) {
34
+ case 0:
35
+ return _context.abrupt("return", (_this$video = _this.video) === null || _this$video === void 0 ? void 0 : _this$video.play());
36
+ case 1:
37
+ case "end":
38
+ return _context.stop();
39
+ }
40
+ }, _callee);
41
+ })));
31
42
  });
32
43
  _defineProperty(this, "pause", function () {
33
44
  var _this$video2;
@@ -72,9 +83,9 @@ var Api = /*#__PURE__*/function () {
72
83
  }
73
84
  });
74
85
  _defineProperty(this, "getDuration", function () {
75
- var _ref = _this.video || {},
76
- duration = _ref.duration,
77
- seekable = _ref.seekable;
86
+ var _ref2 = _this.video || {},
87
+ duration = _ref2.duration,
88
+ seekable = _ref2.seekable;
78
89
  if (duration === Infinity && seekable && seekable.length > 0) {
79
90
  return seekable.end(seekable.length - 1);
80
91
  }
@@ -90,8 +101,8 @@ var Api = /*#__PURE__*/function () {
90
101
  });
91
102
  _defineProperty(this, "getBufferedTime", function () {
92
103
  var _buffered$end, _buffered$start, _this$getDuration;
93
- var _ref2 = _this.video || {},
94
- buffered = _ref2.buffered;
104
+ var _ref3 = _this.video || {},
105
+ buffered = _ref3.buffered;
95
106
  if (buffered && buffered.length === 0) {
96
107
  return [0, 0];
97
108
  }
@@ -183,23 +194,47 @@ export function useTypeAndPlay(url, type, isLive, container, segments, flvConfig
183
194
  video === null || video === void 0 ? void 0 : video.setAttribute('src', url !== null && url !== void 0 ? url : '');
184
195
  break;
185
196
  }
186
- (video === null || video === void 0 ? void 0 : video.paused) && tryCatch(function () {
187
- return video === null || video === void 0 ? void 0 : video.play();
188
- });
197
+ (video === null || video === void 0 ? void 0 : video.paused) && likeGo( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
198
+ return _regeneratorRuntime().wrap(function _callee2$(_context2) {
199
+ while (1) switch (_context2.prev = _context2.next) {
200
+ case 0:
201
+ return _context2.abrupt("return", video === null || video === void 0 ? void 0 : video.play());
202
+ case 1:
203
+ case "end":
204
+ return _context2.stop();
205
+ }
206
+ }, _callee2);
207
+ })));
189
208
  setState(options);
190
209
  return function () {
191
210
  if (options.flv) {
192
211
  options.flv.pause();
193
- tryCatch(function () {
212
+ likeGo( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
194
213
  var _options$flv;
195
- return (_options$flv = options.flv) === null || _options$flv === void 0 ? void 0 : _options$flv.destroy();
196
- });
214
+ return _regeneratorRuntime().wrap(function _callee3$(_context3) {
215
+ while (1) switch (_context3.prev = _context3.next) {
216
+ case 0:
217
+ return _context3.abrupt("return", (_options$flv = options.flv) === null || _options$flv === void 0 ? void 0 : _options$flv.destroy());
218
+ case 1:
219
+ case "end":
220
+ return _context3.stop();
221
+ }
222
+ }, _callee3);
223
+ })));
197
224
  } else if (options.hls) {
198
225
  video === null || video === void 0 ? void 0 : video.pause();
199
- tryCatch(function () {
226
+ likeGo( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
200
227
  var _options$hls;
201
- return (_options$hls = options.hls) === null || _options$hls === void 0 ? void 0 : _options$hls.destroy();
202
- });
228
+ return _regeneratorRuntime().wrap(function _callee4$(_context4) {
229
+ while (1) switch (_context4.prev = _context4.next) {
230
+ case 0:
231
+ return _context4.abrupt("return", (_options$hls = options.hls) === null || _options$hls === void 0 ? void 0 : _options$hls.destroy());
232
+ case 1:
233
+ case "end":
234
+ return _context4.stop();
235
+ }
236
+ }, _callee4);
237
+ })));
203
238
  } else {
204
239
  video === null || video === void 0 ? void 0 : video.pause();
205
240
  video === null || video === void 0 ? void 0 : video.removeAttribute('src');
package/es/Player/util.js CHANGED
@@ -1,4 +1,7 @@
1
1
  function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
2
+ 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, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $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 defineProperty(generator, "_invoke", { value: makeInvokeMethod(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; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(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); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), 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, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), 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 (val) { var object = Object(val), 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; }
3
+ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
4
+ function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
2
5
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
3
6
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
4
7
  function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -6,7 +9,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
6
9
  function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
7
10
  import Flvjs from '@cloud-app-dev/mpegts.js';
8
11
  import Hls from 'hls.js';
9
- import { tryCatch } from "../utils";
12
+ import { likeGo } from "../utils";
10
13
  import Events from "./event/eventName";
11
14
  /**
12
15
  * 创建HLS对象
@@ -90,25 +93,49 @@ export var playReload = function playReload(video, event, flv, hls, url) {
90
93
  }
91
94
  playUnload(video, flv, hls);
92
95
  if (flv) {
93
- tryCatch(function () {
94
- flv.load();
95
- flv.play();
96
- });
96
+ likeGo( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
97
+ return _regeneratorRuntime().wrap(function _callee$(_context) {
98
+ while (1) switch (_context.prev = _context.next) {
99
+ case 0:
100
+ flv.load();
101
+ flv.play();
102
+ case 2:
103
+ case "end":
104
+ return _context.stop();
105
+ }
106
+ }, _callee);
107
+ })));
97
108
  }
98
109
  if (hls && url) {
99
- tryCatch(function () {
100
- hls.swapAudioCodec();
101
- hls.recoverMediaError();
102
- hls.startLoad();
103
- hls.loadSource(url);
104
- video.play();
105
- });
110
+ likeGo( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
111
+ return _regeneratorRuntime().wrap(function _callee2$(_context2) {
112
+ while (1) switch (_context2.prev = _context2.next) {
113
+ case 0:
114
+ hls.swapAudioCodec();
115
+ hls.recoverMediaError();
116
+ hls.startLoad();
117
+ hls.loadSource(url);
118
+ video.play();
119
+ case 5:
120
+ case "end":
121
+ return _context2.stop();
122
+ }
123
+ }, _callee2);
124
+ })));
106
125
  }
107
126
  if (!flv && !hls && url) {
108
127
  video.setAttribute('src', url);
109
- tryCatch(function () {
110
- return video.play();
111
- });
128
+ likeGo( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
129
+ return _regeneratorRuntime().wrap(function _callee3$(_context3) {
130
+ while (1) switch (_context3.prev = _context3.next) {
131
+ case 0:
132
+ return _context3.abrupt("return", video.play());
133
+ case 1:
134
+ case "end":
135
+ return _context3.stop();
136
+ }
137
+ }, _callee3);
138
+ })));
112
139
  }
113
140
  event.emit(Events.RELOAD);
114
141
  };
@@ -166,10 +166,18 @@ function LivePlayer(_ref) {
166
166
  return /*#__PURE__*/_jsxs("div", {
167
167
  className: "split-screen-player-wrapper split-screen-player-live-wrapper",
168
168
  children: [/*#__PURE__*/_jsx("div", {
169
- className: "player-layout",
169
+ className: "player-layout container".concat(screenType === null || screenType === void 0 ? void 0 : screenType.name),
170
170
  ref: domRef,
171
171
  children: screenList.map(function (item, index) {
172
172
  var _item$url;
173
+ var className = state.selectIndex === index ? "item".concat(screenType === null || screenType === void 0 ? void 0 : screenType.name, "-").concat(index + 1, " player-current-index") : "item".concat(screenType === null || screenType === void 0 ? void 0 : screenType.name, "-").concat(index + 1);
174
+ var itemClick = function itemClick() {
175
+ return setState(function (old) {
176
+ return _objectSpread(_objectSpread({}, old), {}, {
177
+ selectIndex: index
178
+ });
179
+ });
180
+ };
173
181
  return /*#__PURE__*/_createElement(LivePlayerWithExt, _objectSpread(_objectSpread({}, item), {}, {
174
182
  mode: item.cid && state.modes[item.cid] ? state.modes[item.cid] : item.mode,
175
183
  key: (_item$url = item.url) !== null && _item$url !== void 0 ? _item$url : "".concat(index),
@@ -177,19 +185,15 @@ function LivePlayer(_ref) {
177
185
  if (item.cid) {
178
186
  playerRef.current[item.cid] = player;
179
187
  }
180
- },
181
- className: state.selectIndex === index ? 'player-current-index' : '',
182
- onClick: index !== state.selectIndex ? function () {
183
- return setState(function (old) {
184
- return _objectSpread(_objectSpread({}, old), {}, {
185
- selectIndex: index
186
- });
187
- });
188
- } : undefined,
189
- style: {
190
- width: screenType === null || screenType === void 0 ? void 0 : screenType.width,
191
- height: screenType === null || screenType === void 0 ? void 0 : screenType.height
192
- },
188
+ }
189
+ // className={state.selectIndex === index ? 'player-current-index' : ''}
190
+ ,
191
+ className: className
192
+ // onClick={index !== state.selectIndex ? () => setState((old) => ({ ...old, selectIndex: index })) : undefined}
193
+ ,
194
+ onClick: itemClick
195
+ // style={{ width: screenType?.width, height: screenType?.height }}
196
+ ,
193
197
  pluginDownloadUrl: props.pluginDownloadUrl
194
198
  }));
195
199
  })
@@ -3,7 +3,7 @@ import type { ExportPlayerType, ISegmentType, ISinglePlayerProps } from '../Play
3
3
  import type { PlayModeType } from '../PlayerExt';
4
4
  interface ILivePlayerWithExtProps extends ISinglePlayerProps {
5
5
  mode?: PlayModeType;
6
- style: React.CSSProperties;
6
+ style?: React.CSSProperties;
7
7
  onClick?: () => void;
8
8
  updatePlayer: (obj: React.MutableRefObject<ExportPlayerType>) => void;
9
9
  pluginDownloadUrl?: string;