对接直播中台接口

client/src/action/CourseAction.js

@@ -141,9 +141,6 @@ export default class CourseAction extends BaseACTION {
                   case 0: str = '直播未开始'; break
                   case 1: str = '正在直播'; break
                   case 2: str = '直播结束'; break
-                  case 101: str = '直播结束，视频剪辑中'; break // 录制开始
-                  case 102: str = '直播结束，视频剪辑中'; break // 录制结束
-                  case 103: str = '观看回放'; break
                   default: str = '直播未开始'
                 }
                 // 5分钟内显示“即将开始”，5~1小时内“N分钟后开始”，1~24小时内“N小时后开始”，1天以上“N天后开始”天就显示年月日
@@ -159,8 +156,8 @@ export default class CourseAction extends BaseACTION {
                     str = parseInt(time / (24 * 60 * 60)) + '天后开始'
                   }
                 }
-                if (__.live.live_status === 103 && __.live.enable_record !== undefined && __.live.enable_record !== null && !__.live.enable_record) {
-                  str = ''
+                if (__.live.live_status === 2 && __.live.enable_record && __.live.record_url) {
+                  str = '观看回放'
                 }
                 __.live.statusStr = str
               }

client/src/action/PlayerAction.js

@@ -93,9 +93,6 @@ export default class PlayerAction extends BaseACTION {
                   case 0: str = '直播未开始'; break
                   case 1: str = '正在直播'; break
                   case 2: str = '直播结束'; break
-                  case 101: str = '直播结束，视频剪辑中'; break // 录制开始
-                  case 102: str = '直播结束，视频剪辑中'; break // 录制结束
-                  case 103: str = '观看回放'; break
                   default: str = '直播未开始'
                 }
                 // 5分钟内显示“即将开始”，5~1小时内“N分钟后开始”，1~24小时内“N小时后开始”，1天以上“N天后开始”天就显示年月日
@@ -111,8 +108,8 @@ export default class PlayerAction extends BaseACTION {
                     str = parseInt(time / (24 * 60 * 60)) + '天后开始'
                   }
                 }
-                if (__.live.live_status === 103 && __.live.enable_record !== undefined && __.live.enable_record !== null && !__.live.enable_record) {
-                  str = ''
+                if (__.live.live_status === 2 && __.live.enable_record && __.live.record_url) {
+                  str = '观看回放'
                 }
                 __.live.statusStr = str
               }

client/src/modules/viewer/components/aside/chapter.vue

@@ -41,7 +41,7 @@ export default {
   },
   filters: {
     showName(name, data) {
-      if (data.type === 5) {
+      if (data.type === 5 && data.live) {
         return `${name}(${data.live.start_time})`
       }
       return name

client/src/modules/viewer/components/live/chapterLive.vue

@@ -39,14 +39,17 @@ export default {
     },
     iframeUrl() {
       const live = this.chapter.live
-      const liveStatus = live.live_status
-      live.viewer_name = live.viewer_name || this.nickName
-      if (liveStatus === 103 && live.enable_record === 1) {
+      if (
+        live.live_status === 2 &&
+        live.enable_record === 1 &&
+        live.record_url
+      ) {
         // enable_record 0:不启用回放 1:开启回放
         // 查看回放
-        return `https://view.csslcloud.net/api/view/callback?recordid=${live.record_id}&roomid=${live.room_id}&userid=${live.user_id}&autoLogin=true&viewername=${live.viewer_name}&viewertoken=${live.viewer_token}`
+        return live.record_url
       } else {
         // 直播
+        live.viewer_name = live.viewer_name || this.nickName
         return `https://view.csslcloud.net/api/view/index?roomid=${live.room_id}&userid=${live.user_id}&autoLogin=true&viewername=${live.viewer_name}&viewertoken=${live.viewer_token}`
       }
     }

client/src/pages/learn/courseDetail.vue

@@ -488,8 +488,8 @@ export default {
       cAction.Player.getChapterList(cid, sid, _id).then(json => {
         this.live = (json.curJson && json.curJson.live) || {}
         if (this.live.id) {
-          if (this.live.record_id && this.live.live_status === 103) {
-            this.live.url = 'https://view.csslcloud.net/api/view/callback?recordid=' + this.live.record_id + '&roomid=' + this.live.room_id + '&userid=' + this.live.user_id + '&autoLogin=true&viewername=' + (this.live.viewer_name || '匿名') + '&viewertoken=' + this.live.viewer_token // + '&groupid=xxx'
+          if (this.live.live_status === 2 && this.live.enable_record && this.live.record_url) {
+            this.live.url = this.live.record_url
           } else {
             this.live.viewer_name = window.G.UserInfo.student_info.personal_name || window.G.UserInfo.nickname
             this.live.url = 'https://view.csslcloud.net/api/view/index?roomid=' + this.live.room_id + '&userid=' + this.live.user_id + '&autoLogin=true&viewername=' + (this.live.viewer_name || '匿名') + '&viewertoken=' + this.live.viewer_token // + '&groupid=xxx'
@@ -538,15 +538,11 @@ export default {
       if (type === 5) {
         const live = data.live
         const status = live.live_status
-        if (status !== 0 && status !== 1 && status !== 103) {
+        if (status === 0 || (status === 2 && !live.record_url)) {
           this.$message.error(live.statusStr)
           return
         }
-        const enableRecord = live.enable_record
-        if (status === 103 && enableRecord !== undefined && enableRecord !== null && !enableRecord) {
-          this.$message.info('该直播没有回放')
-          return
-        }
+
         /* 判别如果为 云课堂记录 id 则直接进入 云课堂 */
         if (this.cloudClassUrls[vid]) {
           const viewerName = window.G.UserInfo.student_info.personal_name || window.G.UserInfo.nickname

client/src/pages/mobileLive/list.vue

@@ -33,7 +33,6 @@
               <div class="live-item-content__time">{{subitem.start_time}}</div>
               <div
                 class="live-item-content__status"
-                v-if="!(subitem.live_status === 103 && !subitem.enable_record)"
               >{{calcTimeText(subitem.start_time, subitem.live_status)}}</div>
             </div>
           </div>
@@ -133,7 +132,7 @@ export default {
         start_time: liveTime
       } = data
       let message = this.calcTimeText(liveTime, liveStatus)
-      if (liveStatus === 103 && data.enable_record !== 1) {
+      if (liveStatus === 2 && !data.enable_record) {
         message = this.$t('live.noPlayback')
       }
       if (liveType === 'cloud') {
@@ -155,7 +154,7 @@ export default {
       if (liveStatus === 1) {
         // 进行中
         this.openNewWindow(data.join_url)
-      } else if (liveStatus === 103) {
+      } else if (liveStatus === 2) {
         // 查看回放
         this.openNewWindow(data.record_url)
       } else {
@@ -173,7 +172,7 @@ export default {
         // 进行中
         const url = `http://view.csslcloud.net/api/view/index?roomid=${data.room_id}&userid=${data.user_id}&autoLogin=true&viewername=${data.username}&viewertoken=${data.password}`
         this.openNewWindow(url)
-      } else if (liveStatus === 103) {
+      } else if (liveStatus === 2) {
         // 查看回放
         const replayUrl = data.record_url.replayUrl
         const url = replayUrl
@@ -194,11 +193,11 @@ export default {
         // 进行中
         const url = `https://view.csslcloud.net/api/view/index?roomid=${data.room_id}&userid=${data.user_id}&autoLogin=true&viewername=${data.viewer_name}&viewertoken=${data.viewer_token}`
         this.openNewWindow(url)
-      } else if (liveStatus === 103 && data.enable_record === 1) {
+      } else if (liveStatus === 2 && data.enable_record === 1) {
         // enable_record 0:不启用回放 1:开启回放
         // 查看回放
-        const url = `https://view.csslcloud.net/api/view/callback?recordid=${data.record_id}&roomid=${data.room_id}&userid=${data.user_id}&autoLogin=true&viewername=${data.viewer_name}&viewertoken=${data.viewer_token}`
-        this.openNewWindow(url)
+        // const url = `https://view.csslcloud.net/api/view/callback?recordid=${data.record_id}&roomid=${data.room_id}&userid=${data.user_id}&autoLogin=true&viewername=${data.viewer_name}&viewertoken=${data.viewer_token}`
+        this.openNewWindow(data.record_url)
       } else {
         this.message && this.message.close()
         this.message = this.$message({ type: 'warning', offset: 0, message })
@@ -222,10 +221,7 @@ export default {
       const map = {
         0: this.$t('live.notStarted'),
         1: this.$t('live.liveStreaming'),
-        2: this.$t('live.liveEnd'),
-        101: this.$t('live.liveEndNotVideo'),
-        102: this.$t('live.liveEndNotVideo'),
-        103: this.$t('live.watchReplay')
+        2: this.$t('live.liveEnd')
       }
       let result = map[liveStatus] || liveTime
 

client/src/pages/player/live/live.vue

@@ -51,8 +51,8 @@ export default {
       cAction.Player.getChapterList(this.cid, this.sid, this.id).then(json => {
         this.live = (json.curJson && json.curJson.live) || {}
         if (this.live.id) {
-          if (this.live.record_id && this.live.live_status === 103) {
-            this.live.url = 'https://view.csslcloud.net/api/view/callback?recordid=' + this.live.record_id + '&roomid=' + this.live.room_id + '&userid=' + this.live.user_id + '&autoLogin=true&viewername=' + this.live.viewer_name + '&viewertoken=' + this.live.viewer_token // + '&groupid=xxx'
+          if (this.live.live_status === 2 && this.live.enable_record && this.live.record_url) {
+            this.live.url = this.live.record_url
           } else {
             this.$emit('changeSideBar', '')
             setTimeout(() => {

client/src/pages/player/rightSide/sideChapterList.vue

@@ -70,12 +70,8 @@ export default {
             this.$router.push({ path: `/player/${sid}/${cid}/exam/${_id}` })
           } else if (_course.chapters[i2].type === 5) {
             const status = _course.chapters[i2].live.live_status
-            if (status !== 0 && status !== 1 && status !== 103) {
-              this.$message.error(_course.chapters[i2].live.statusStr)
-              return
-            }
             const enableRecord = _course.chapters[i2].live.enable_record
-            if (status === 103 && enableRecord !== undefined && enableRecord !== null && !enableRecord) {
+            if (status === 2 && enableRecord) {
               this.$message.info('该直播没有回放')
               return
             }