From 868abf68ab0e737de85abe2b3ceab8c158952a3d Mon Sep 17 00:00:00 2001
From: songjun <leon0756@gmail.com>
Date: 星期五, 15 七月 2022 22:11:17 +0800
Subject: [PATCH] Merge branch 'master' of ssh://dh.leon056.com:29418/data/iot/DeviceCommunicationUI

---
 src/samples/sockteStomp.ts |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/samples/sockteStomp.ts b/src/samples/sockteStomp.ts
index 01c2590..fa4e428 100644
--- a/src/samples/sockteStomp.ts
+++ b/src/samples/sockteStomp.ts
@@ -161,7 +161,9 @@
         
     }
 }
+var isErrConnectBackCalled = false;
 const connectCallback=function(){
+    isErrConnectBackCalled = true
     const pcName= sockteStore().pcName
     console.log("链接成功",stompClient,pcName)
     // 订阅患者信息服务
@@ -178,25 +180,36 @@
     sockteStore().setsockteIsLink(true)
     console.log(sockteStore().isLink)
     if(devices!==undefined&&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.send(`/app/device/request/${clientCode}/${de.deviceName}`, {}, JSON.stringify({"deviceNumber":de.deviceName}));
+        // 更新sockte链接状态
+        sockteStore().setsockteIsLink(true)
+        console.log(sockteStore().isLink)
+        console.log(devices)
+        if(devices!==undefined&&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.send(`/app/device/request/${clientCode}/${de.deviceName}`, {}, JSON.stringify({"deviceNumber":de.deviceName}));
 
-            } 
-        })
+                } 
+            })
+        }
     }
 }
+
+const disconnectCallBack=function(){
+    console.log("disconnect");
+}
+
 const error_callback=function(error:any){
     console.log('链接错误',error);
     setTimeout(()=>{
-        console.log('10秒之后重连',sockteNum++)
+        console.log('10秒之后重连',sockteNum++) 
         const socket = new WebSocket('ws://hemobs.icoldchain.cn/broadcast')
+        stompClient?.disconnect(disconnectCallBack,{})
         stompClient = Stomp.over(socket)
         stompClient.connect({}, connectCallback,error_callback)
-
-    },10000)
+    },60000)
 }
 // 创建客户端链接
 const creatorClient=(devices2:any,clientCode2:any)=>{

--
Gitblit v1.8.0