浏览代码

日常开发

林旭祥 5 月之前
父节点
当前提交
78a02c93c0
共有 2 个文件被更改,包括 31 次插入31 次删除
  1. 27 27
      src/utils/handWs.ts
  2. 4 4
      src/utils/trainWs.ts

+ 27 - 27
src/utils/handWs.ts

@@ -21,19 +21,19 @@ export function useWebSocket() {
   // }
 
   let socketHand: any = null; //ws实例对象
-    socketHand = io(address + '/', {
-      transports: ['websocket', 'polling'],
-      query: {
-        Authorization: token ? myToken : '',
-      }
-    });
+  socketHand = io(address + '/', {
+    transports: ['websocket', 'polling'],
+    query: {
+      Authorization: token ? myToken : ''
+    }
+  });
 
   function handWs(callback: any) {
-    if(socketHand == null){
+    if (socketHand == null) {
       return false;
     }
     callback({
-      wksid:socketHand.id
+      wksid: socketHand.id
     });
     socketHand.on('connect', (e: any) => {
       callback(e);
@@ -56,20 +56,20 @@ export function useWebSocket() {
     socketHand.on('disconnect', (e: any) => {
       callback(e);
     });
-  };
+  }
 
   /**
    * 发送消息
    */
   function sendMessage(type: string, data: any, callback?: () => void) {
-    if(socketHand==null){
+    if (socketHand == null) {
       return false;
     }
     if (socketHand.connected) {
-      callback = callback || function () { };
+      callback = callback || function () {};
       socketHand.emit(type, data, callback);
     }
-  };
+  }
 
   /**
    * 开始连接登录
@@ -80,9 +80,9 @@ export function useWebSocket() {
       {
         deviceid: deviceid ? deviceid : ''
       },
-      () => { }
+      () => {}
     );
-  };
+  }
 
   /**
    * 开始连接设备信息
@@ -93,9 +93,9 @@ export function useWebSocket() {
       {
         data: data
       },
-      () => { }
+      () => {}
     );
-  };
+  }
 
   /**
    * 开始连接手势
@@ -107,9 +107,9 @@ export function useWebSocket() {
         hctrl_name: `handcontroller_${data}`,
         cmd: 'open_handcontroller'
       },
-      () => { }
+      () => {}
     );
-  };
+  }
 
   /**
    * 获取手势状态
@@ -121,9 +121,9 @@ export function useWebSocket() {
         hctrl_name: `handcontroller_${data}`,
         cmd: 'get_handcontroller_state'
       },
-      () => { }
+      () => {}
     );
-  };
+  }
 
   /**
    * 关闭连接手势
@@ -135,9 +135,9 @@ export function useWebSocket() {
         hctrl_name: `handcontroller_${data}`,
         cmd: 'terminate_handcontroller'
       },
-      () => { }
+      () => {}
     );
-  };
+  }
 
   onUnmounted(() => {
     // if (socketHand) {
@@ -147,11 +147,11 @@ export function useWebSocket() {
     //   // }
     //   socketHand = null;
     // }
-    if (socketHand) {
-      socketHand.close();
-      socketHand = null;
-    }
+    // if (socketHand) {
+    //   socketHand.close();
+    //   socketHand = null;
+    // }
   });
 
   return { handWs, sendMessage, startLogin, startDevice, startHand, stateHand, closeHand };
-}
+}

+ 4 - 4
src/utils/trainWs.ts

@@ -602,10 +602,10 @@ export function useWs() {
   }
 
   onUnmounted(() => {
-    if (socket) {
-      socket.close();
-      socket = null;
-    }
+    // if (socket) {
+    //   socket.close();
+    //   socket = null;
+    // }
   });
 
   return {