|

sri-pysdk/xclient/xmqtt.py

@@ -66,12 +66,14 @@ if __name__ == '__main__':
     # --- test subscribe ---
     def m1(_, __, p3):
         # print(f'#message: {p3.payload}')
-        print(f"#message.payload: {json.loads(p3.payload)}")
+        print(f"#message.payload: {p3.payload}")
+        # print(f"#message.payload: {json.loads(p3.payload)}")
 
     # subscribe_topic = 'bg/log'
     # subscribe_topic = 'qtmqtt'
     # subscribe_topic = 'client'
-    subscribe_topic = 'Vehicle/ControlVehicle/Veh001'
+    # subscribe_topic = 'Vehicle/ControlVehicle/Veh001'
+    subscribe_topic = 'Cockpit/CanBus/CanId001/Cop001'
     c1.start_subscribe_loop(decorate_method=m1, subscribe_topic=subscribe_topic)
 
     # --- test publish ---

sri-server-bg03/lib/Connection_e1.py

@@ -569,8 +569,8 @@ class SRIConnection(asyncio.Protocol):
         """
         o1 = protobuf.CSState()
         o1.ParseFromString(body_data)
-        methods.debug_log(f"{self.connection_id}|SRIConnection530", f"----------------- #state: {o1.state}")
-        methods.debug_log(f"{self.connection_id}|SRIConnection530", f"#uid: {o1.uid}")
+        methods.debug_log(f"{self.connection_id}|SRIConnection|572", f"#state: {o1.state}")
+        methods.debug_log(f"{self.connection_id}|SRIConnection|572", f"#uid: {o1.uid}")
 
         # --- send 4016 发送全部舱端
         for item in clients.values():
@@ -584,8 +584,7 @@ class SRIConnection(asyncio.Protocol):
                 """
                 o2 = protobuf.SCState()
                 o2.state = o1.state
-                # o2.uid = self.client_info.get('uid')
-                o2.uid = o1.uid  # todo 文磊这边发送过来的车端id
+                o2.uid = o1.uid  # 车端id
                 re_command_id = protobuf.SC_State  # 4022
                 re_body_length = o2.ByteSize()
                 re_head_data = struct.pack(self.head_sequence, re_command_id, re_body_length)
@@ -596,8 +595,7 @@ class SRIConnection(asyncio.Protocol):
 
         # --- send 6011 指发送车端操作用户的id
         for item in clients.values():
-            # if item.client_info.get('connection_id') == o1.uid:
-            if item.client_info.get('connection_id') == 10101089:
+            if item.client_info.get('connection_id') == o1.uid:
                 """
                 Leave: 消息体
                 Leave.peer: int32（车端rid）
@@ -613,9 +611,6 @@ class SRIConnection(asyncio.Protocol):
                 re_body_data = o3.SerializeToString()
                 re_send_data = re_head_data + re_body_data
                 methods.debug_log(f"{self.connection_id}|SRIConnection611", f"re_command_id: {re_command_id}")
-                # methods.debug_log(f"{self.connection_id}|SRIConnection611", f"o3.user_uuid: {o3.user_uuid}")
-                # methods.debug_log(f"{self.connection_id}|SRIConnection611", f"o3.cockpit_id: {o3.cockpit_id}")
-                # methods.debug_log(f"{self.connection_id}|SRIConnection611", f"o3.vehicle_id: {o3.vehicle_id}")
                 item.client.write(re_send_data)
 
     @staticmethod