@x-edu/live-player 0.0.40 → 0.0.41

package/dist/XEduLivePlayer.common.js

@@ -56580,7 +56580,7 @@ var MenuContext_excluded = ["children", "locked"];
 var MenuContext = /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_namespaceObject.createContext(null);
 
 function mergeProps(origin, target) {
-  var clone = _objectSpread2({}, origin);
+  var clone = objectSpread2_objectSpread2({}, origin);
 
   Object.keys(target).forEach(function (key) {
     var value = target[key];
@@ -56595,7 +56595,7 @@ function mergeProps(origin, target) {
 function InheritableContextProvider(_ref) {
   var children = _ref.children,
       locked = _ref.locked,
-      restProps = _objectWithoutProperties(_ref, MenuContext_excluded);
+      restProps = esm_objectWithoutProperties_objectWithoutProperties(_ref, MenuContext_excluded);
 
   var context = external_commonjs_react_commonjs2_react_root_React_namespaceObject.useContext(MenuContext);
   var inheritableContext = useMemo(function () {
@@ -56651,7 +56651,7 @@ var warnUtil_excluded = ["item"];
 
 function warnItemProp(_ref) {
   var item = _ref.item,
-      restInfo = _objectWithoutProperties(_ref, warnUtil_excluded);
+      restInfo = esm_objectWithoutProperties_objectWithoutProperties(_ref, warnUtil_excluded);
 
   Object.defineProperty(restInfo, 'item', {
     get: function get() {
@@ -56671,7 +56671,7 @@ function es_Icon_Icon(_ref) {
   var iconNode;
 
   if (typeof icon === 'function') {
-    iconNode = /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_namespaceObject.createElement(icon, _objectSpread2({}, props));
+    iconNode = /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_namespaceObject.createElement(icon, objectSpread2_objectSpread2({}, props));
   } else {
     // Compatible for origin definition
     iconNode = icon;
@@ -56712,7 +56712,7 @@ var PathTrackerContext = /*#__PURE__*/external_commonjs_react_commonjs2_react_ro
 function useFullPath(eventKey) {
   var parentKeyPath = external_commonjs_react_commonjs2_react_root_React_namespaceObject.useContext(PathTrackerContext);
   return external_commonjs_react_commonjs2_react_root_React_namespaceObject.useMemo(function () {
-    return eventKey !== undefined ? [].concat(_toConsumableArray(parentKeyPath), [eventKey]) : parentKeyPath;
+    return eventKey !== undefined ? [].concat(toConsumableArray_toConsumableArray(parentKeyPath), [eventKey]) : parentKeyPath;
   }, [parentKeyPath, eventKey]);
 }
 var PathUserContext = /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_namespaceObject.createContext(null);
@@ -56974,7 +56974,7 @@ function parseChildren(children, keyPath) {
       var emptyKey = eventKey === null || eventKey === undefined;
 
       if (emptyKey) {
-        eventKey = "tmp_key-".concat([].concat(_toConsumableArray(keyPath), [index]).join('-'));
+        eventKey = "tmp_key-".concat([].concat(toConsumableArray_toConsumableArray(keyPath), [index]).join('-'));
       }
 
       var cloneProps = {
@@ -57676,9 +57676,9 @@ function useAccessibility_getOffset(mode, isRootLevel, isRtl, which) {
     };
   }
 
-  var inline = (_inline = {}, _defineProperty(_inline, UP, prev), _defineProperty(_inline, DOWN, next), _inline);
-  var horizontal = (_horizontal = {}, _defineProperty(_horizontal, useAccessibility_LEFT, isRtl ? next : prev), _defineProperty(_horizontal, RIGHT, isRtl ? prev : next), _defineProperty(_horizontal, DOWN, children), _defineProperty(_horizontal, ENTER, children), _horizontal);
-  var vertical = (_vertical = {}, _defineProperty(_vertical, UP, prev), _defineProperty(_vertical, DOWN, next), _defineProperty(_vertical, ENTER, children), _defineProperty(_vertical, ESC, parent), _defineProperty(_vertical, useAccessibility_LEFT, isRtl ? children : parent), _defineProperty(_vertical, RIGHT, isRtl ? parent : children), _vertical);
+  var inline = (_inline = {}, defineProperty_defineProperty(_inline, UP, prev), defineProperty_defineProperty(_inline, DOWN, next), _inline);
+  var horizontal = (_horizontal = {}, defineProperty_defineProperty(_horizontal, useAccessibility_LEFT, isRtl ? next : prev), defineProperty_defineProperty(_horizontal, RIGHT, isRtl ? prev : next), defineProperty_defineProperty(_horizontal, DOWN, children), defineProperty_defineProperty(_horizontal, ENTER, children), _horizontal);
+  var vertical = (_vertical = {}, defineProperty_defineProperty(_vertical, UP, prev), defineProperty_defineProperty(_vertical, DOWN, next), defineProperty_defineProperty(_vertical, ENTER, children), defineProperty_defineProperty(_vertical, ESC, parent), defineProperty_defineProperty(_vertical, useAccessibility_LEFT, isRtl ? children : parent), defineProperty_defineProperty(_vertical, RIGHT, isRtl ? parent : children), _vertical);
   var offsets = {
     inline: inline,
     horizontal: horizontal,
@@ -57944,7 +57944,7 @@ function useUUID(id) {
   var _useMergedState = useControlledState(id, {
     value: id
   }),
-      _useMergedState2 = slicedToArray_slicedToArray(_useMergedState, 2),
+      _useMergedState2 = esm_slicedToArray_slicedToArray(_useMergedState, 2),
       uuid = _useMergedState2[0],
       setUUID = _useMergedState2[1];
 
@@ -57980,14 +57980,14 @@ var getPathKeys = function getPathKeys(keyPathStr) {
 var OVERFLOW_KEY = 'rc-menu-more';
 function useKeyRecords() {
   var _React$useState = external_commonjs_react_commonjs2_react_root_React_namespaceObject.useState({}),
-      _React$useState2 = slicedToArray_slicedToArray(_React$useState, 2),
+      _React$useState2 = esm_slicedToArray_slicedToArray(_React$useState, 2),
       internalForceUpdate = _React$useState2[1];
 
   var key2pathRef = (0,external_commonjs_react_commonjs2_react_root_React_namespaceObject.useRef)(new Map());
   var path2keyRef = (0,external_commonjs_react_commonjs2_react_root_React_namespaceObject.useRef)(new Map());
 
   var _React$useState3 = external_commonjs_react_commonjs2_react_root_React_namespaceObject.useState([]),
-      _React$useState4 = slicedToArray_slicedToArray(_React$useState3, 2),
+      _React$useState4 = esm_slicedToArray_slicedToArray(_React$useState3, 2),
       overflowKeys = _React$useState4[0],
       setOverflowKeys = _React$useState4[1];
 
@@ -58042,7 +58042,7 @@ function useKeyRecords() {
   }, [getKeyPath]);
 
   var getKeys = function getKeys() {
-    var keys = _toConsumableArray(key2pathRef.current.keys());
+    var keys = toConsumableArray_toConsumableArray(key2pathRef.current.keys());
 
     if (overflowKeys.length) {
       keys.push(OVERFLOW_KEY);
@@ -58059,7 +58059,7 @@ function useKeyRecords() {
     var connectedPath = "".concat(key2pathRef.current.get(key)).concat(PATH_SPLIT);
     var pathKeys = new Set();
 
-    _toConsumableArray(path2keyRef.current.keys()).forEach(function (pathKey) {
+    toConsumableArray_toConsumableArray(path2keyRef.current.keys()).forEach(function (pathKey) {
       if (pathKey.startsWith(connectedPath)) {
         pathKeys.add(path2keyRef.current.get(pathKey));
       }
@@ -58669,10 +58669,10 @@ function Dropdown(props, ref) {
       visible = props.visible,
       _props$trigger = props.trigger,
       trigger = _props$trigger === void 0 ? ['hover'] : _props$trigger,
-      otherProps = _objectWithoutProperties(props, Dropdown_excluded);
+      otherProps = esm_objectWithoutProperties_objectWithoutProperties(props, Dropdown_excluded);
 
   var _React$useState = external_commonjs_react_commonjs2_react_root_React_namespaceObject.useState(),
-      _React$useState2 = slicedToArray_slicedToArray(_React$useState, 2),
+      _React$useState2 = esm_slicedToArray_slicedToArray(_React$useState, 2),
       triggerVisible = _React$useState2[0],
       setTriggerVisible = _React$useState2[1];
 
@@ -58780,12 +58780,12 @@ function Dropdown(props, ref) {
     triggerHideAction = ['click'];
   }
 
-  return /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_namespaceObject.createElement(rc_trigger_es, _objectSpread2(_objectSpread2({
+  return /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_namespaceObject.createElement(rc_trigger_es, objectSpread2_objectSpread2(objectSpread2_objectSpread2({
     builtinPlacements: placements
   }, otherProps), {}, {
     prefixCls: prefixCls,
     ref: triggerRef,
-    popupClassName: classnames_default()(overlayClassName, _defineProperty({}, "".concat(prefixCls, "-show-arrow"), arrow)),
+    popupClassName: classnames_default()(overlayClassName, defineProperty_defineProperty({}, "".concat(prefixCls, "-show-arrow"), arrow)),
     popupStyle: overlayStyle,
     action: trigger,
     showAction: showAction,
@@ -62124,21 +62124,37 @@ var TagName = {
   3: '直播中' // 实际是暂停
 
 };
-function ListItem(_ref) {
-  var data = _ref.data,
-      isMobile = _ref.isMobile,
-      themeName = _ref.themeName,
-      subscription = _ref.subscription,
-      onDetailClick = _ref.onDetailClick,
-      handleLogin = _ref.handleLogin,
-      isLogin = _ref.isLogin,
-      onSubscribe = _ref.onSubscribe;
+var getLiveStatus = function getLiveStatus(item) {
+  // 直播开始之前：预告；直播开始之后：直播中；直播结束之后：回放
+  var _ref = item || {},
+      startTime = _ref.begin_time,
+      endTime = _ref.end_time;
+
+  if (startTime && dayjs_min_default()().isBefore(startTime)) {
+    return 0; // 预告
+  }
+
+  if (endTime && dayjs_min_default()().isAfter(endTime)) {
+    return 2; // 回放
+  }
+
+  return 1;
+};
+function ListItem(_ref2) {
+  var data = _ref2.data,
+      isMobile = _ref2.isMobile,
+      themeName = _ref2.themeName,
+      subscription = _ref2.subscription,
+      onDetailClick = _ref2.onDetailClick,
+      handleLogin = _ref2.handleLogin,
+      isLogin = _ref2.isLogin,
+      onSubscribe = _ref2.onSubscribe;
   var liveId = data.live_id,
       liveName = data.live_name,
       beginTime = data.begin_time,
-      coverUrl = data.cover_url,
-      status = data.status;
-  var timeLabel = status === 2 ? "".concat(dayjs_min_default()(beginTime).format('YYYY/MM/DD HH:mm')) : "".concat(dayjs_min_default()(beginTime).format('YYYY/MM/DD HH:mm'), " \u5F00\u59CB");
+      coverUrl = data.cover_url;
+  var liveStatus = getLiveStatus(data);
+  var timeLabel = liveStatus === 2 ? "".concat(dayjs_min_default()(beginTime).format('YYYY/MM/DD HH:mm')) : "".concat(dayjs_min_default()(beginTime).format('YYYY/MM/DD HH:mm'), " \u5F00\u59CB");
 
   var _useState = (0,external_commonjs_react_commonjs2_react_root_React_namespaceObject.useState)({}),
       _useState2 = ListItem_slicedToArray(_useState, 2),
@@ -62146,7 +62162,7 @@ function ListItem(_ref) {
       setLiveExt = _useState2[1];
 
   var _useState3 = (0,external_commonjs_react_commonjs2_react_root_React_namespaceObject.useState)(function () {
-    if (status === 0) {
+    if (liveStatus === 0) {
       // 开播前15分钟之外
       var subscriptionItem = (0,lodash.find)(subscription, {
         live_id: liveId
@@ -62191,7 +62207,7 @@ function ListItem(_ref) {
   }, []);
 
   var handleDetailClick = /*#__PURE__*/function () {
-    var _ref3 = ListItem_asyncToGenerator( /*#__PURE__*/regenerator_default().mark(function _callee2() {
+    var _ref4 = ListItem_asyncToGenerator( /*#__PURE__*/regenerator_default().mark(function _callee2() {
       return regenerator_default().wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
@@ -62221,7 +62237,7 @@ function ListItem(_ref) {
     }));
 
     return function handleDetailClick() {
-      return _ref3.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
 
@@ -62238,11 +62254,11 @@ function ListItem(_ref) {
       errorImg: live,
       className: list_ListItem_index_module.mobileCover
     }), /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_default().createElement("div", {
-      className: classnames_default()(list_ListItem_index_module.mobileTag, list_ListItem_index_module["mobileTag".concat(status)])
-    }, status === 1 || status === 3 ? /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_default().createElement("img", {
+      className: classnames_default()(list_ListItem_index_module.mobileTag, list_ListItem_index_module["mobileTag".concat(liveStatus)])
+    }, liveStatus === 1 || liveStatus === 3 ? /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_default().createElement("img", {
       src: play,
       alt: ""
-    }) : null, TagName[status])), /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_default().createElement("div", {
+    }) : null, TagName[liveStatus])), /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_default().createElement("div", {
       className: list_ListItem_index_module.mobileDescRow
     }, /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_default().createElement("div", {
       className: list_ListItem_index_module.mobileMeta
@@ -62286,7 +62302,7 @@ function ListItem(_ref) {
   }, liveName)), /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_default().createElement("div", {
     className: list_ListItem_index_module["right-bottom"]
   }, /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_default().createElement("div", {
-    className: "".concat(list_ListItem_index_module.time, " ").concat(status === 0 ? list_ListItem_index_module["foreshow-time"] : '', " time-box")
+    className: "".concat(list_ListItem_index_module.time, " ").concat(liveStatus === 0 ? list_ListItem_index_module["foreshow-time"] : '', " time-box")
   }, isSubscribe ? /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_default().createElement(component_Icon_Icon, {
     type: "web_icon_shijian_fill",
     className: "".concat(list_ListItem_index_module["time-icon"], " checked-icon")
@@ -62312,15 +62328,15 @@ function ListItem(_ref) {
     isLogin: isLogin,
     onSubscribe: onSubscribe,
     setIsSubscribe: setIsSubscribe,
-    status: status
+    status: liveStatus
   }))), /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_default().createElement("div", {
     className: list_ListItem_index_module.left
   }, /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_default().createElement("div", {
-    className: classnames_default()(list_ListItem_index_module.tag, list_ListItem_index_module["tag".concat(status)])
-  }, status === 1 || status === 3 ? /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_default().createElement("img", {
+    className: classnames_default()(list_ListItem_index_module.tag, list_ListItem_index_module["tag".concat(liveStatus)])
+  }, liveStatus === 1 || liveStatus === 3 ? /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_default().createElement("img", {
     src: play,
     alt: ""
-  }) : null, TagName[status]), /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_default().createElement(component_Avatar, {
+  }) : null, TagName[liveStatus]), /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_default().createElement(component_Avatar, {
     src: coverUrl || live,
     errorImg: live,
     className: list_ListItem_index_module.avatar

package/package.json

@@ -1,17 +1,12 @@
 {
   "name": "@x-edu/live-player",
-  "version": "0.0.40",
+  "version": "0.0.41",
   "main": "dist/XEduLivePlayer.common.js",
   "files": [
     "dist/*"
   ],
   "scripts": {
     "start": "cross-env SDP_ENV=local gms dev",
-    "start:test": "cross-env SDP_ENV=test gms dev",
-    "start:pre": "cross-env SDP_ENV=preproduction gms dev",
-    "start:ncet": "cross-env SDP_ENV=ncet-xedu gms dev",
-    "start:ie11-ncet": "cross-env SDP_ENV=ncet-xedu BROWSERSLIST_ENV=production gms dev",
-    "start:prod": "cross-env SDP_ENV=product gms dev",
     "build": "gms build --target=lib --excludeReact --formats=commonjs --name XEduLivePlayer",
     "cache:clean": "rimraf node_modules/.cache",
     "test": "gms test:unit",