瀏覽代碼

更新满人

gemercheung 3 年之前
父節點
當前提交
2e704e5ba3
共有 4 個文件被更改,包括 40 次插入3 次删除
  1. 7 0
      pages/webview/index.js
  2. 12 1
      pages/webview/index.wxml
  3. 7 0
      pages/webview/index.wxss
  4. 14 2
      socket.js

+ 7 - 0
pages/webview/index.js

@@ -24,6 +24,7 @@ Page({
     type: '',
     shareStatus: 0,
     showInvitation: false,
+    roomMaximum: false,
     // url: 'https://www.4dkankan.com/showProPC.html?m=vroMUXdx&origin=4Dplaza&sid=1046051&room_id=1596785144930&user_id=44'
   },
 
@@ -150,6 +151,7 @@ Page({
         userId: socketOptions.userId,
         roomId: socketOptions.roomId,
         num: socketOptions.sceneNumber,
+        userLimitNum: socketOptions.userLimitNum,
         isAssistant: socketOptions.isAssistant,
         role: socketOptions.role,
         assistantId: socketOptions.assistantId
@@ -198,6 +200,11 @@ Page({
       showPacked: false
     })
   },
+  handleRoomMaximum() {
+    wx.switchTab({
+      url: '/pages/index/index',
+    })
+  },
 
   hideIsEnd() {
     this.setData({

+ 12 - 1
pages/webview/index.wxml

@@ -198,6 +198,17 @@
       </cover-view>
     </cover-view>
 
+    
+    <cover-view class="dialog invitation-view single-btn" wx:if="{{roomMaximum}}">
+      <cover-view class="title">温馨提示</cover-view>
+      <cover-view class="content">房间已满员,暂时无法进入</cover-view>
+      <cover-view class="btns">
+        <button class="btn" bindtap="handleRoomMaximum">确定</button>
+      </cover-view>
+    </cover-view>
+    <cover-view class="bgd roomMaximumBgd" wx:if="{{roomMaximum}}"></cover-view>
+
+
     <cover-view class="dialog invitation-view" wx:if="{{showIsEnd}}">
       <cover-view class="title">温馨提示</cover-view>
       <cover-view class="content">一起逛已结束了,是否继续逛</cover-view>
@@ -247,7 +258,7 @@
       </cover-view>
     </cover-view>
 
-    <cover-view style="position: fixed; font-size:10px; background-color: rgba(0,0,0,0.5); color: #fff;white-space:pre-wrap;z-index:989999" wx:if="{{debugerInfo}}">
+    <cover-view style="position: fixed;  font-size:10px; background-color: rgba(0,0,0,0.5); color: #fff;white-space:pre-wrap;z-index:989999" wx:if="{{debugerInfo}}">
       {{debugerInfo}}
       <cover-view bindtap="clearDebuger">清除</cover-view>
     </cover-view>

+ 7 - 0
pages/webview/index.wxss

@@ -333,6 +333,10 @@
   height: 200rpx;
 }
 
+.invitation-view.single-btn .btns {
+  text-align: center;
+  height: 110rpx;
+}
 .cancel {
   line-height: 86rpx;
   margin-top: 20rpx;
@@ -796,4 +800,7 @@
   height: 76rpx;
   width: 76rpx;
   color: #000;
+}
+.roomMaximumBgd{
+  background: rgba(0, 0, 0, 0.3);
 }

+ 14 - 2
socket.js

@@ -138,6 +138,7 @@ export default {
     if (this.socketSendMessage) {
       this.pauseVideo = false
       this.joinUrl()
+      // debugger
       this.socketSendMessage('changeOnlineStatus', {
         status: 1
       })
@@ -355,7 +356,13 @@ export default {
 
     const isAuthMic = await this.getAuthorizeRecordStatus();
 
-    console.log('当前用户录音权限状态', isAuthMic)
+
+    // console.log('当前用户录音权限状态', isAuthMic)
+    
+    this.setData({
+      isAllowMic,
+      isAuthMic
+    })
 
     const assistantId = (assistant && assistant.userId) ? assistant.userId : '';
 
@@ -368,7 +375,7 @@ export default {
         peopleCount: manyCount
       })
     }
-    
+
     return {
       role: this.role,
       userId: userInfo.userId,
@@ -553,6 +560,11 @@ export default {
       }
     });
 
+    socket.on("roomMaximum", () => {
+      this.setData({
+        roomMaximum: true
+      })
+    });
 
     this.socketStop = () => {
       if (socket) {