jinx 3 vuotta sitten
vanhempi
commit
d72927f65e
2 muutettua tiedostoa jossa 27 lisäystä ja 23 poistoa
  1. 6 6
      config.js
  2. 21 17
      socket.js

+ 6 - 6
config.js

@@ -17,12 +17,12 @@ const mal = {
   // socketHost: 'wss://shop.4dkankan.com',
   socketHost: 'wss://rtc-zfb.4dkankan.com/',
   // socketHost: 'wss://192.168.0.79:3031',
-  // requestHost: 'https://plaza-cszfb.4dkankan.com', // 测试环境
-  // viewChildHost: 'https://cszfb.4dkankan.com', //测试环境
-  // viewHost: 'https://cszfb.4dkankan.com'//测试环境
-  requestHost: 'https://plaza.4dkankan.com',
-  viewChildHost: 'https://zfb.4dkankan.com',
-  viewHost: 'https://zfb.4dkankan.com'
+  requestHost: 'https://plaza-cszfb.4dkankan.com', // 测试环境
+  viewChildHost: 'https://cszfb.4dkankan.com', //测试环境
+  viewHost: 'https://cszfb.4dkankan.com'//测试环境
+  // requestHost: 'https://plaza.4dkankan.com',
+  // viewChildHost: 'https://zfb.4dkankan.com',
+  // viewHost: 'https://zfb.4dkankan.com'
 }
 
 

+ 21 - 17
socket.js

@@ -80,7 +80,7 @@ export default {
 
     this.data.reload = false
     this.data.showCommodity = false
-    // options.url = options.url+'&vlog';
+    options.url = options.url + '&vlog';
     if (!this.data.webviewUrl) {
       console.log(base)
       this.setData({
@@ -509,22 +509,26 @@ export default {
     this.setData({
       surplus: this.data.peopleCount - data.roomsPerson.length
     })
-    if (!this.isAuthorizeRecord) {
-      const voiceStatus = Number(await this.authorizeRecord())
-      this.isAuthorizeRecord = true
-
-      // getApp().setVoiceProps({
-      //   noMute: !voiceStatus
-      // })
-
-      // console.log(getApp().globalData.voiceProps.noMute)
-      // this.socketSendMessage('changeVoiceStatus', {
-      //   status: getApp().globalData.voiceProps.noMute ? 0 : 2
-      // })
-      // this.data.socketOptions.voiceStatus = 1
-      // this.socketSendMessage('changeVoiceStatus', {status: noMute ? 0 : 2})
+    //限制只有主持人才可以开麦
+    if (this.role == 'leader') {
+      if (!this.isAuthorizeRecord) {
+        const voiceStatus = Number(await this.authorizeRecord())
+        this.isAuthorizeRecord = true
+
+        // getApp().setVoiceProps({
+        //   noMute: !voiceStatus
+        // })
+
+        // console.log(getApp().globalData.voiceProps.noMute)
+        // this.socketSendMessage('changeVoiceStatus', {
+        //   status: getApp().globalData.voiceProps.noMute ? 0 : 2
+        // })
+        // this.data.socketOptions.voiceStatus = 1
+        // this.socketSendMessage('changeVoiceStatus', {status: noMute ? 0 : 2})
+      }
     }
 
+
     const socketOptions = this.data.socketOptions
     getApp().globalData.roomId = socketOptions.roomId
     const user = data.roomsPerson.find(user => user.userId == socketOptions.userId)
@@ -598,7 +602,7 @@ export default {
 
       this.setData({
         // peopleCount: this.data.many ? manyCount : 5
-        peopleCount: this.data.many ? manyCount : 2
+        peopleCount: manyCount
       })
 
       let base = this.base
@@ -1116,7 +1120,7 @@ export default {
 
         this.setData({
           // peopleCount: this.data.many ? manyCount : 5,
-          peopleCount: this.data.many ? manyCount : 2,
+          peopleCount: manyCount,
         })
 
         if (!res.data.brand.canShow) {