From 7209fa2cd0077b255c23059851e08a3c4b284f29 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Tue, 26 Nov 2024 11:53:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/form/index.ts    | 86 ++++++++++++++++++++++++------------------
 pages/meeting/index.ts | 18 +++++----
 2 files changed, 61 insertions(+), 43 deletions(-)

diff --git a/pages/form/index.ts b/pages/form/index.ts
index b23aeb1..9ad8cd8 100644
--- a/pages/form/index.ts
+++ b/pages/form/index.ts
@@ -1,7 +1,7 @@
 import { GetCheckoutRoomNum, PostAnonLogin, GetAgoraConf, GetRoomRtcToken } from '../../api/form/index'
 import { getUUID } from '../../utils/utils'
 import { Message } from 'tdesign-miniprogram';
-import { onStop, startSignalr } from '../../utils/singlr';
+import { startSignalr, onStop } from '../../utils/singlr';
 import { agora } from '../../utils/agora'
 Page({
   data: {
@@ -15,8 +15,26 @@ Page({
     historicalList: [],
   },
   onShow() {
+    // wx.login({
+    //   //成功放回
+    //   success: (res) => {
+    //     const { code } = res
+    //     // appid=wx99885b1c181cda72&secret=edd9cdb04c3f59fe70f2a70c396e5b0d
+
+    //   }
+    // })
     onStop()
     const that = this;
+    wx.getStorage({
+      key: 'isConnected',
+      success(res: any) {
+        if (res.data) {
+          this.setData({
+            netWorkErrorDialog: true,
+          })
+        }
+      },
+    })
     wx.getStorage({
       key: 'historicalList',
       success(res: any) {
@@ -32,41 +50,33 @@ Page({
       },
     })
   },
-  onLoad(option) {
-    if (option.redirect) {
-      this.setData({
-        netWorkErrorDialog: true,
-        isRecord: true,
-        isCamera: true,
-      })
-    } else {
-      wx.authorize({
-        scope: 'scope.record',
-        success: () => {
-          this.setData({
-            isRecord: true,
-          })
-        },
-        fail: () => {
-          this.setData({
-            isRecord: false,
-          })
-        }
-      });
-      wx.authorize({
-        scope: 'scope.camera',
-        success: () => {
-          this.setData({
-            isCamera: true,
-          })
-        },
-        fail: () => {
-          this.setData({
-            isCamera: false,
-          })
-        }
-      });
-    }
+  onLoad() {
+    wx.authorize({
+      scope: 'scope.record',
+      success: () => {
+        this.setData({
+          isRecord: true,
+        })
+      },
+      fail: () => {
+        this.setData({
+          isRecord: false,
+        })
+      }
+    });
+    wx.authorize({
+      scope: 'scope.camera',
+      success: () => {
+        this.setData({
+          isCamera: true,
+        })
+      },
+      fail: () => {
+        this.setData({
+          isCamera: false,
+        })
+      }
+    });
   },
   async getRoomRtcToken(roomNum: string, callBack: Function): Promise<void> {
     Promise.all([GetRoomRtcToken(roomNum), GetRoomRtcToken(roomNum + 'a'), GetAgoraConf()]).then(res => {
@@ -80,6 +90,10 @@ Page({
     })
   },
   closeDialog() {
+    wx.setStorage({
+      key: "isConnected",
+      data: false
+    })
     this.setData({
       netWorkErrorDialog: false
     })
diff --git a/pages/meeting/index.ts b/pages/meeting/index.ts
index b46d151..0cefcfa 100644
--- a/pages/meeting/index.ts
+++ b/pages/meeting/index.ts
@@ -785,9 +785,11 @@ Page({
     if (res.isConnected && (res.networkType !== 'none' || res.networkType !== 'unknown')) {
 
     } else {
-      wx.navigateTo({
-        url: `/pages/form/index?redirect=true`
+      wx.setStorage({
+        key: "isConnected",
+        data: true
       })
+      wx.navigateBack()
     }
   },
   scroll() {
@@ -797,11 +799,13 @@ Page({
     query.exec((res) => {
       const listItemRects = res[1];
       listItemRects.forEach(rect => {
-        if (rect.top < res[0].height && rect.top + rect.height > 0) {
-          agora.unmute(Number(rect.dataset.item.uid), 'video')
-        } else {
-          if (rect.dataset.item.uid != this.data.currentUid) {
-            agora.mute(Number(rect.dataset.item.uid), 'video')
+        if (rect.dataset.item.src && rect.dataset.item.enableCamera) {
+          if (rect.top < res[0].height && rect.top + rect.height > 0) {
+            agora.unmute(Number(rect.dataset.item.uid), 'video')
+          } else {
+            if (rect.dataset.item.uid != this.data.currentUid) {
+              agora.mute(Number(rect.dataset.item.uid), 'video')
+            }
           }
         }
       });