casper hai 4 meses
pai
achega
805d6488e0

+ 2 - 2
sri-server-bg02/lib/MessageListener.py

@@ -24,11 +24,11 @@ class MessageListener(object):
     def run(cls, background_is=True):
 
         from lib.MessageListenerC001 import subscribe_c001
-        from lib.MessageListenerC001 import subscribe_v001
+        # from lib.MessageListenerV001 import subscribe_v001
 
         thread_list = [
             threading.Thread(target=subscribe_c001),
-            threading.Thread(target=subscribe_v001),
+            # threading.Thread(target=subscribe_v001),
         ]
         for thread in thread_list:
             thread.setDaemon(True)

+ 58 - 1
sri-server-bg02/lib/MessageListenerC001.py

@@ -15,11 +15,68 @@ save_dir = r'C:\logs'  # sri内网测试环境
 
 def method_c001(client, userdata, message):
     """消息处理方法"""
+    """
+        {
+    'basControl': {
+        'directSwitch': 1,
+        'eStop': 0,
+        'gearControl': 0,
+        'hazardLight': 0,
+        'keyStatus': 0,
+        'parkControl': 0,
+        'silencedAlarm': 0,
+        'travelLight': 2,
+        'travelMode': 0,
+        'vehicleHorn': 0
+    },
+    'cockpitID': 'Cop001',
+    'driverControl': {
+        'accPedal': '0 AND 0 || 0 AND -1',
+        'brakePedal': '2 AND 2',
+        'steeringWheel': '1 AND 0',
+        'turnMode': 0,
+        'turnSignal': 0
+    },
+    'errCode': {
+        'errAccPedal': 0,
+        'errBasOperation': '',
+        'errBrakePedal': 0,
+        'errEndTool': 0,
+        'errHandle': 0,
+        'errOther': '',
+        'errSteeringWheel': 0
+    },
+    'taskControl': {
+        'baseLegControl': '103 AND 24',
+        'baseLegSwitch': 0,
+        'bypassSwitch': 0,
+        'cabLift': 0,
+        'coopSignal': 3,
+        'enableHydraulic': 1,
+        'endJoint': '1 AND 0',
+        'esCabLift': 0,
+        'suckerSelect': 0,
+        'taskJoint_1': '5 AND 0',
+        'taskJoint_2': '0 AND 0',
+        'taskJoint_3': '0 AND 0',
+        'toolControl': '0 AND 0',
+        'workLight': 0
+    },
+    'timeStamp': 576301601,
+    'userID': 'Ego',
+    'vehicleID': '0538'
+    }
+    """
     # --- log ---
     methods.debug_log(f"MessageListenerC001|19", f"#message.payload: {message.payload}")
+    # try:
+    #     log_dict = json.loads(message.payload)
+    #     methods.debug_log(f"MessageListenerC001|19", f"#message.payload: {repr(log_dict)}")
+    # except Exception as e:
+    #     pass
 
 
-def subscribe_c001(cls):
+def subscribe_c001():
     """"""
     Global.emqx.start_subscribe_loop(
         decorate_method=method_c001,

+ 1 - 1
sri-server-bg02/lib/MessageListenerV001.py

@@ -96,7 +96,7 @@ def method_v001(client, userdata, message):
     methods.write_text(log_file_path, ' | '.join(log_list) + '\n', 'a')
 
 
-def subscribe_v001(cls):
+def subscribe_v001():
     """"""
     Global.emqx.start_subscribe_loop(
         decorate_method=method_v001,