@x-edu/live-player 0.0.30 → 0.0.32

package/dist/XEduLivePlayer.common.js

@@ -2689,7 +2689,7 @@ ___CSS_LOADER_EXPORT___.locals = {
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_0___default()(function(i){return i[1]});
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".index-module_action_DHsbc{font-size:14px;line-height:22px;color:#1e62ec;border-radius:144.889px;border:1px solid #1e62ec;width:88px;height:32px;display:flex;align-items:center;justify-content:center;margin-top:8px}.index-module_action-has-subscribe_LYNor{border:1px solid #b7ccf9;color:#b7ccf9}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".index-module_action_DHsbc{font-size:14px;line-height:22px;color:#1e62ec;border-radius:144.889px;border:1px solid #1e62ec;width:88px;height:32px;display:flex;align-items:center;justify-content:center;margin-top:8px}.index-module_action_DHsbc:hover{color:#4079ef;border:1px solid #4079ef}.index-module_action-has-subscribe_LYNor{border:1px solid #b7ccf9!important;color:#b7ccf9!important}", ""]);
 // Exports
 ___CSS_LOADER_EXPORT___.locals = {
 	"action": "index-module_action_DHsbc",
@@ -59506,7 +59506,7 @@ function TabPane(_ref) {
       children = _ref.children;
 
   var _React$useState = external_commonjs_react_commonjs2_react_root_React_namespaceObject.useState(forceRender),
-      _React$useState2 = slicedToArray_slicedToArray(_React$useState, 2),
+      _React$useState2 = esm_slicedToArray_slicedToArray(_React$useState, 2),
       visited = _React$useState2[0],
       setVisited = _React$useState2[1];
 
@@ -59535,7 +59535,7 @@ function TabPane(_ref) {
     tabIndex: active ? 0 : -1,
     "aria-labelledby": id && "".concat(id, "-tab-").concat(tabKey),
     "aria-hidden": !active,
-    style: objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, mergedStyle), style),
+    style: _objectSpread2(_objectSpread2({}, mergedStyle), style),
     className: classnames_default()("".concat(prefixCls, "-tabpane"), active && "".concat(prefixCls, "-tabpane-active"), className)
   }, (active || visited || forceRender) && children);
 }
@@ -59575,7 +59575,7 @@ function parseTabList(children) {
   return toArray(children).map(function (node) {
     if ( /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_namespaceObject.isValidElement(node)) {
       var key = node.key !== undefined ? String(node.key) : undefined;
-      return objectSpread2_objectSpread2(objectSpread2_objectSpread2({
+      return _objectSpread2(_objectSpread2({
         key: key
       }, node.props), {}, {
         node: node
@@ -59618,7 +59618,7 @@ function Tabs(_ref, ref) {
       onChange = _ref.onChange,
       onTabClick = _ref.onTabClick,
       onTabScroll = _ref.onTabScroll,
-      restProps = objectWithoutProperties_objectWithoutProperties(_ref, Tabs_excluded);
+      restProps = _objectWithoutProperties(_ref, Tabs_excluded);
 
   var tabs = parseTabList(children);
   var rtl = direction === 'rtl';
@@ -59635,15 +59635,15 @@ function Tabs(_ref, ref) {
       tabPane: true
     };
   } else {
-    mergedAnimated = objectSpread2_objectSpread2({
+    mergedAnimated = _objectSpread2({
       inkBar: true,
       tabPane: false
-    }, esm_typeof_typeof(animated) === 'object' ? animated : {});
+    }, typeof_typeof(animated) === 'object' ? animated : {});
   } // ======================== Mobile ========================
 
 
   var _useState = (0,external_commonjs_react_commonjs2_react_root_React_namespaceObject.useState)(false),
-      _useState2 = slicedToArray_slicedToArray(_useState, 2),
+      _useState2 = esm_slicedToArray_slicedToArray(_useState, 2),
       mobile = _useState2[0],
       setMobile = _useState2[1];
 
@@ -59660,7 +59660,7 @@ function Tabs(_ref, ref) {
     value: activeKey,
     defaultValue: defaultActiveKey
   }),
-      _useMergedState2 = slicedToArray_slicedToArray(_useMergedState, 2),
+      _useMergedState2 = esm_slicedToArray_slicedToArray(_useMergedState, 2),
       mergedActiveKey = _useMergedState2[0],
       setMergedActiveKey = _useMergedState2[1];
 
@@ -59669,7 +59669,7 @@ function Tabs(_ref, ref) {
       return tab.key === mergedActiveKey;
     });
   }),
-      _useState4 = slicedToArray_slicedToArray(_useState3, 2),
+      _useState4 = esm_slicedToArray_slicedToArray(_useState3, 2),
       activeIndex = _useState4[0],
       setActiveIndex = _useState4[1]; // Reset active key if not exist anymore
 
@@ -59694,7 +59694,7 @@ function Tabs(_ref, ref) {
   var _useMergedState3 = useControlledState(null, {
     value: id
   }),
-      _useMergedState4 = slicedToArray_slicedToArray(_useMergedState3, 2),
+      _useMergedState4 = esm_slicedToArray_slicedToArray(_useMergedState3, 2),
       mergedId = _useMergedState4[0],
       setMergedId = _useMergedState4[1];
 
@@ -59733,7 +59733,7 @@ function Tabs(_ref, ref) {
   };
   var tabNavBar;
 
-  var tabNavBarProps = objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, sharedProps), {}, {
+  var tabNavBarProps = _objectSpread2(_objectSpread2({}, sharedProps), {}, {
     editable: editable,
     locale: locale,
     moreIcon: moreIcon,
@@ -59757,11 +59757,11 @@ function Tabs(_ref, ref) {
       tabs: tabs,
       prefixCls: prefixCls
     }
-  }, /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_namespaceObject.createElement("div", esm_extends_extends({
+  }, /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_namespaceObject.createElement("div", extends_extends({
     ref: ref,
     id: id,
-    className: classnames_default()(prefixCls, "".concat(prefixCls, "-").concat(mergedTabPosition), (_classNames = {}, defineProperty_defineProperty(_classNames, "".concat(prefixCls, "-mobile"), mobile), defineProperty_defineProperty(_classNames, "".concat(prefixCls, "-editable"), editable), defineProperty_defineProperty(_classNames, "".concat(prefixCls, "-rtl"), rtl), _classNames), className)
-  }, restProps), tabNavBar, /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_namespaceObject.createElement(TabPanelList, esm_extends_extends({
+    className: classnames_default()(prefixCls, "".concat(prefixCls, "-").concat(mergedTabPosition), (_classNames = {}, _defineProperty(_classNames, "".concat(prefixCls, "-mobile"), mobile), _defineProperty(_classNames, "".concat(prefixCls, "-editable"), editable), _defineProperty(_classNames, "".concat(prefixCls, "-rtl"), rtl), _classNames), className)
+  }, restProps), tabNavBar, /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_namespaceObject.createElement(TabPanelList, extends_extends({
     destroyInactiveTabPane: destroyInactiveTabPane
   }, sharedProps, {
     animated: mergedAnimated
@@ -60846,7 +60846,7 @@ Pagination.defaultProps = {
 
 
 var MiniSelect = function MiniSelect(props) {
-  return /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_namespaceObject.createElement(es_select, esm_extends_extends({
+  return /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_namespaceObject.createElement(es_select, extends_extends({
     size: "small"
   }, props));
 };
@@ -60928,7 +60928,7 @@ var responsiveObserve = {
 
 function useBreakpoint() {
   var _useState = (0,external_commonjs_react_commonjs2_react_root_React_namespaceObject.useState)({}),
-      _useState2 = slicedToArray_slicedToArray(_useState, 2),
+      _useState2 = esm_slicedToArray_slicedToArray(_useState, 2),
       screens = _useState2[0],
       setScreens = _useState2[1];
 

package/dist/XEduLivePlayerPre.common.js

@@ -2689,7 +2689,7 @@ ___CSS_LOADER_EXPORT___.locals = {
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_0___default()(function(i){return i[1]});
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".index-module_action_DHsbc{font-size:14px;line-height:22px;color:#1e62ec;border-radius:144.889px;border:1px solid #1e62ec;width:88px;height:32px;display:flex;align-items:center;justify-content:center;margin-top:8px}.index-module_action-has-subscribe_LYNor{border:1px solid #b7ccf9;color:#b7ccf9}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".index-module_action_DHsbc{font-size:14px;line-height:22px;color:#1e62ec;border-radius:144.889px;border:1px solid #1e62ec;width:88px;height:32px;display:flex;align-items:center;justify-content:center;margin-top:8px}.index-module_action_DHsbc:hover{color:#4079ef;border:1px solid #4079ef}.index-module_action-has-subscribe_LYNor{border:1px solid #b7ccf9!important;color:#b7ccf9!important}", ""]);
 // Exports
 ___CSS_LOADER_EXPORT___.locals = {
 	"action": "index-module_action_DHsbc",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@x-edu/live-player",
-  "version": "0.0.30",
+  "version": "0.0.32",
   "main": "dist/XEduLivePlayer.common.js",
   "scripts": {
     "start": "cross-env SDP_ENV=local gms dev",

package/src/list/ListItem/Action/index.module.less

@@ -10,11 +10,17 @@
   align-items: center;
   justify-content: center;
   margin-top: 8px;
+
+  &:hover {
+    color: #4079EF;
+    border: 1px solid #4079EF;
+
+  }
 }
 
 
 
 .action-has-subscribe {
-  border: 1px solid #B7CCF9;
-  color: #B7CCF9
+  border: 1px solid #B7CCF9 !important;
+  color: #B7CCF9 !important;
 }

package/src/list/ListItem/index.jsx

@@ -1,135 +1,135 @@
-import React, { useEffect, useState } from 'react'
-import dayjs from 'dayjs'
-import classNames from 'classnames'
-import { find } from 'lodash'
-import Avatar from '@/component/Avatar'
-import Icon from '@/component/Icon'
-import { formatLikesCount, formatUVCount } from '@/util/liveCountUtil'
-import { getResourceLikes } from '@/service/like'
-import Action from './Action'
-import DefaultCover from './img/live.png'
-import PlayImg from './img/play.svg'
-import dianZan from './img/like-fill.svg'
-import yiYue from './img/view-fill.svg'
-import videoSvg from './img/video.svg'
-import style from './index.module.less'
-
-const TagName = {
-  0: '直播预告',
-  1: '直播中',
-  2: '直播回放',
-  3: '直播中' // 实际是暂停
-}
-
-export default function ListItem({
-  data,
-  themeName,
-  subscription,
-  onDetailClick,
-  handleLogin,
-  isLogin,
-  onSubscribe
-}) {
-  const {
-    live_id: liveId,
-    live_name: liveName,
-    begin_time: beginTime,
-    // end_time: endTime,
-    cover_url: coverUrl,
-    status
-  } = data
-  const [liveExt, setLiveExt] = useState({})
-  const [isSubscribe, setIsSubscribe] = useState(() => {
-    if (status === 0) {
-      // 开播前15分钟之外
-      const subscriptionItem = find(subscription, {
-        live_id: liveId
-      })
-      if (subscriptionItem?.is_subscribe) { // 已预约
-        return true
-      } else { // 未预约
-        return false
-      }
-    } else {
-      return false
-    }
-  })
-
-  useEffect(() => {
-    (async () => {
-      const res = await getResourceLikes(liveId)
-      setLiveExt(res || {})
-    })()
-  }, [])
-
-  const handleDetailClick = async () => {
-    if (data.login && !isLogin) {
-      handleLogin(data)
-      return
-    }
-    if (onDetailClick) {
-      onDetailClick(data)
-    } else {
-      // 默认跳转中小学
-      window.open(`https://basic.smartedu.cn/publicLive/${liveId}`)
-    }
-  }
-
-  return (
-    <div
-      className={classNames(style.container, themeName)}
-      onClick={handleDetailClick}
-    >
-      <div className={style.right}>
-        <div className={style['right-top']}>
-          <div className={style.title}>{liveName}</div>
-        </div>
-        <div className={style['right-bottom']}>
-          <div className={`${style.time} ${status === 0 ? style['foreshow-time'] : ''} time-box`}>
-            {isSubscribe ? <Icon type="web_icon_shijian_fill" className={`${style['time-icon']} checked-icon`} /> : <img src={videoSvg} className={style['time-icon']} />}
-
-            {status === 2 ? (
-              `${dayjs(beginTime).format('YYYY/MM/DD HH:mm')}`
-            ) : (
-              `${dayjs(beginTime).format('YYYY/MM/DD HH:mm')} 开始`
-            )}
-
-            <div className={style.like_sty}>
-              <div className={style.icon_bottom}>
-                <img src={yiYue} />
-                {formatUVCount(liveExt.total_uv || 0)}
-              </div>
-              <div className={style.icon_bottom}>
-                <img src={dianZan} alt="" />
-                {formatLikesCount(liveExt.like_count || 0)}
-              </div>
-            </div>
-          </div>
-
-          <Action
-            data={data}
-            subscription={subscription}
-            onActionDetailClick={handleDetailClick}
-            handleLogin={handleLogin}
-            isLogin={isLogin}
-            onSubscribe={onSubscribe}
-            setIsSubscribe={setIsSubscribe}
-            status={status}
-          />
-
-        </div>
-      </div>
-      <div className={style.left}>
-        <div className={classNames(style.tag, style[`tag${status}`])}>
-          {status === 1 || status === 3 ? <img src={PlayImg} alt="" /> : null}
-          {TagName[status]}
-        </div>
-        <Avatar
-          src={coverUrl || DefaultCover}
-          errorImg={DefaultCover}
-          className={style.avatar}
-        />
-      </div>
-    </div>
-  )
-}
+import React, { useEffect, useState } from 'react'
+import dayjs from 'dayjs'
+import classNames from 'classnames'
+import { find } from 'lodash'
+import Avatar from '@/component/Avatar'
+import Icon from '@/component/Icon'
+import { formatLikesCount, formatUVCount } from '@/util/liveCountUtil'
+import { getResourceLikes } from '@/service/like'
+import Action from './Action'
+import DefaultCover from './img/live.png'
+import PlayImg from './img/play.svg'
+import dianZan from './img/like-fill.svg'
+import yiYue from './img/view-fill.svg'
+import videoSvg from './img/video.svg'
+import style from './index.module.less'
+
+const TagName = {
+  0: '直播预告',
+  1: '直播中',
+  2: '直播回放',
+  3: '直播中' // 实际是暂停
+}
+
+export default function ListItem({
+  data,
+  themeName,
+  subscription,
+  onDetailClick,
+  handleLogin,
+  isLogin,
+  onSubscribe
+}) {
+  const {
+    live_id: liveId,
+    live_name: liveName,
+    begin_time: beginTime,
+    // end_time: endTime,
+    cover_url: coverUrl,
+    status
+  } = data
+  const [liveExt, setLiveExt] = useState({})
+  const [isSubscribe, setIsSubscribe] = useState(() => {
+    if (status === 0) {
+      // 开播前15分钟之外
+      const subscriptionItem = find(subscription, {
+        live_id: liveId
+      })
+      if (subscriptionItem?.is_subscribe) { // 已预约
+        return true
+      } else { // 未预约
+        return false
+      }
+    } else {
+      return false
+    }
+  })
+
+  useEffect(() => {
+    (async () => {
+      const res = await getResourceLikes(liveId)
+      setLiveExt(res || {})
+    })()
+  }, [])
+
+  const handleDetailClick = async () => {
+    if (data.login && !isLogin) {
+      handleLogin(data)
+      return
+    }
+    if (onDetailClick) {
+      onDetailClick(data)
+    } else {
+      // 默认跳转中小学
+      window.open(`https://basic.smartedu.cn/publicLive/${liveId}`)
+    }
+  }
+
+  return (
+    <div
+      className={classNames(style.container, themeName)}
+      onClick={handleDetailClick}
+    >
+      <div className={style.right}>
+        <div className={style['right-top']}>
+          <div className={style.title}>{liveName}</div>
+        </div>
+        <div className={style['right-bottom']}>
+          <div className={`${style.time} ${status === 0 ? style['foreshow-time'] : ''} time-box`}>
+            {isSubscribe ? <Icon type="web_icon_shijian_fill" className={`${style['time-icon']} checked-icon`} /> : <img src={videoSvg} className={style['time-icon']} />}
+
+            {status === 2 ? (
+              `${dayjs(beginTime).format('YYYY/MM/DD HH:mm')}`
+            ) : (
+              `${dayjs(beginTime).format('YYYY/MM/DD HH:mm')} 开始`
+            )}
+
+            <div className={style.like_sty}>
+              <div className={style.icon_bottom}>
+                <img src={yiYue} />
+                {formatUVCount(liveExt.total_uv || 0)}
+              </div>
+              <div className={style.icon_bottom}>
+                <img src={dianZan} alt="" />
+                {formatLikesCount(liveExt.like_count || 0)}
+              </div>
+            </div>
+          </div>
+
+          <Action
+            data={data}
+            subscription={subscription}
+            onActionDetailClick={handleDetailClick}
+            handleLogin={handleLogin}
+            isLogin={isLogin}
+            onSubscribe={onSubscribe}
+            setIsSubscribe={setIsSubscribe}
+            status={status}
+          />
+
+        </div>
+      </div>
+      <div className={style.left}>
+        <div className={classNames(style.tag, style[`tag${status}`])}>
+          {status === 1 || status === 3 ? <img src={PlayImg} alt="" /> : null}
+          {TagName[status]}
+        </div>
+        <Avatar
+          src={coverUrl || DefaultCover}
+          errorImg={DefaultCover}
+          className={style.avatar}
+        />
+      </div>
+    </div>
+  )
+}