@vtx/player 1.9.5 → 1.9.7

package/lib/live-control-v2/style/index.less

@@ -1,192 +1,192 @@
-.vtx-live-control-v2 {
-    display: flex;
-    flex-direction: column;
-
-    .player-grid-container {
-        display: grid;
-        flex-grow: 1;
-        grid-gap: 1px;
-        height: 0;
-        background-color: rgba(0, 0, 0, 0.8);
-
-        &._1 {
-            grid-template-rows: 1fr;
-            grid-template-columns: 1fr;
-        }
-
-        &._4 {
-            grid-template-rows: 1fr 1fr;
-            grid-template-columns: 1fr 1fr;
-        }
-        &._9 {
-            grid-template-rows: 1fr 1fr 1fr;
-            grid-template-columns: 1fr 1fr 1fr;
-        }
-        &._16 {
-            grid-template-rows: 1fr 1fr 1fr 1fr;
-            grid-template-columns: 1fr 1fr 1fr 1fr;
-        }
-        &._25 {
-            grid-template-rows: 1fr 1fr 1fr 1fr 1fr;
-            grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
-        }
-        &._6 {
-            grid-template-rows: 1fr 1fr 1fr;
-            grid-template-columns: 1fr 1fr 1fr;
-            :nth-child(1) {
-                grid-column-start: 1;
-                grid-column-end: 3;
-                grid-row-start: 1;
-                grid-row-end: 3;
-            }
-        }
-        &._8 {
-            grid-template-rows: 1fr 1fr 1fr 1fr;
-            grid-template-columns: 1fr 1fr 1fr 1fr;
-            :nth-child(1) {
-                grid-column-start: 1;
-                grid-column-end: 4;
-                grid-row-start: 1;
-                grid-row-end: 4;
-            }
-        }
-        &._10 {
-            grid-template-rows: 1fr 1fr 1fr 1fr 1fr;
-            grid-template-columns: 1fr 1fr 1fr;
-            :nth-child(1) {
-                grid-column-start: 1;
-                grid-column-end: 3;
-                grid-row-start: 1;
-                grid-row-end: 4;
-            }
-        }
-        &._13 {
-            grid-template-rows: 1fr 1fr 1fr 1fr;
-            grid-template-columns: 1fr 1fr 1fr 1fr;
-            :nth-child(1) {
-                grid-column-start: 1;
-                grid-column-end: 3;
-                grid-row-start: 1;
-                grid-row-end: 3;
-            }
-        }
-        &._14 {
-            grid-template-rows: 1fr 1fr 1fr 1fr 1fr;
-            grid-template-columns: 1fr 1fr 1fr 1fr;
-            :nth-child(1) {
-                grid-column-start: 1;
-                grid-column-end: 3;
-                grid-row-start: 1;
-                grid-row-end: 4;
-            }
-            :nth-child(2) {
-                grid-column-start: 3;
-                grid-column-end: 5;
-            }
-        }
-        &._17 {
-            grid-template-rows: 1fr 1fr 1fr 1fr 1fr;
-            grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
-            :nth-child(1) {
-                grid-column-start: 1;
-                grid-column-end: 4;
-                grid-row-start: 1;
-                grid-row-end: 4;
-            }
-        }
-        &._22 {
-            grid-template-rows: 1fr 1fr 1fr 1fr 1fr;
-            grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
-            :nth-child(1) {
-                grid-column-start: 1;
-                grid-column-end: 3;
-                grid-row-start: 1;
-                grid-row-end: 3;
-            }
-        }
-        .grid-item-container {
-            display: flex;
-            flex-direction: column;
-            min-width: 0;
-            min-height: 0;
-            background-color: #2b3d51;
-            align-items: center;
-            &.emptyImg {
-                background-image: url('../images/empty.png');
-                background-repeat: no-repeat;
-                background-position: center;
-            }
-            &.active {
-                box-shadow: 0 0 0 1px #52c41a;
-            }
-            > .content {
-                width: 100%;
-                height: calc(100% - 26px);
-                display: flex;
-                align-items: center;
-                justify-content: center;
-            }
-        }
-    }
-
-    .bottom-controls {
-        display: flex;
-        align-items: center;
-        width: 100%;
-        height: 33px;
-        padding: 0 12px;
-        background-color: #243241;
-
-        .right {
-            margin-left: auto;
-
-            > div {
-                height: 24px;
-            }
-        }
-        .split-line {
-            margin-top: 6px;
-            width: 1px;
-            background-color: rgba(255, 255, 255, 0.1);
-            height: 14px;
-        }
-        .controls-icon-hover {
-            color: rgba(255, 255, 255, 0.65);
-            display: flex;
-            align-items: center;
-            padding-top: 2px;
-            .hover-hide {
-                display: inline-block;
-                vertical-align: 0.1em;
-                font-size: 12px;
-            }
-            .hover-show {
-                display: none;
-                vertical-align: 0.1em;
-                font-size: 12px;
-            }
-            &:hover {
-                .hover-hide {
-                    display: none;
-                }
-                .hover-show {
-                    display: inline-block;
-                    color: #1890ff;
-                    vertical-align: 0.2em;
-                }
-            }
-        }
-        .grid-change-disable {
-            color: rgba(255, 255, 255, 0.65);
-            display: flex;
-            align-items: center;
-            padding-top: 2px;
-            cursor: not-allowed;
-            .arrow {
-                display: inline-block;
-                vertical-align: 0.1em;
-                font-size: 12px;
-            }
-        }
-    }
-}
+.vtx-live-control-v2 {
+    display: flex;
+    flex-direction: column;
+
+    .player-grid-container {
+        display: grid;
+        flex-grow: 1;
+        grid-gap: 1px;
+        height: 0;
+        background-color: rgba(0, 0, 0, 0.8);
+
+        &._1 {
+            grid-template-rows: 1fr;
+            grid-template-columns: 1fr;
+        }
+
+        &._4 {
+            grid-template-rows: 1fr 1fr;
+            grid-template-columns: 1fr 1fr;
+        }
+        &._9 {
+            grid-template-rows: 1fr 1fr 1fr;
+            grid-template-columns: 1fr 1fr 1fr;
+        }
+        &._16 {
+            grid-template-rows: 1fr 1fr 1fr 1fr;
+            grid-template-columns: 1fr 1fr 1fr 1fr;
+        }
+        &._25 {
+            grid-template-rows: 1fr 1fr 1fr 1fr 1fr;
+            grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
+        }
+        &._6 {
+            grid-template-rows: 1fr 1fr 1fr;
+            grid-template-columns: 1fr 1fr 1fr;
+            :nth-child(1) {
+                grid-column-start: 1;
+                grid-column-end: 3;
+                grid-row-start: 1;
+                grid-row-end: 3;
+            }
+        }
+        &._8 {
+            grid-template-rows: 1fr 1fr 1fr 1fr;
+            grid-template-columns: 1fr 1fr 1fr 1fr;
+            :nth-child(1) {
+                grid-column-start: 1;
+                grid-column-end: 4;
+                grid-row-start: 1;
+                grid-row-end: 4;
+            }
+        }
+        &._10 {
+            grid-template-rows: 1fr 1fr 1fr 1fr 1fr;
+            grid-template-columns: 1fr 1fr 1fr;
+            :nth-child(1) {
+                grid-column-start: 1;
+                grid-column-end: 3;
+                grid-row-start: 1;
+                grid-row-end: 4;
+            }
+        }
+        &._13 {
+            grid-template-rows: 1fr 1fr 1fr 1fr;
+            grid-template-columns: 1fr 1fr 1fr 1fr;
+            :nth-child(1) {
+                grid-column-start: 1;
+                grid-column-end: 3;
+                grid-row-start: 1;
+                grid-row-end: 3;
+            }
+        }
+        &._14 {
+            grid-template-rows: 1fr 1fr 1fr 1fr 1fr;
+            grid-template-columns: 1fr 1fr 1fr 1fr;
+            :nth-child(1) {
+                grid-column-start: 1;
+                grid-column-end: 3;
+                grid-row-start: 1;
+                grid-row-end: 4;
+            }
+            :nth-child(2) {
+                grid-column-start: 3;
+                grid-column-end: 5;
+            }
+        }
+        &._17 {
+            grid-template-rows: 1fr 1fr 1fr 1fr 1fr;
+            grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
+            :nth-child(1) {
+                grid-column-start: 1;
+                grid-column-end: 4;
+                grid-row-start: 1;
+                grid-row-end: 4;
+            }
+        }
+        &._22 {
+            grid-template-rows: 1fr 1fr 1fr 1fr 1fr;
+            grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
+            :nth-child(1) {
+                grid-column-start: 1;
+                grid-column-end: 3;
+                grid-row-start: 1;
+                grid-row-end: 3;
+            }
+        }
+        .grid-item-container {
+            display: flex;
+            flex-direction: column;
+            min-width: 0;
+            min-height: 0;
+            background-color: #2b3d51;
+            align-items: center;
+            &.emptyImg {
+                background-image: url('../images/empty.png');
+                background-repeat: no-repeat;
+                background-position: center;
+            }
+            &.active {
+                box-shadow: 0 0 0 1px #52c41a;
+            }
+            > .content {
+                width: 100%;
+                height: calc(100% - 26px);
+                display: flex;
+                align-items: center;
+                justify-content: center;
+            }
+        }
+    }
+
+    .bottom-controls {
+        display: flex;
+        align-items: center;
+        width: 100%;
+        height: 33px;
+        padding: 0 12px;
+        background-color: #243241;
+
+        .right {
+            margin-left: auto;
+
+            > div {
+                height: 24px;
+            }
+        }
+        .split-line {
+            margin-top: 6px;
+            width: 1px;
+            background-color: rgba(255, 255, 255, 0.1);
+            height: 14px;
+        }
+        .controls-icon-hover {
+            color: rgba(255, 255, 255, 0.65);
+            display: flex;
+            align-items: center;
+            padding-top: 2px;
+            .hover-hide {
+                display: inline-block;
+                vertical-align: 0.1em;
+                font-size: 12px;
+            }
+            .hover-show {
+                display: none;
+                vertical-align: 0.1em;
+                font-size: 12px;
+            }
+            &:hover {
+                .hover-hide {
+                    display: none;
+                }
+                .hover-show {
+                    display: inline-block;
+                    color: #1890ff;
+                    vertical-align: 0.2em;
+                }
+            }
+        }
+        .grid-change-disable {
+            color: rgba(255, 255, 255, 0.65);
+            display: flex;
+            align-items: center;
+            padding-top: 2px;
+            cursor: not-allowed;
+            .arrow {
+                display: inline-block;
+                vertical-align: 0.1em;
+                font-size: 12px;
+            }
+        }
+    }
+}

package/lib/live-player/index.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _controls = require("../controls");
@@ -14,13 +13,15 @@ var _player = _interopRequireDefault(require("../player"));
 var _utils = require("../utils");
 var _ahooks = require("ahooks");
 var _space = _interopRequireDefault(require("antd/lib/space"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { if (r) i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n;else { var o = function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); }; o("next", 0), o("throw", 1), o("return", 2); } }, _regeneratorDefine2(e, r, n, t); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 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."); }
-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); }
-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; }
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
   function adopt(value) {
     return value instanceof P ? value : new P(function (resolve) {
@@ -116,75 +117,72 @@ var LivePlayer = function LivePlayer(props, selfRef) {
     }
     var player = null;
     (function () {
-      return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regenerator().m(function _callee() {
         var token;
-        return _regenerator["default"].wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                if (!(type === 'icc_ws')) {
-                  _context.next = 5;
-                  break;
-                }
-                _context.next = 3;
-                return _api["default"].getToken({
-                  deviceId: deviceId
-                });
-              case 3:
-                token = _context.sent;
-                localStorage.setItem('accessToken', token);
-              case 5:
-                _context.next = 7;
-                return new _player["default"]({
-                  url: url,
-                  deviceIp: deviceIp,
-                  deviceId: deviceId,
-                  devicePort: devicePort,
-                  userName: userName,
-                  password: password,
-                  streamType: streamType,
-                  deviceCode: deviceCode,
-                  channelNum: channelNum,
-                  enableAgent: enableAgent,
-                  container: container,
-                  type: type,
-                  reload: function reload() {
-                    if (typeof _reload === 'function') {
-                      _reload();
-                    }
-                  },
-                  onClose: function onClose() {
-                    if (typeof _onClose === 'function') {
-                      _onClose();
-                    }
+        return _regenerator().w(function (_context) {
+          while (1) switch (_context.n) {
+            case 0:
+              if (!(type === 'icc_ws')) {
+                _context.n = 2;
+                break;
+              }
+              _context.n = 1;
+              return _api["default"].getToken({
+                deviceId: deviceId
+              });
+            case 1:
+              token = _context.v;
+              localStorage.setItem('accessToken', token);
+            case 2:
+              _context.n = 3;
+              return new _player["default"]({
+                url: url,
+                deviceIp: deviceIp,
+                deviceId: deviceId,
+                devicePort: devicePort,
+                userName: userName,
+                password: password,
+                streamType: streamType,
+                deviceCode: deviceCode,
+                channelNum: channelNum,
+                enableAgent: enableAgent,
+                container: container,
+                type: type,
+                reload: function reload() {
+                  if (typeof _reload === 'function') {
+                    _reload();
                   }
-                });
-              case 7:
-                player = _context.sent;
-                playerRef.current = player;
+                },
+                onClose: function onClose() {
+                  if (typeof _onClose === 'function') {
+                    _onClose();
+                  }
+                }
+              });
+            case 3:
+              player = _context.v;
+              playerRef.current = player;
+              setState({
+                loading: true,
+                error: false
+              });
+              player.play().then(function () {
                 setState({
-                  loading: true,
+                  play: true,
                   error: false
                 });
-                player.play().then(function () {
-                  setState({
-                    play: true,
-                    error: false
-                  });
-                })["catch"](function () {
-                  return setState({
-                    error: true
-                  });
-                })["finally"](function () {
-                  setState({
-                    loading: false
-                  });
-                  loaded && loaded();
+              })["catch"](function () {
+                return setState({
+                  error: true
+                });
+              })["finally"](function () {
+                setState({
+                  loading: false
                 });
-              case 11:
-              case "end":
-                return _context.stop();
-            }
+                loaded && loaded();
+              });
+            case 4:
+              return _context.a(2);
           }
         }, _callee);
       }));
@@ -264,6 +262,5 @@ var LivePlayer = function LivePlayer(props, selfRef) {
   })) : null;
 };
 // LivePlayer.displayName = 'live-player';
-var _default = /*#__PURE__*/(0, _react.forwardRef)(LivePlayer);
-exports["default"] = _default;
+var _default = exports["default"] = /*#__PURE__*/(0, _react.forwardRef)(LivePlayer);
 //# sourceMappingURL=index.js.map