增加消息类型

python/mcu/BaseClass.py

@@ -6,9 +6,10 @@ class BaseClass:
 
     def __init__(self, websocket_manager: ConnectionManager):
         self.websocket_manager = websocket_manager
+        self.msg_type = ""
 
-    def sendSocketMessage(self, code=0, msg="", data=None, msg_type=""):
-        data = {"code": code, "msg": msg, "data": data, "msg_type": msg_type}
+    def sendSocketMessage(self, code=0, msg="", data=None):
+        data = {"code": code, "msg": msg, "data": data, "msg_type": self.msg_type}
         loop = asyncio.get_event_loop()
         loop.create_task(message_queue.put(data))
     def change_hex_to_int(self,_bytearray):

python/mcu/BlueToothMode.py

@@ -21,6 +21,7 @@ class BlueToothMode(BaseClass,metaclass=SingletonType):
             return
         else:
             self.init_flag = True
+        self.msg_type = "blue_tooth"
         self.remote_control_v2 = RemoteControlV2(self, websocket_manager)
         # 用于存储找到的目标设备的地址
         self.target_device_address = None

python/mcu/DeviceControl.py

@@ -11,6 +11,7 @@ class DeviceControl(BaseClass,metaclass=SingletonType):
 
     def __init__(self, websocket_manager: ConnectionManager):
         super().__init__(websocket_manager)
+        self.msg_type = "mcu"
         self.serial_ins = None
         self.connected_ports_dict = {}  # 已连接的ports
         self.p_list = []

python/mcu/RemoteControlV2.py

@@ -15,6 +15,7 @@ class RemoteControlV2(BaseClass):
     def __init__(self, bluetooth_ins, websocket_manager: ConnectionManager):
         # 遥控设备处理--新版遥控器；硅胶按钮
         super().__init__(websocket_manager)
+        self.msg_type = "blue_tooth"
         self.websocket_manager = websocket_manager
         # self.windows = windows
         self.serial_ins = None
@@ -139,6 +140,8 @@ class RemoteControlV2(BaseClass):
             # self.windows.show_label.setText("{}".format(flag))
             if voltage_text:
                 print(voltage_text)
+                # 发送电量剩余消息
+                self.sendSocketMessage(msg=voltage_text)
                 # self.windows.show_label.setText("{}".format(voltage_text))
         else:
             if voltage_value == 0:
@@ -147,7 +150,7 @@ class RemoteControlV2(BaseClass):
             else:
                 print("电量：{}%".format(voltage_value))
                 # self.windows.show_label.setText("电量：{}%".format(voltage_value))
-        print("打印===>", flag)
+        # print("打印===>", flag)
     def close_connect(self):
         self.port_name = ""
         self.bluetooth_address = ""