修改bug

pages/meeting/index.ts

@@ -113,7 +113,9 @@ Page({
     setting: {
       voiceStimulation: true, //语音激励
     },
-    network: 0
+    network: 0,
+    meSrc: '',
+    watchUids: []
   },
   watch: {
     'roomUserList.**': function (roomUserList) {
@@ -347,26 +349,18 @@ Page({
     return new Promise((resolve) => {
       try {
         let networkStatus = 0
-        this.getNetworkType().then(({ networkType }) => {
-          if (['unknown', 'none'].includes(networkType)) {
-            return resolve(-1);
+        const startTime = +new Date();
+        this.requestImage().then(() => {
+          const requestTime = +new Date() - startTime;
+          if (requestTime < DOWNLOAD_TIME[0]) {
+            networkStatus = 0;
+          } else if (requestTime > DOWNLOAD_TIME[1]) {
+            networkStatus = 1
+          } else {
+            networkStatus = 2;
           }
-          if (['2g', '3g'].includes(networkType)) {
-            return resolve(2);
-          }
-          const startTime = +new Date();
-          this.requestImage().then(() => {
-            const requestTime = +new Date() - startTime;
-            if (requestTime < DOWNLOAD_TIME[0]) {
-              networkStatus = 0;
-            } else if (requestTime > DOWNLOAD_TIME[1]) {
-              networkStatus = 1
-            } else {
-              networkStatus = 2;
-            }
-            return resolve(networkStatus);
-          })
-        });
+          return resolve(networkStatus);
+        })
       } catch (error) {
         resolve(0);
       }
@@ -385,18 +379,6 @@ Page({
       })
     })
   },
-  getNetworkType() {
-    return new Promise((resolve) => {
-      wx.getNetworkType({
-        success(res) {
-          resolve(res);
-        },
-        fail(err) {
-          resolve(err);
-        }
-      })
-    })
-  },
   // 设置缓存
   async setStorageData() {
     const setting: any = await getStorage('setting')
@@ -665,13 +647,22 @@ Page({
           this.setAllUserListData('ManagerRefresh', item, async () => {
             if (item.user.uid === item.uid) {
               if (item.user.uid === userInfo.uid) {
-                // await agora.allLeaveChannelEx()
+                await agora.allJoinChannelEx(item.user, false, (url: string) => {
+                  const roomUserListTemp = [...this.data.roomUserList]
+                  const itemUser = roomUserListTemp.find(row => row.uid == userInfo.uid)
+                  itemUser.src = url
+                  this.setData({
+                    meSrc: url,
+                    roomUserList: roomUserListTemp,
+                  })
+                })
                 this.message(`操作成功`).success()
                 await agora.setRole(item.user.isRoomManager, (url: string) => {
                   const roomUserListTemp = [...this.data.roomUserList]
                   const itemUser = roomUserListTemp.find(row => row.uid == userInfo.uid)
                   itemUser.src = url
                   this.setData({
+                    meSrc: url,
                     roomUserList: roomUserListTemp,
                   })
                 })
@@ -682,15 +673,22 @@ Page({
               }
             } else {
               if (item.user.uid === userInfo.uid) {
-                if (item.user.isRoomManager) {
-                  // await agora.allLeaveChannelEx()
-                }
+                await agora.allJoinChannelEx(item.user, false, (url: string) => {
+                  const roomUserListTemp = [...this.data.roomUserList]
+                  const itemUser = roomUserListTemp.find(row => row.uid == userInfo.uid)
+                  itemUser.src = url
+                  this.setData({
+                    meSrc: url,
+                    roomUserList: roomUserListTemp,
+                  })
+                })
                 this.message(`管理员${item.user.isRoomManager ? '设置' : '取消'}您为发言人`).success()
                 await agora.setRole(item.user.isRoomManager, (url: string) => {
                   const roomUserListTemp = [...this.data.roomUserList]
                   const itemUser = roomUserListTemp.find(row => row.uid == userInfo.uid)
                   itemUser.src = url
                   this.setData({
+                    meSrc: url,
                     roomUserList: roomUserListTemp,
                   })
                 })
@@ -719,10 +717,30 @@ Page({
         case 'Watch':
           if (!role.ID.includes(userInfo.roleId)) {
             let userId = item.watchUids.find((uid: any) => uid === userInfo.uid)
+            this.setData({
+              watchUids: item.watchUids
+            })
+            let userRow = this.data.roomUserList.find((row: any) => row.uid === userId)
             if (userId) {
-              // await agora.allJoinChannelEx()
+              await agora.allJoinChannelEx(userRow, true, (url: string) => {
+                const roomUserListTemp = [...this.data.roomUserList]
+                const itemUser = roomUserListTemp.find(row => row.uid == userInfo.uid)
+                itemUser.src = url
+                this.setData({
+                  roomUserList: roomUserListTemp,
+                  meSrc: url,
+                })
+              })
             } else {
-              // await agora.allLeaveChannelEx()
+              await agora.allJoinChannelEx(userRow, false, (url: string) => {
+                const roomUserListTemp = [...this.data.roomUserList]
+                const itemUser = roomUserListTemp.find(row => row.uid == userInfo.uid)
+                itemUser.src = url
+                this.setData({
+                  roomUserList: roomUserListTemp,
+                  meSrc: url,
+                })
+              })
             }
           }
           break;
@@ -1246,7 +1264,12 @@ Page({
         footerListTemplate[1].active = item.enableMicr
         footerListTemplate[2].active = item.enableCamera
         item.enableMicr ? await agora.unmuteLocal('audio') : await agora.muteLocal('audio')
-        item.enableCamera ? await agora.unmuteLocal('video') : await agora.muteLocal('video')
+        let userId = this.data.watchUids.find((uid: any) => uid === userInfo.uid)
+        if (userId) {
+          await agora.unmuteLocal('video')
+        } else {
+          item.enableCamera ? await agora.unmuteLocal('video') : await agora.muteLocal('video')
+        }
         if (!role.ID.includes(userInfo.roleId)) {
           footerListTemplate[6].active = !item.isRoomManager;
         }
@@ -1342,7 +1365,9 @@ Page({
     if (res.isConnected && (res.networkType !== 'none' || res.networkType !== 'unknown')) {
 
     } else {
-
+      this.setData({
+        network: -1,
+      })
     }
   },
   // 重连失败退出房间

pages/meeting/index.wxml

@@ -42,8 +42,7 @@
             </view>
           </view>
           <view class="meeting-content-smallvideo-box-view-canvas" wx:if="{{item.src}}">
-            <live-pusher wx:if="{{user.uid === item.uid}}" url="{{item.src}}" mode="RTC" object-fit="contain" background-mute enable-mic="{{footerList[1].active}}" enable-camera max-bitrate="500" min-bitrate="200" autopush enable-agc enable-ans device-position="front" class="meeting-content-smallvideo-box-view-canvas-play" data-uid="{{item.uid}}" bindaudiovolumenotify="playerAudioVolumenotify" beauty='{{9}}' whiteness='{{9}}' />
-            <live-player src="{{item.src}}" class="meeting-content-smallvideo-box-view-canvas-play" mode="RTC" autoplay="true" muted="{{item.uid === user.uid ? true :  !item.enableMicr}}" object-fit="contain" data-uid="{{item.uid}}" bindaudiovolumenotify="playerAudioVolumenotify" wx:else />
+            <live-player src="{{item.src}}" class="meeting-content-smallvideo-box-view-canvas-play" mode="RTC" autoplay="true" muted="{{item.uid === user.uid ? true :  !item.enableMicr}}" object-fit="contain" data-uid="{{item.uid}}" bindaudiovolumenotify="playerAudioVolumenotify" />
           </view>
           <view class="meeting-content-smallvideo-box-view-user">
             <view class="meeting-content-smallvideo-box-view-user-view" wx:if="{{item.roleId === '1' || item.roleId === '3'}}" style=" background:#FDC229">
@@ -71,6 +70,9 @@
       </view>
     </scroll-view>
   </view>
+  <view style="position: fixed;left: -99999;z-index: -100;">
+    <live-pusher url="{{meSrc}}" mode="RTC" object-fit="contain" background-mute enable-mic="{{footerList[1].active}}" enable-camera max-bitrate="500" min-bitrate="200" autopush enable-agc enable-ans device-position="front" data-uid="{{user.uid}}" bindaudiovolumenotify="playerAudioVolumenotify" beauty='{{9}}' whiteness='{{9}}' />
+  </view>
   <view class="meeting-footer" wx:if="{{!isFullscreen}}">
     <view class="meeting-footer-left">`
       <view class="meeting-footer-left-view" wx:for="{{footerList}}" wx:for-index="index" wx:for-item="item" wx:key="index" bind:tap="changeFooterList" data-index='{{index}}' wx:if="{{item.show}}">

utils/agora.ts

@@ -1,3 +1,4 @@
+import { role } from "./utils";
 const AgoraMiniappSDK = require("../lib/agora-miniapp-sdk.js");
 const option = {
   appId: '',
@@ -58,6 +59,15 @@ export const agora = {
       })
     })
   },
+  // 监控
+  allJoinChannelEx: async (user: any, bool: boolean, callBack: Function) => {
+    if (!role.ID.includes(user.roleId) || !user.isRoomManager) {
+      await agora.setRole(bool, (url: string) => {
+        callBack(url);
+      })
+    }
+    bool ? await agora.unmuteLocal('video') : await agora.muteLocal('video')
+  },
   // 刷新token
   renewToken: (token) => {
     client.renewToken(token)