@x-edu/live-player 0.0.24 → 0.0.26

package/package.json

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

package/src/component/Pagination/index.jsx

@@ -12,7 +12,7 @@ export default function Pagination(props) {
     return (
       <div className={classNames(style.pagination, className, 'custom-pagination')}>
         <span className={style['pagination-text']}>
-          {/*`当前第 ${current} 页/共 ${pageCount} 页，共有 ${total} 条记录`*/}
+          {/* `当前第 ${current} 页/共 ${pageCount} 页，共有 ${total} 条记录` */}
           {`共 ${total} 条`}
         </span>
         <FishPagination

package/src/demo/List.jsx

@@ -24,9 +24,10 @@ const uc = new UC({
 export default function List() {
   const [ucInstance] = useState(uc)
   const [userInfo, setUserInfo] = useState(null)
+  const [refreshPage] = useState('0')
 
   const handleSubscribe = (data) => {
-    console.log(data)
+    console.log(data, 444444)
   }
 
   useEffect(() => {
@@ -59,8 +60,9 @@ export default function List() {
         userInfo
       }}
       onSubscribe={handleSubscribe}
-      scopeType={'e_teacher_studio'}
-      scopeId={'165fee8b-56b8-48a3-a5e0-f2bf82525ff1'}
+      scopeType="e_teacher_studio"
+      scopeId="a9a32d1a-b0bd-4482-ab9d-80ce38515280"
+      refreshPage={refreshPage}
     />
   )
 }

package/src/list/ListItem/Action/index.jsx

@@ -6,7 +6,7 @@ import { openLiveSubscribe } from '@/service/live'
 import style from './index.module.less'
 
 const Actions = {
-  1: '直播回放', // 直播中 或者开播前15min
+  1: '进入直播', // 直播中 或者开播前15min
   2: '观看回放', // 回放
   3: '预约', // 预告 且开播时间大于 15min
   4: '已预约'
@@ -19,9 +19,10 @@ export default function Action({
   handleLogin,
   isLogin,
   onSubscribe,
-  setIsSubscribe
+  setIsSubscribe,
+  status
 }) {
-  const { status, live_id: liveId, begin_time: beginTime } = data
+  const { live_id: liveId, begin_time: beginTime } = data
   const [curAction, setCurAction] = useState(() => {
     let actionNum
     if (status === 1 || status === 3) {
@@ -30,23 +31,23 @@ export default function Action({
       actionNum = 2
     } else { // status = 0
       // 如果超过了开播时间，不管有没有预约，都直接进入直播
-      // const now = new Date().getTime()
-      // const begin = new Date(beginTime).getTime()
-      // if (now > begin) {
-      //   actionNum = 1
-      //   return actionNum
-      // }
+      const now = new Date().getTime()
+      const begin = new Date(beginTime).getTime()
+      if (now > begin) {
+        actionNum = 1
+        return actionNum
+      }
       // 开播前15分钟，只提供进入直播按钮
-      // if (begin > now && (begin - now) < 15 * 60 * 1000) {
-      //   actionNum = 1
-      //   return actionNum
-      // }
+      if (begin > now && (begin - now) < 15 * 60 * 1000) {
+        actionNum = 1
+        return actionNum
+      }
       // 开播前15分钟之外
       const subscriptionItem = find(subscription, {
         live_id: liveId
       })
       if (subscriptionItem?.is_subscribe) { // 已预约
-        actionNum = 4;
+        actionNum = 4
       } else { // 未预约
         actionNum = 3
       }
@@ -62,20 +63,22 @@ export default function Action({
           handleLogin(data)
           return
         }
-        onSubscribe(data)
+        
         await openLiveSubscribe({
           liveId
         })
         message.success('预约成功')
         const now = new Date().getTime()
         const begin = new Date(beginTime).getTime()
-        setIsSubscribe(true);
+        setIsSubscribe(true)
         if (begin > now && (begin - now) < 15 * 60 * 1000) {
           setCurAction(1)
         } else {
           setCurAction(4)
         }
+        onSubscribe({...data, is_subscribe:true})
       } catch (error) {
+        onSubscribe({...data, is_subscribe:false})
         if (error?.response?.data?.message === '直播开始前15分钟无法预约') {
           setCurAction(3)
         }

package/src/list/ListItem/index.jsx

@@ -3,16 +3,16 @@ import dayjs from 'dayjs'
 import classNames from 'classnames'
 import Avatar from '@/component/Avatar'
 import Icon from '@/component/Icon'
-import Action from './Action'
 import { formatLikesCount, formatUVCount } from '@/util/liveCountUtil'
 import { getResourceLikes } from '@/service/like'
+import { find } from 'lodash'
+import Action from './Action'
 import DefaultCover from './img/live.png'
 import PlayImg from './img/play.svg'
 import dianZan from './img/dianzan.svg'
 import yiYue from './img/yiguankan.svg'
 import videoSvg from './img/video.svg'
 import style from './index.module.less'
-import { find } from 'lodash'
 
 const TagName = {
   0: '直播预告',
@@ -37,23 +37,21 @@ export default function ListItem({
     cover_url: coverUrl,
     status
   } = data
-
   const [liveExt, setLiveExt] = useState({})
-  const [isSubscribe, setIsSubscribe]= useState(()=>{
-    if(status === 0){
+  const [isSubscribe, setIsSubscribe] = useState(() => {
+    if (status===0) {
       // 开播前15分钟之外
       const subscriptionItem = find(subscription, {
         live_id: liveId
       })
       if (subscriptionItem?.is_subscribe) { // 已预约
-       return true
+        return true
       } else { // 未预约
-      return false
+        return false
       }
-    }else {
+    } else {
       return false
     }
-   
   })
 
   useEffect(() => {
@@ -63,7 +61,6 @@ export default function ListItem({
     })()
   }, [])
 
-
   const handleDetailClick = async () => {
     if (data.login && !isLogin) {
       handleLogin(data)
@@ -81,21 +78,19 @@ export default function ListItem({
     <div
       className={style.container}
       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']:''}`}>
-            {isSubscribe ?   <Icon type="web_icon_shijian_fill" className={style['time-icon']} /> :  <img src={videoSvg} className={style['time-icon']} />}
-          
+          <div className={`${style.time} ${status === 0 ? style['foreshow-time'] : ''}`}>
+            {isSubscribe ? <Icon type="web_icon_shijian_fill" className={style['time-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')} 开始`
+              `${dayjs(beginTime).format('YYYY/MM/DD HH:mm')} 开始`
             )}
 
             <div className={style.like_sty}>
@@ -107,18 +102,20 @@ export default function ListItem({
                 <img src={dianZan} alt="" />
                 {formatLikesCount(liveExt.like_count || 0)}
               </div>
-            </div> 
+            </div>
           </div>
-          {status === 0?
-            <Action
-              data={data}
-              subscription={subscription}
-              onActionDetailClick={handleDetailClick}
-              handleLogin={handleLogin}
-              isLogin={isLogin}
-              onSubscribe={onSubscribe}
-              setIsSubscribe={setIsSubscribe}
-            />:''}
+          
+          <Action
+            data={data}
+            subscription={subscription}
+            onActionDetailClick={handleDetailClick}
+            handleLogin={handleLogin}
+            isLogin={isLogin}
+            onSubscribe={onSubscribe}
+            setIsSubscribe={setIsSubscribe}
+            status={status}
+          />
+           
         </div>
       </div>
       <div className={style.left}>