优化

pages/meeting/index.ts

@@ -349,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);
       }
@@ -387,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')
@@ -1383,7 +1363,9 @@ Page({
     if (res.isConnected && (res.networkType !== 'none' || res.networkType !== 'unknown')) {
 
     } else {
-
+      this.setData({
+        network: -1,
+      })
     }
   },
   // 重连失败退出房间

utils/request.js

@@ -1,6 +1,6 @@
 // const apiBase = "http://192.168.2.9:5192"
-// const apiBase = "https://meeting-api.23544.com/pc"
-const apiBase = "https://meeting-api.23544.com/test29"
+const apiBase = "https://meeting-api.23544.com/pc"
+// const apiBase = "https://meeting-api.23544.com/test29"
 export const Request = (params) => {
   return new Promise((resolve, reject) => {
     wx.getStorage({

utils/singlr.ts

@@ -1,7 +1,7 @@
 let connection = '' as any;
 // let url = 'http://192.168.2.9:5192'
-// let url = 'https://meeting-api.23544.com/pc'
-let url = 'https://meeting-api.23544.com/test29'
+let url = 'https://meeting-api.23544.com/pc'
+// let url = 'https://meeting-api.23544.com/test29'
 import * as signalR from "signalr-for-wx";
 import { agora } from "./agora";
 export const startSignalr = async (callBack: Function) => {