From 9411c4e47500e271d8fb88143c86e6dcb2d89684 Mon Sep 17 00:00:00 2001
From: wu_xinjun <bent20140204@outlook.com>
Date: 星期一, 28 二月 2022 10:43:41 +0800
Subject: [PATCH] Merge commit 'f79b30a55db543bd1c7dd494a8c896df8841aa28' into addFeature
---
src/engine/MessageQueueThread.py | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/engine/MessageQueueThread.py b/src/engine/MessageQueueThread.py
index d72f7df..16396af 100644
--- a/src/engine/MessageQueueThread.py
+++ b/src/engine/MessageQueueThread.py
@@ -19,9 +19,11 @@
user: str,
password: str,
queue: str,
- device_manager: DeviceManager):
+ device_manager: DeviceManager,
+ save_folder: str):
threading.Thread.__init__(self)
self._device_manager = device_manager
+ self.save_folder = save_folder
self._def_routes()
self.message_received: int = 0
@@ -58,7 +60,7 @@
print(
f'send image sub command received, length={req.data1.length}')
if req.data1.length > 0:
- device = self._device_manager.get_device(req.device_id)
+ device = self._device_manager.get_device(req.device_id, self.save_folder)
img_msg = pb.ImagesMessage()
img_msg.ParseFromString(req.data1.data)
# print(img_msg.image1)
@@ -74,7 +76,7 @@
print('micro wave command')
if pb.SubCommand.MICRO_WAVE_SUB_COMMAND == req.sub_command:
print('micro wave sub command received')
- device = self._device_manager.get_device(req.device_id)
+ device = self._device_manager.get_device(req.device_id,self.save_folder)
micro_wave_msg = pb.MicroWaveMessage()
micro_wave_msg.ParseFromString(req.data1.data)
if (micro_wave_msg.length == len(micro_wave_msg.data)):
--
Gitblit v1.9.1