From a53ece5036c1fa61a63fe5f9e0cd3519210ab928 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Fri, 07 Aug 2026 09:44:27 +0800
Subject: [PATCH] feat:兼容分辨率低不出现滚动条
---
uniapps/work-app/src/utils/websocket.js | 56 +++++++++++++++++++++++++++++---------------------------
1 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/uniapps/work-app/src/utils/websocket.js b/uniapps/work-app/src/utils/websocket.js
index 32379d1..913dcc0 100644
--- a/uniapps/work-app/src/utils/websocket.js
+++ b/uniapps/work-app/src/utils/websocket.js
@@ -1,10 +1,11 @@
-// WebSocket服务管理
+import { useGlobalWS } from "@/hooks/useGlobalWS.js";// WebSocket服务管理
class WebSocketService {
constructor() {
this.socketTask = null
this.connected = false
this.url = ''
this.userId = ''
+ this.token = ''
this.onMessageCallback = null
this.onOpenCallback = null
this.onCloseCallback = null
@@ -13,14 +14,15 @@
}
// 初始化WebSocket连接
- init(userId, url) {
+ init(userId, url, token) {
if (!url) {
console.error('WebSocket初始化失败：缺少url')
return
}
this.userId = userId || ''
- this.url = url + encodeURIComponent(this.userId)
+ this.token = token || ''
+ this.url = url
this.connect()
}
@@ -29,15 +31,15 @@
try {
// 关闭现有连接
this.close()
-
// 使用uni-app的WebSocket API
this.socketTask = uni.connectSocket({
url: this.url,
+ protocols: [this.token],
success: () => {
- console.log('WebSocket连接已请求')
+ // console.log('WebSocket连接已请求')
},
fail: (error) => {
- console.error('WebSocket连接请求失败:', error)
+ // console.error('WebSocket连接请求失败:', error)
if (this.onErrorCallback) {
this.onErrorCallback(error)
}
@@ -47,8 +49,8 @@
// 监听连接打开
this.socketTask.onOpen(() => {
this.connected = true
- console.log('WebSocket已连接，userId:', this.userId)
- this.startPing()
+ // console.log('WebSocket已连接，userId:', this.userId)
+ // this.startPing()
if (this.onOpenCallback) {
this.onOpenCallback()
}
@@ -57,7 +59,7 @@
// 监听连接关闭
this.socketTask.onClose(() => {
this.connected = false
- console.log('WebSocket已关闭')
+ // console.log('WebSocket已关闭')
this.stopPing()
if (this.onCloseCallback) {
this.onCloseCallback()
@@ -66,7 +68,7 @@
// 监听连接错误
this.socketTask.onError((error) => {
- console.error('WebSocket错误:', error)
+ // console.error('WebSocket错误:', error)
this.connected = false
this.stopPing()
if (this.onErrorCallback) {
@@ -78,16 +80,16 @@
this.socketTask.onMessage((res) => {
try {
const message = JSON.parse(res.data)
- console.log('收到WebSocket消息:', message)
+ // console.log('收到WebSocket消息:', message)
if (this.onMessageCallback) {
this.onMessageCallback(message)
}
} catch (error) {
- console.error('解析WebSocket消息失败:', error)
+ // console.error('解析WebSocket消息失败:', error)
}
})
} catch (error) {
- console.error('WebSocket连接失败:', error)
+ // console.error('WebSocket连接失败:', error)
if (this.onErrorCallback) {
this.onErrorCallback(error)
}
@@ -113,23 +115,24 @@
data: JSON.stringify(message),
success: () => {
console.log('WebSocket消息发送成功:', message)
+ // useGlobalWS();
},
fail: (error) => {
- console.error('WebSocket消息发送失败:', error)
+ // console.error('WebSocket消息发送失败:', error)
}
})
}
// 开始心跳检测
- startPing() {
- this.stopPing()
- // 每25秒发送一次心跳
- this.pingTimer = setInterval(() => {
- if (this.connected) {
- this.send('ping', 'system')
- }
- }, 25000)
- }
+ // startPing() {
+ // this.stopPing()
+ // // 每25秒发送一次心跳
+ // this.pingTimer = setInterval(() => {
+ // if (this.connected) {
+ // this.send('ping', 'system')
+ // }
+ // }, 25000)
+ // }
// 停止心跳检测
stopPing() {
@@ -146,10 +149,10 @@
code: 1000,
reason: '正常关闭',
success: () => {
- console.log('WebSocket已关闭')
+ // console.log('WebSocket已关闭')
},
fail: (error) => {
- console.error('WebSocket关闭失败:', error)
+ // console.error('WebSocket关闭失败:', error)
}
})
this.socketTask = null
@@ -160,10 +163,9 @@
// 设置消息回调
setOnMessageCallback(callback) {
- console.log('🔔 WebSocket消息回调已设置')
this.onMessageCallback = callback
}
-
+
// 获取当前消息回调（用于检查是否已设置）
getOnMessageCallback() {
return this.onMessageCallback
--
Gitblit v1.9.3