marking
/
WGShare.Client.Wx
19
0
Fork 0
Code Pull Requests Actions Releases 2 Activity

优化

This commit is contained in:
yj 2025-03-10 16:23:50 +08:00
parent 51780c02ac
commit c9af6a4e13
3 changed files with 18 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
pages/meeting/index.ts
View File

@ -349,26 +349,18 @@ Page({
return new Promise((resolve) => { return new Promise((resolve) => {
try { try {
let networkStatus = 0 let networkStatus = 0
this.getNetworkType().then(({ networkType }) => { const startTime = +new Date();
if (['unknown', 'none'].includes(networkType)) { this.requestImage().then(() => {
return resolve(-1); 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(networkStatus);
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);
})
});
} catch (error) { } catch (error) {
resolve(0); resolve(0);
} }
@ -387,18 +379,6 @@ Page({
}) })
}) })
}, },
getNetworkType() {
return new Promise((resolve) => {
wx.getNetworkType({
success(res) {
resolve(res);
},
fail(err) {
resolve(err);
}
})
})
},
// 设置缓存 // 设置缓存
async setStorageData() { async setStorageData() {
const setting: any = await getStorage('setting') const setting: any = await getStorage('setting')
@ -1383,7 +1363,9 @@ Page({
if (res.isConnected && (res.networkType !== 'none' || res.networkType !== 'unknown')) { if (res.isConnected && (res.networkType !== 'none' || res.networkType !== 'unknown')) {
} else { } else {
this.setData({
network: -1,
})
} }
}, },
// 重连失败退出房间 // 重连失败退出房间

4
utils/request.js
View File

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

4
utils/singlr.ts
View File

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