From 2522b0f5f4c3571b3cdbe1f68b68c2fb4e2ed255 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 21 Jan 2026 15:59:53 +0800
Subject: [PATCH] feat:区域弹窗名称调整，样式调整
---
uniapps/work-app/src/hooks/useGlobalWS.js | 32 ++++++--------------------------
1 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/uniapps/work-app/src/hooks/useGlobalWS.js b/uniapps/work-app/src/hooks/useGlobalWS.js
index 7ddd6be..0210cb9 100644
--- a/uniapps/work-app/src/hooks/useGlobalWS.js
+++ b/uniapps/work-app/src/hooks/useGlobalWS.js
@@ -19,8 +19,7 @@
const t = (payload.type || '').toString()
// const bizCode = payload.biz_code || ''
callStatus.value = t
- console.log('📋 消息分析：type=' + t )
- console.log('222222222222222222',t,'----------------',callStatus.value,'----------------')
+ // console.log('📋 消息分析：type=' + t )
// 处理语音通话请求
if (t === 'call') {
console.log('📞 全局收到来电 call，来自', payload.from)
@@ -78,10 +77,7 @@
// 初始化WebSocket连接
function initWS() {
try {
- if (callStatus.value === 'accept') {
- console.log('📞 通话中，跳过WebSocket初始化');
- return;
- }
+
websocketService.setOnMessageCallback(messageHandler);
// 获取当前用户ID，优先使用store中的用户信息
@@ -93,38 +89,22 @@
websocketService.init(userId, WS_BASE);
// console.log('🌐 全局WebSocket初始化成功，用户ID:', userId);
} else {
- // websocketService.connect();
+ websocketService.connect();
}
} catch (error) {
- // console.error('❌ 全局WebSocket初始化失败:', error);
}
}
-
- // 监听用户信息变化，初始化WebSocket
- watch(
- () => [userStore.userInfo, callStatus.value],
- ([newUserInfo,newValue]) => {
- if (newValue === 'accept') {
- console.log('📞 通话中，跳过WebSocket初始化');
- return;
- }
- // 不管是否有连接，都调用initWS来确保连接和消息处理器正常
- initWS();
-
- },
- { immediate: true, deep: true }
- )
watch(
() => callStatus.value,
(newValue) => {
- console.log('监听callStatus.value',newValue);
if (newValue === 'accept') {
console.log('📞 通话中，跳过WebSocket初始化');
return;
}
- websocketService.connect();
- }
+ initWS();
+ },
+ { immediate: true, deep: true }
)
}
--
Gitblit v1.9.3