Merge branch 'master' of http://git.cc-lotus.info/new_train/train-student

src/router/index.js

@@ -184,7 +184,8 @@ const routes = [
     component: () => import('../views/user/live.vue'),
   },
   {
-    path: '/user/liveDetail',
+    path: '/user/liveDetail/:id',
+    name: 'liveDetail',
     meta: { title: '直播详情', isleftarrow: true },
     component: () => import('../views/user/liveDetail.vue'),
   },

src/views/login.vue

@@ -22,12 +22,16 @@ export default {
     });
     let token = this.$route.query.token;
     let user = jwt.decode(token);
-    console.log(user);
     localStorage.setItem('user', JSON.stringify(user));
     this.$toast.clear();
-    if (!this.is_dev) this.toIndex();
+    if (this.redirect_uri) this.$router.push(this.redirect_uri);
+    else if (!this.is_dev) this.toIndex();
+  },
+  computed: {
+    redirect_uri() {
+      return this.$route.query.redirect_uri;
+    },
   },
-  computed: {},
   methods: {
     toIndex() {
       this.$router.push({ path: '/' });

src/views/user/live/detail.vue

@@ -35,6 +35,7 @@ export default {
       microphones: [],
       localStream_: [], //流
       isInit: false,
+      roomNumber: '',
     };
   },
   created() {},
@@ -60,28 +61,16 @@ export default {
     },
     async toLook() {
       let roomNumber = `98${this.liveInfo.number}89`;
+      this.$set(this, `roomNumber`, roomNumber);
       await this.client_.join({ roomId: roomNumber, role: 'anchor' });
-      this.joinRoom(roomNumber);
+      this.channel();
+      this.joinRoom();
       // 订阅其他用户音视频
       this.client_.on('stream-subscribed', event => {
         const remoteStream = event.stream;
-        console.log(remoteStream);
         // 远端流订阅成功，播放远端音视频流
         const usertempid_ = remoteStream.getUserId();
         remoteStream.play('liveScreen');
-        // if (usertempid_) {
-        //   const usersplit_ = usertempid_.substring(0, 5);
-        //   if (usersplit_ === 'other') {
-        //     const id_ = 'othe-video-' + usertempid_;
-        //     remoteStream.play(id_);
-        //   } else if (usersplit_ === 'wxxcx') {
-        //     const id_ = 'look-video-' + usertempid_;
-        //     remoteStream.play(id_);
-        //   } else if (usersplit_ === 'meetu') {
-        //     const id_ = 'look-video-' + usertempid_;
-        //     remoteStream.play(id_);
-        //   }
-        // }
       });
 
       // 监听远端流增加事件
@@ -92,34 +81,54 @@ export default {
           console.error('failed to subscribe remoteStream');
         });
       });
-      this.client_.on('stream-removed', event => {
-        const remoteStream = event.stream;
-        console.log('stop----');
-        const usertempid_ = remoteStream.getUserId();
-        if (usertempid_) {
-          const usersplit_ = usertempid_.substring(0, 5);
-          if (usersplit_ === 'other') {
-            this.index_ = this.index_ - 1;
-          }
-        }
-        remoteStream.stop();
-      });
-      this.client_.on('mute-video', event => {
-        const remoteStream = event.stream;
-        // 订阅远端音频和视频流
-        const usertempid_ = remoteStream.getUserId();
-        if (usertempid_) {
-          const usersplit_ = usertempid_.substring(0, 4);
-          if (usersplit_ === 'othe') {
-            this.index_ = this.index_ - 1;
-          }
-        }
-      });
+      // this.client_.on('stream-removed', event => {
+      //   const remoteStream = event.stream;
+      //   console.log('stop----');
+      //   const usertempid_ = remoteStream.getUserId();
+      //   if (usertempid_) {
+      //     const usersplit_ = usertempid_.substring(0, 5);
+      //     if (usersplit_ === 'other') {
+      //       this.index_ = this.index_ - 1;
+      //     }
+      //   }
+      //   remoteStream.stop();
+      // });
+      // this.client_.on('mute-video', event => {
+      //   const remoteStream = event.stream;
+      //   // 订阅远端音频和视频流
+      //   const usertempid_ = remoteStream.getUserId();
+      //   if (usertempid_) {
+      //     const usersplit_ = usertempid_.substring(0, 4);
+      //     if (usersplit_ === 'othe') {
+      //       this.index_ = this.index_ - 1;
+      //     }
+      //   }
+      // });
     },
     async joinRoom(number) {
       const { userid, name } = this.user;
       this.$emit('count', { userid, name, number });
     },
+    // 订阅人数
+    channel() {
+      if (!this.roomNumber) {
+        console.warn('未获取到房间号,无法进行订阅');
+        return;
+      }
+      this.$stomp({
+        [`/exchange/liveroom-personcount/${this.roomNumber}`]: this.onMessage,
+      });
+    },
+    onMessage(message) {
+      let body = _.get(message, 'body');
+      console.log(body);
+      if (body) {
+        if (body == '消息已查收') return;
+        body = JSON.parse(body);
+        console.log(body);
+        // this.chatList.push(body);
+      }
+    },
   },
   watch: {
     liveInfo: {

src/views/user/live/live.vue

@@ -9,7 +9,7 @@
             <span>主讲教师：{{ item.teacher }}</span>
           </el-col>
           <el-col :span="24" class="btn">
-            <el-button type="primary" size="mini" @click="$router.push({ path: '/user/liveDetail', query: { id: item.id } })">进入直播</el-button>
+            <el-button type="primary" size="mini" @click="$router.push({ name: 'liveDetail', params: { id: item.id } })">进入直播</el-button>
           </el-col>
         </el-col>
       </el-col>

src/views/user/liveDetail.vue

@@ -49,13 +49,13 @@ export default {
       }
     },
     async toCount(data) {
-      console.log(data);
+      await this.personCount(data);
     },
   },
   computed: {
     ...mapState(['user']),
     id() {
-      return this.$route.query.id;
+      return this.$route.params.id;
     },
   },
   mounted() {