From 3cf3cd88a7b7a49e3300e8e8c1e9034eb69a3429 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 27 Feb 2026 08:40:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
uniapps/work-app/src/hooks/useGlobalWS.js | 61 +++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 3 deletions(-)
diff --git a/uniapps/work-app/src/hooks/useGlobalWS.js b/uniapps/work-app/src/hooks/useGlobalWS.js
index 0026451..892c22e 100644
--- a/uniapps/work-app/src/hooks/useGlobalWS.js
+++ b/uniapps/work-app/src/hooks/useGlobalWS.js
@@ -10,8 +10,22 @@
const callStatus = ref(null)
// token 存储
const accessToken = ref('')
+ // 断线恢复定时器
+ let recoverTimer = null
// 存储铃声实例
let ringtoneInstance = null
+
+ // 监听WebView消息事件
+ if (typeof uni !== 'undefined' && uni.$on) {
+ uni.$on('webViewMessage', (data) => {
+ console.log('📨 useGlobalWS 收到 WebView 消息:', data)
+ // 处理挂断消息
+ if (data?.type === 'hangupVoice') {
+ console.log('📞 收到挂断消息')
+ initWS()
+ }
+ });
+ }
// 设置默认用户ID为3
const defaultUserId = '2021474815063486465';
@@ -150,11 +164,53 @@
// }
// 初始化WebSocket连接
+ function isVoiceCallDetailActive() {
+ try {
+ const pages = getCurrentPages()
+ const currentPage = pages[pages.length - 1]
+ const route = currentPage?.route || currentPage?.$page?.fullPath || ''
+ return String(route).includes('subPackages/voiceCallDetail/index')
+ } catch (error) {
+ return false
+ }
+ }
+
+ function shouldRecoverWS() {
+ return !isVoiceCallDetailActive() && !!useUserStore()?.userInfo?.access_token
+ }
+
+ function ensureRecoverTimer() {
+ if (recoverTimer) {
+ return
+ }
+ recoverTimer = setInterval(() => {
+ // console.log('shouldRecoverWS()',shouldRecoverWS(),'----------',websocketService.getConnected())
+ if (shouldRecoverWS() && !websocketService.getConnected()) {
+ initWS()
+ }
+ }, 3000)
+ }
+
function initWS() {
+ websocketService.close()
const userStore = useUserStore()
accessToken.value =userStore?.userInfo.access_token
+ if (!accessToken.value || isVoiceCallDetailActive()) {
+ return
+ }
try {
websocketService.setOnMessageCallback(messageHandler);
+ websocketService.setOnOpenCallback(() => {})
+ websocketService.setOnCloseCallback(() => {
+ if (shouldRecoverWS()) {
+ ensureRecoverTimer()
+ }
+ })
+ websocketService.setOnErrorCallback(() => {
+ if (shouldRecoverWS()) {
+ ensureRecoverTimer()
+ }
+ })
// 获取当前用户ID，优先使用store中的用户信息
const userId = userStore.userInfo?.new_userInfo.userId || defaultUserId;
@@ -165,9 +221,6 @@
// 使用用户ID初始化WebSocket连接
websocketService.init(userId, WS_BASE, accessToken.value);
// console.log('🌐 全局WebSocket初始化成功，用户ID:', userId);
- } else {
- websocketService.connect();
-
}
} catch (error) {
}
@@ -183,6 +236,8 @@
},
{ immediate: true, deep: true }
)
+
+ ensureRecoverTimer()
}
--
Gitblit v1.9.3