@x-edu/live-player 0.0.12 → 0.0.14

package/src/demo/List.jsx

@@ -2,24 +2,24 @@ import React, { useEffect, useState } from 'react'
 import { UC } from '@sdp.nd/nd-uc-sdk'
 import Live from '../App'
 
-const uc = new UC({
-  env: 'ncet-xedu',
-  sdpAppId: 'e5649925-441d-4a53-b525-51a2f1c4e0a8',
-  origins: {
-    UC: 'https://uc-gateway.ykt.eduyun.cn',
-    SSO: 'https://sso.basic.smartedu.cn'
-  },
-  isGlobalSDKCacheEnabled: true
-})
 // const uc = new UC({
-//   env: 'preproduction',
-//   sdpAppId: '331593d3-af38-456e-bdb8-5263525608f4',
+//   env: 'ncet-xedu',
+//   sdpAppId: 'e5649925-441d-4a53-b525-51a2f1c4e0a8',
 //   origins: {
-//     UC: 'https://uc-gateway.beta.101.com',
-//     SSO: 'https://ysc-sso.ykt.eduyun.cn'
+//     UC: 'https://uc-gateway.ykt.eduyun.cn',
+//     SSO: 'https://sso.basic.smartedu.cn'
 //   },
 //   isGlobalSDKCacheEnabled: true
 // })
+const uc = new UC({
+  env: 'preproduction',
+  sdpAppId: '331593d3-af38-456e-bdb8-5263525608f4',
+  origins: {
+    UC: 'https://uc-gateway.beta.101.com',
+    SSO: 'https://ysc-sso.ykt.eduyun.cn'
+  },
+  isGlobalSDKCacheEnabled: true
+})
 
 export default function List() {
   const [ucInstance, setUcInstance] = useState(uc)
@@ -34,7 +34,9 @@ export default function List() {
       try {
         await ucInstance.login({
           loginName: '18695708674',
-          password: 'gyh123456'
+          password: 'Gyh.2233'
+          // loginName: '18695708674',
+          // password: 'gyh123456'
         })
         const account = ucInstance.getCurrentAccount()
         const info = await account.getAccountInfo()

package/src/detail/LiveStatus/index.jsx

@@ -7,7 +7,6 @@ import style from './index.module.less'
 import AnchorOnTheWay from './AnchorOnTheWay'
 
 function LiveStatus({
-  isStreamLive,
   handleLogin,
   userInfo,
   liveInfo,
@@ -27,6 +26,7 @@ function LiveStatus({
   const isPaused = liveInfo.status === PUBLIC_LIVE_STATUS.PASUED
   const isOffline = liveInfo.status === PUBLIC_LIVE_STATUS.OFFLINE
   const isRecordLive = liveInfo.type === PUBLIC_LIVE_MODE.RECORDED
+  const isStreamLive = liveInfo.type === PUBLIC_LIVE_MODE.LIVING && (liveInfo.sub_type === SUB_TYPE.OUTSIDE || liveInfo.sub_type === SUB_TYPE.REBROADCAST)
 
   // 当前时间是否在回放时间开始前, 如果没有回放开始时间, 则直接判断未回放还没生成
   const isBeforeRecordTime = liveInfo.replay_begin_time

package/src/detail/LiveVideo/index.jsx

@@ -45,7 +45,6 @@ const shouldfixedLoading = window.navigator.userAgent.indexOf('iPad') > -1
   || isInWX()
 
 export default function LiveVideo({
-  isStreamLive,
   handleLogin,
   userInfo,
   liveInfo,
@@ -126,7 +125,7 @@ export default function LiveVideo({
       onRequestFullScreen()
     })
     aliPlayer.on('liveStreamStop', (err) => {
-      setIsLiveLoadError(true)
+      setIsLiveException(true)
       console.warn(`liveStreamStop: isOnline ${window.navigator.onLine}`)
       console.error('liveStreamStop', err)
     })
@@ -169,7 +168,6 @@ export default function LiveVideo({
       {showAliPlayer && <AliPlayer options={options} onReady={handleVideoReady} />}
       {supportM3u8 && (
         <LiveStatus
-          isStreamLive={isStreamLive}
           handleLogin={handleLogin}
           userInfo={userInfo}
           visitTime={visitTime}

package/src/detail/RecordVideo/index.jsx

@@ -8,7 +8,6 @@ import LiveStatus from '../LiveStatus'
 import style from './index.module.less'
 
 export default function RecordVideo({
-  isStreamLive,
   userInfo,
   liveInfo,
   visitTime,
@@ -134,7 +133,6 @@ export default function RecordVideo({
         onReady={handleVideoReady}
       />
       <LiveStatus
-        isStreamLive={isStreamLive}
         userInfo={userInfo}
         visitTime={visitTime}
         diffTime={diffTime}

package/src/detail/index.jsx

@@ -11,9 +11,10 @@ import {
 import { getIMLiveInfo, getGuestIMLiveInfo } from '@/service/imBroadcasts'
 import Loading from '@/component/status/Loading'
 import {
-  PUBLIC_LIVE_STATUS, PUBLIC_LIVE_MODE, SUB_TYPE
+  PUBLIC_LIVE_STATUS, PUBLIC_LIVE_MODE, PUBLIC_LIVE_PUSH_TOPIC, PUBLIC_LIVE_PUSH_EVENT, SUB_TYPE
 } from '@/config/publicLive'
 import { getUrlQuery } from '@/util/url'
+import ImPush from '@/util/push'
 import { getRecordLiveStatus } from '@/util/live'
 import { isEmpty } from '@/util/object'
 // import IMChatroom from '@/component/IMChatroom'
@@ -78,6 +79,7 @@ export default function PublicLiveDetail({
   const isLiveToReplay = !replay
   const isStreamLive = liveInfo
     && liveInfo.type === PUBLIC_LIVE_MODE.LIVING
+    && (liveInfo.sub_type === SUB_TYPE.OUTSIDE || liveInfo.sub_type === SUB_TYPE.REBROADCAST)
 
   const handleStatusChange = async (status) => {
     const newLiveInfo = {
@@ -195,6 +197,12 @@ export default function PublicLiveDetail({
         }
         data.imInfo = imLiveInfoResp
       }
+      // 推流直播不加载im push
+      if (data.type === PUBLIC_LIVE_MODE.LIVING && data.sub_type === SUB_TYPE.OUTSIDE) {
+        // nothing
+      } else {
+        await ImPush.init()
+      }
       // 如果是转播或者是推流 直接播放（用于调试模式）
       const { preview } = getUrlQuery() // 后台点预览会加这个参数
       const generateInfo = preview ? Object.assign(data, {
@@ -205,6 +213,27 @@ export default function PublicLiveDetail({
     init()
   }, [])
 
+  useEffect(() => {
+    if (!liveInfo || liveInfo.sub_type === SUB_TYPE.OUTSIDE) {
+      return
+    }
+    const handler = (data) => {
+      const { extraFields = {} } = data
+      console.log('public Live:', data)
+      if (extraFields.event === PUBLIC_LIVE_PUSH_EVENT.STATUS_CHANGE && extraFields.liveId === liveId) {
+        console.log(`public Live: receive push status ${parseInt(extraFields.status, 10)}`)
+        handleStatusChange(parseInt(extraFields.status, 10))
+      }
+    }
+    ImPush.addTopicListener(`${PUBLIC_LIVE_PUSH_TOPIC}_${liveId}`, handler)
+    return () => {
+      if (!liveInfo || liveInfo.sub_type === SUB_TYPE.OUTSIDE) {
+        return
+      }
+      ImPush.removeTopicListener(`${PUBLIC_LIVE_PUSH_TOPIC}_${liveId}`, handler)
+    }
+  }, [!!liveInfo])
+
   useEffect(() => {
     if (userInfo) {
       onReportProgress()
@@ -381,7 +410,6 @@ export default function PublicLiveDetail({
                   : isRecordLive
                     ? (
                       <RecordVideo
-                        isStreamLive={isStreamLive}
                         userInfo={userInfo}
                         liveInfo={liveInfo}
                         visitTime={visitTime}
@@ -398,7 +426,6 @@ export default function PublicLiveDetail({
                     )
                     : (
                       <LiveVideo
-                        isStreamLive={isStreamLive}
                         handleLogin={handleLogin}
                         userInfo={userInfo}
                         liveInfo={liveInfo}
@@ -443,8 +470,7 @@ export default function PublicLiveDetail({
               } */}
             </div>
             {
-              !isReplayMode && !isRecordLive
-              && liveInfo.sub_type !== SUB_TYPE.NET_DRAGON
+              !isReplayMode && !isRecordLive && isStreamLive
               && liveInfo.status !== PUBLIC_LIVE_STATUS.COMPLETEED
               && (
                 <LineSwitch

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

@@ -23,7 +23,7 @@ export default function Action({
   const { status, live_id: liveId, begin_time: beginTime } = data
   const [curAction, setCurAction] = useState(() => {
     let actionNum
-    if (status === 1) {
+    if (status === 1 || status === 3) {
       actionNum = 1
     } else if (status === 2) {
       actionNum = 2

package/src/list/ListItem/index.jsx

@@ -11,7 +11,8 @@ import style from './index.module.less'
 const TagName = {
   0: '预告',
   1: '直播中',
-  2: '回放'
+  2: '回放',
+  3: '直播中' // 实际是暂停
 }
 
 export default function ListItem({
@@ -56,7 +57,7 @@ export default function ListItem({
           className={style.avatar}
         />
         <div className={classNames(style.tag, style[`tag${status}`])}>
-          {status === 1 ? <img src={PlayImg} alt="" /> : null}
+          {status === 1 || status === 3 ? <img src={PlayImg} alt="" /> : null}
           {TagName[status]}
         </div>
       </div>

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

@@ -39,7 +39,7 @@
       background-color: #FF7826;
     }
 
-    .tag1 { // 直播中
+    .tag1, .tag3 { // 直播中
       background-color: #1E62EC;
       padding: 0 5px;
 

package/src/list/index.jsx

@@ -19,7 +19,7 @@ const StatusEnum = [
   },
   {
     label: '直播中',
-    value: 1
+    value: '1,3'
   },
   {
     label: '预告',