Merge branch 'ZJZGJ' of http://www.sri-robot.cn:30000/SRI-DINO/Server-py into ZJZGJ

sri-server-bg02/lib/MessageListener.py

@@ -12,6 +12,7 @@ import os
 # save_dir = r'C:\SRI-DINO.Server-py\logs'  # sri内网测试环境
 save_dir = r'C:\logs'  # sri内网测试环境
 
+
 # last_log_key = str()
 
 class MessageListener(object):
@@ -20,12 +21,17 @@ class MessageListener(object):
     last_log_key = str()
 
     @staticmethod
-    def v001(client, userdata, message):
+    def method_v001(client, userdata, message):
         """消息处理方法"""
         # --- log ---
         # print(f'MessageListener24: #message.payload: {message.payload}', flush=True)
         # methods.debug_log(f"MessageListener24", f"#message.payload: {message.payload}")
 
+        # --- check ---
+        # if not methods.is_dir(save_dir):
+        #     out = methods.run_command(f'mkdir -p {save_dir}', callback=True)
+        #     methods.debug_log('MessageListener46', f"#out: {out}")
+
         # --- save log ---
         file_name = methods.now_string('v001-%Y-%m-%d-%H.log')
         log_file_path = os.path.join(save_dir, file_name)
@@ -94,30 +100,30 @@ class MessageListener(object):
         methods.write_text(log_file_path, ' | '.join(log_list) + '\n', 'a')
 
     @classmethod
-    def subscribe001(cls):
+    def subscribe_v001(cls):
         """"""
-        # --- check ---
-        # if not methods.is_dir(save_dir):
-        #     out = methods.run_command(f'mkdir -p {save_dir}', callback=True)
-        #     methods.debug_log('MessageListener46', f"#out: {out}")
-
         Global.emqx.start_subscribe_loop(
-            decorate_method=MessageListener.v001,
-            # subscribe_topic='bg/log'
+            decorate_method=MessageListener.method_v001,
             subscribe_topic='Vehicle/ControlVehicle/Veh001'
         )
 
-    # @classmethod
-    # def run_background(cls, background_is=True):
-    #     """"""
+    @staticmethod
+    def method_c001(client, userdata, message):
+        """消息处理方法"""
+        # --- log ---
+        methods.debug_log(f"MessageListener|114", f"#message.payload: {message.payload}")
 
-    #     p1 = threading.Thread(target=cls.subscribe001)
-    #     p1.start()
+    def subscribe_c001(cls):
+        """"""
+        Global.emqx.start_subscribe_loop(
+            decorate_method=MessageListener.method_c001,
+            subscribe_topic='Cockpit/CanBus/CanId001/Cop001'
+        )
 
     @classmethod
     def run(cls, background_is=True):
         thread_list = [
-            threading.Thread(target=cls.subscribe001),
+            threading.Thread(target=cls.subscribe_v001),
         ]
         for thread in thread_list:
             thread.setDaemon(True)