rambo 6 hónapja
szülő
commit
d0ff5f7e9c

+ 10 - 9
python/mcu/capture/smart_shooter_class.py

@@ -6,7 +6,7 @@ import asyncio
 from PIL import Image
 from io import BytesIO
 import base64
-import zmq, sys
+import zmq, sys, time
 from utils.SingletonType import SingletonType
 
 
@@ -376,7 +376,7 @@ class SmartShooter(metaclass=SingletonType):
             await self.websocket_manager.send_personal_message(message, self.websocket)
             return False, msg_send
 
-    async def connect_listen(self):
+    def connect_listen(self):
         print("smart shooter connect_listen", self.connect_status, self.listen_init)
         if self.connect_status == True or self.listen_init == True:
             return True
@@ -385,14 +385,14 @@ class SmartShooter(metaclass=SingletonType):
         print("构建监听", self.connect_status)
         while True:
             self.listen_init = True
-            await asyncio.sleep(0.01)
+            time.sleep(0.01)
             if self.callback_listen == None:
                 continue
-            camera_states, camera_msg = await self.GetCameraInfo(is_send=False)
-            if not camera_states:
-                print("相机未连接回调打印", camera_states, camera_msg)
-                await asyncio.sleep(0.01)  # 等待相机连接
-                continue
+            # camera_states, camera_msg = await self.GetCameraInfo(is_send=False)
+            # if not camera_states:
+            #     print("相机未连接回调打印", camera_states, camera_msg)
+            #     await asyncio.sleep(0.01)  # 等待相机连接
+            #     continue
             if self.stop_listen:
                 break
             try:
@@ -402,7 +402,8 @@ class SmartShooter(metaclass=SingletonType):
                 json_msg = json.loads(str_msg)
                 if json_msg["msg_id"] == "NetworkPing":
                     continue
-                await self.callback_listen(json_msg)
+                # self.callback_listen(json_msg)
+                asyncio.run(self.callback_listen(json_msg))
             except zmq.Again:
                 print("接收超时,继续监听...")
                 continue

+ 5 - 9
python/sockets/socket_server.py

@@ -117,10 +117,6 @@ async def websocket_endpoint(websocket: WebSocket):
                         msg_type="smart_shooter_enable_preview",
                     )
                     await conn_manager.send_personal_message(data, websocket)
-        # async def runListen():
-        #     smart_shooter.callback_listen = MsgCallback
-        #     await smart_shooter.connect_listen()
-        # asyncio.create_task(runListen())
         smart_shooter.callback_listen = MsgCallback
         loop = asyncio.get_event_loop()
         loop.run_in_executor(None, smart_shooter.connect_listen)  # 后台线程启动监听
@@ -133,11 +129,11 @@ async def websocket_endpoint(websocket: WebSocket):
         # if websocket:
         #     await websocket.close()
 
-@app.on_event("startup")
-async def startup_event():
-    loop = asyncio.get_event_loop()
-    loop.run_in_executor(None, smart_shooter.connect_listen)
-    print("监听服务已启动")
+# @app.on_event("startup")
+# async def startup_event():
+#     loop = asyncio.get_event_loop()
+#     loop.run_in_executor(None, await smart_shooter.connect_listen)
+#     print("监听服务已启动")
 @app.on_event("shutdown")
 async def shutdown_event():
     print("Shutting down...")