@x-edu/live-player 0.0.16 → 0.0.17

package/src/detail/index.jsx

@@ -11,10 +11,9 @@ import {
 import { getIMLiveInfo, getGuestIMLiveInfo } from '@/service/imBroadcasts'
 import Loading from '@/component/status/Loading'
 import {
-  PUBLIC_LIVE_STATUS, PUBLIC_LIVE_MODE, PUBLIC_LIVE_PUSH_TOPIC, PUBLIC_LIVE_PUSH_EVENT, SUB_TYPE
+  PUBLIC_LIVE_STATUS, PUBLIC_LIVE_MODE, 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'
@@ -79,7 +78,6 @@ 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 = {
@@ -90,7 +88,11 @@ export default function PublicLiveDetail({
     onStateChange(newLiveInfo)
     const isRecordLive = liveInfo.type === PUBLIC_LIVE_MODE.RECORDED
     if (!isRecordLive
-      && status === PUBLIC_LIVE_STATUS.LIVEING
+      && [
+        PUBLIC_LIVE_STATUS.NOSTARTED,
+        PUBLIC_LIVE_STATUS.LIVEING,
+        PUBLIC_LIVE_STATUS.PASUED
+      ].includes(status)
       && isEmpty(liveInfo.imInfo)
     ) {
       const {
@@ -153,6 +155,9 @@ export default function PublicLiveDetail({
         return
       }
 
+      // 调试代码 模拟直播倒计时结束
+      // data.status = PUBLIC_LIVE_STATUS.NOSTARTED
+
       const isRecordLive = data.type === PUBLIC_LIVE_MODE.RECORDED
       const isNoStarted = data.status === PUBLIC_LIVE_STATUS.NOSTARTED
       const isCompleted = data.status === PUBLIC_LIVE_STATUS.COMPLETEED
@@ -197,12 +202,6 @@ 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, {
@@ -213,27 +212,6 @@ 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()
@@ -410,6 +388,7 @@ export default function PublicLiveDetail({
                   : isRecordLive
                     ? (
                       <RecordVideo
+                        isStreamLive={isStreamLive}
                         userInfo={userInfo}
                         liveInfo={liveInfo}
                         visitTime={visitTime}
@@ -426,6 +405,7 @@ export default function PublicLiveDetail({
                     )
                     : (
                       <LiveVideo
+                        isStreamLive={isStreamLive}
                         handleLogin={handleLogin}
                         userInfo={userInfo}
                         liveInfo={liveInfo}
@@ -470,7 +450,8 @@ export default function PublicLiveDetail({
               } */}
             </div>
             {
-              !isReplayMode && !isRecordLive && isStreamLive
+              !isReplayMode && !isRecordLive
+              && liveInfo.sub_type !== SUB_TYPE.NET_DRAGON
               && liveInfo.status !== PUBLIC_LIVE_STATUS.COMPLETEED
               && (
                 <LineSwitch

package/src/util/object.js

@@ -10,4 +10,4 @@ export function pick(obj, keys) {
   }, {})
 }
 
-export const isEmpty = (obj) => !obj || Object.keys(obj) === 0
+export const isEmpty = (obj) => !obj || Object.keys(obj).length === 0