From 36ac5744d69c53d6d6bd4abeba1ebda745ad94ca Mon Sep 17 00:00:00 2001
From: chenyc <501753378@qq.com>
Date: 星期一, 18 七月 2022 14:04:37 +0800
Subject: [PATCH] up

---
 src/samples/sockteStomp.ts |   28 ++++++++++++----------------
 1 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/samples/sockteStomp.ts b/src/samples/sockteStomp.ts
index fa4e428..b84223a 100644
--- a/src/samples/sockteStomp.ts
+++ b/src/samples/sockteStomp.ts
@@ -118,10 +118,6 @@
     }
     // 写入vuex里
     patientInfoStore().setpatientInfo(info)
-    console.log('播放声音')
-    // sound.play("https://dhcdn.leon056.com/hemo/autoselfsign/step2.mp3")
-    
-
 }
 
 // 订阅结果事件返回函数
@@ -166,6 +162,7 @@
     isErrConnectBackCalled = true
     const pcName= sockteStore().pcName
     console.log("链接成功",stompClient,pcName)
+    sockteStore().setsockteIsLink(true)
     // 订阅患者信息服务
     if(stompClient!==null){
         // 订阅患者信息事件
@@ -179,16 +176,16 @@
     // 更新sockte链接状态
     sockteStore().setsockteIsLink(true)
     console.log(sockteStore().isLink)
-    if(devices!==undefined&&devices.length>0){
+    if(devices!==undefined &&devices!=null&&devices.length>0){
         // 更新sockte链接状态
-        sockteStore().setsockteIsLink(true)
+        sockteStore().setsockteIsLink(true) 
         console.log(sockteStore().isLink)
         console.log(devices)
-        if(devices!==undefined&&devices!=null &&devices.length>0){
+        if(devices!==undefined&&devices!=null &&devices!=null &&devices.length>0){
             devices.forEach(de=>{
                 if(stompClient!==null){
                     stompClient.subscribe(`/queue/${clientCode}/${de.deviceName}/result`,callback)
-                    // stompClient.subscribe(`/queue/${clientCode}/${de.deviceName}/keepalive`,callbackState)
+                    stompClient.subscribe(`/queue/${clientCode}/${de.deviceName}/keepalive`,callbackState)
                     stompClient.send(`/app/device/request/${clientCode}/${de.deviceName}`, {}, JSON.stringify({"deviceNumber":de.deviceName}));
 
                 } 
@@ -197,18 +194,17 @@
     }
 }
 
-const disconnectCallBack=function(){
-    console.log("disconnect");
-}
-
 const error_callback=function(error:any){
     console.log('链接错误',error);
+    sockteStore().setsockteIsLink(false)
     setTimeout(()=>{
-        console.log('10秒之后重连',sockteNum++) 
+        console.log('60秒之后重连',sockteNum++) 
         const socket = new WebSocket('ws://hemobs.icoldchain.cn/broadcast')
-        stompClient?.disconnect(disconnectCallBack,{})
-        stompClient = Stomp.over(socket)
-        stompClient.connect({}, connectCallback,error_callback)
+        stompClient?.disconnect(()=>{
+            console.log("disconnected!");
+            stompClient = Stomp.over(socket)
+            stompClient.connect({}, connectCallback,error_callback)
+        },{})
     },60000)
 }
 // 创建客户端链接

--
Gitblit v1.8.0