From beb95fb5fc166804056abafd70fc01ac27de7621 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 26 Jan 2026 09:11:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
uniapps/work-app/src/hooks/useGlobalWS.js | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/uniapps/work-app/src/hooks/useGlobalWS.js b/uniapps/work-app/src/hooks/useGlobalWS.js
index caaaa94..43c797c 100644
--- a/uniapps/work-app/src/hooks/useGlobalWS.js
+++ b/uniapps/work-app/src/hooks/useGlobalWS.js
@@ -14,12 +14,12 @@
// 消息处理
function messageHandler(payload) {
- console.log('🌐 全局WebSocket收到消息111111111111111111111:', payload)
+ // console.log('🌐 全局WebSocket收到消息111111111111111111111:', payload)
// 先尝试直接处理消息（适用于mobile-web-view的voiceCallDetail页面的消息格式）
const t = (payload.type || '').toString()
// const bizCode = payload.biz_code || ''
callStatus.value = t
- console.log('📋 消息分析：type=' + t )
+ // console.log('📋 消息分析：type=' + t )
// 处理语音通话请求
if (t === 'call') {
console.log('📞 全局收到来电 call，来自', payload.from)
@@ -77,10 +77,7 @@
// 初始化WebSocket连接
function initWS() {
try {
- if (callStatus.value === 'accept') {
- console.log('📞 通话中，跳过WebSocket初始化');
- return;
- }
+
websocketService.setOnMessageCallback(messageHandler);
// 获取当前用户ID，优先使用store中的用户信息
--
Gitblit v1.9.3