From 98f83e242f7200b80dfc00edf0fd543cde5ba28c Mon Sep 17 00:00:00 2001
From: xszyou <xszyou@163.com>
Date: Tue, 15 Aug 2023 10:23:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B4=A7=E6=80=A5=E4=BF=AE=E5=A4=8Dws=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/wsa_server.py | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/core/wsa_server.py b/core/wsa_server.py
index c51c53d..1c7c1d4 100644
--- a/core/wsa_server.py
+++ b/core/wsa_server.py
@@ -35,7 +35,7 @@ class MyServer:
         while self.__running:
             await asyncio.sleep(0.000001)
             message = await self.__producer()
-            if message and self.isConnect:
+            if message:
                 await websocket.send(message)
                 
 
@@ -50,6 +50,9 @@ class MyServer:
             task.cancel()
             self.isConnect = False
             util.log(1,"websocket连接断开:{}".format(self.__port))
+            if self.__port == 10002:
+                web_server_instance = get_web_instance()  
+                web_server_instance.add_cmd({"is_connect": False}) 
     
     async def __consumer(self, message):
         self.on_revice_handler(message)
@@ -57,6 +60,7 @@ class MyServer:
     async def __producer(self):
         if len(self.__listCmd) > 0:
             message = self.on_send_handler(self.__listCmd.pop(0))
+            print(message)
             return message
         else:
             return None
@@ -77,6 +81,7 @@ class MyServer:
     def on_send_handler(self, message):
         return message
 
+
     # 创建server
     def __connect(self):
         self.__event_loop = asyncio.new_event_loop()
@@ -91,7 +96,7 @@ class MyServer:
 
     # 往要发送的命令列表中，添加命令
     def add_cmd(self, content):
-        if not self.__running or not self.isConnect:
+        if not self.__running or (not self.isConnect and self.__port == 10002):
             return
         jsonObj = json.dumps(content)
         self.__listCmd.append(jsonObj)
@@ -129,11 +134,15 @@ class HumanServer(MyServer):
         pass
     
     def on_connect_handler(self):
-        pass
+        web_server_instance = get_web_instance()  
+        web_server_instance.add_cmd({"is_connect": True}) 
+        
 
     def on_send_handler(self, message):
-        # util.log(1, '向human发送 {}'.format(message))
+        util.log(1, '向human发送 {}'.format(message))
         return message
+    
+
 
 #ui端server
 class WebServer(MyServer):
@@ -162,6 +171,8 @@ class TestServer(MyServer):
     
     def on_send_handler(self, message):
         return message
+    
+
 
 
 #单例