周二：增加6011消息逻辑

sri-server-bg03/README-usage.bash

@@ -2,59 +2,59 @@
 
 sudo docker logs -f sri-dino-pyserver01  # 查看日志
 
-echo "操作：代码更新" \
-&& project_path="/home/sri/repositories/repositories/sri-project.demo-py/sri-dino-pyserver01" \
-&& cd ${project_path} \
-&& sudo docker-compose --file compose.yml restart \
-&& sudo docker-compose --file compose.yml logs --follow
-
 echo "操作：停服更新" \
-&& project_path="/home/sri/repositories/repositories/sri-project.demo-py/sri-dino-pyserver01" \
+&& project_path="/home/sri/repositories/repositories/SRI-DINO.Server-py/sri-server-bg03" \
 && cd ${project_path} \
 && sudo docker-compose --file compose.yml down \
 && sudo docker-compose --file compose.yml up --detach \
 && sudo docker-compose --file compose.yml logs --follow
 
+echo "操作：代码更新" \
+&& project_path="/home/sri/repositories/repositories/SRI-DINO.Server-py/sri-server-bg03" \
+&& cd ${project_path} \
+&& sudo docker-compose --file compose.yml restart \
+&& sudo docker-compose --file compose.yml logs --follow
+
 echo "操作：构建调试" \
-&& project_path="/home/sri/repositories/repositories/sri-project.demo-py/sri-dino-pyserver01" \
+&& project_path="/home/sri/repositories/repositories/SRI-DINO.Server-py/sri-server-bg03" \
 && cd ${project_path} \
 && sudo docker-compose --file compose.yml down \
 && sudo docker-compose --file compose.yml up --detach --build \
 && sudo docker exec -it sri-dino-pyserver01 bash
 
 echo "操作：启动调试环境" \
-&& project_path="/home/sri/repositories/repositories/sri-project.demo-py/sri-dino-pyserver01" \
+&& project_path="/home/sri/repositories/repositories/SRI-DINO.Server-py/sri-server-bg03" \
 && cd ${project_path} \
 && sudo docker-compose --file compose.yml down \
 && sudo docker-compose --file compose.yml up --detach \
 && sudo docker exec -it sri-dino-pyserver01 bash
 
 echo "操作：重启调试环境" \
-&& project_path="/home/sri/repositories/repositories/sri-project.demo-py/sri-dino-pyserver01" \
+&& project_path="/home/sri/repositories/repositories/SRI-DINO.Server-py/sri-server-bg03" \
 && cd ${project_path} \
 && sudo docker-compose --file compose.yml restart \
 && sudo docker exec -it sri-dino-pyserver01 bash
 
 echo "操作：进入调试环境" \
-&& project_path="/home/sri/repositories/repositories/sri-project.demo-py/sri-dino-pyserver01" \
+&& project_path="/home/sri/repositories/repositories/SRI-DINO.Server-py/sri-server-bg03" \
 && cd ${project_path} \
 && sudo docker exec -it sri-dino-pyserver01 bash
 
 echo "操作：初装启动" \
-&& project_path="/home/sri/repositories/repositories/sri-project.demo-py/sri-dino-pyserver01" \
+&& project_path="/home/sri/repositories/repositories/SRI-DINO.Server-py/sri-server-bg03" \
 && cd ${project_path} \
 && sudo docker-compose --file compose.yml down \
 && sudo docker-compose --file compose.yml up --detach --build \
 && sudo docker-compose --file compose.yml logs --follow
 
 echo "操作：开发调试" \
-&& project_path="/home/sri/repositories/repositories/sri-project.demo-py/sri-dino-pyserver01" \
+&& project_path="/home/sri/repositories/repositories/SRI-DINO.Server-py/sri-server-bg03" \
 && cd ${project_path} \
 && sudo docker-compose --file compose.yml down \
 && sudo docker-compose --file compose.yml up --detach \
 && sudo docker exec -it sri-dino-pyserver01 bash
 
 echo "操作：跟踪日志" \
-&& project_path="/home/sri/repositories/repositories/sri-project.demo-py/sri-dino-pyserver01" \
+&& project_path="/home/sri/repositories/repositories/SRI-DINO.Server-py/sri-server-bg03" \
 && cd ${project_path} \
 && sudo docker-compose --file compose.yml logs --follow

sri-server-bg03/compose.yml

@@ -1,10 +1,10 @@
 version: '3.5'
 services:
 
-    sri-dino-pyserver01:
+    sri-server-bg03:
 
         # --- building ---
-        image: sri-dino-pyserver01:2024
+        image: sri-server-bg03:2024
         build:
             context: ./
             dockerfile: ./Dockerfile
@@ -22,15 +22,15 @@ services:
         network_mode: host
 
         # --- running ---
-        container_name: sri-dino-pyserver01
+        container_name: sri-server-bg03
 
         # --- for debug ---
-#        working_dir: /home/sri/repositories/repositories/sri-project.demo-py/sri-dino-pyserver01
+#        working_dir: /home/sri/repositories/repositories/SRI-DINO.Server-py/sri-server-bg03
 #        stdin_open: true
 #        tty: true
 
         # --- for release ---
-        working_dir: /home/sri/repositories/repositories/sri-project.demo-py/sri-dino-pyserver01
+        working_dir: /home/sri/repositories/repositories/SRI-DINO.Server-py/sri-server-bg03
         command: bash run.sh
         restart: always
 

sri-server-bg03/lib/Connection_e1.py

@@ -11,8 +11,8 @@ import sys
 import importlib
 
 # --- for linux
-# sys.path.append('/home/sri/repositories/repositories/sri-project.demo-py/sri-dino-pyserver01')
-# sys.path.append('/home/sri/repositories/repositories/sri-project.demo-py/sri-pysdk')
+# sys.path.append('/home/sri/repositories/repositories/SRI-DINO.Server-py/sri-server-bg03')
+# sys.path.append('/home/sri/repositories/repositories/SRI-DINO.Server-py/sri-pysdk')
 
 # --- for windows
 sys.path.append(r'C:\SRI-DINO.Server-py\sri-server-bg03')
@@ -31,6 +31,8 @@ serial_rid_dict = {
 account_uid_dict = {
     'ego': 3
 }
+
+
 # live_relationship = {}  # {<id-1>id-2>: True}
 
 
@@ -591,6 +593,27 @@ class SRIConnection(asyncio.Protocol):
                 methods.debug_log(f"{self.connection_id}|SRIConnection551", f"re_command_id: {re_command_id}")
                 item.client.write(re_send_data)
 
+        # --- 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:
+                """
+                Leave: 消息体
+                Leave.peer: int32（车端rid）
+                Leave.egotype: int32
+                """
+                o3 = protobuf.UserActivityInfo()
+                o3.user_uuid = 'aabbccddeeffgg'  # 用户uuid
+                o3.cockpit_id = self.connection_id  # 舱端id
+                o3.vehicle_id = 10101089  # 车端id
+                re_command_id = protobuf.S2V_SendUserInfo  # 6011
+                re_body_length = o2.ByteSize()
+                re_head_data = struct.pack(self.head_sequence, re_command_id, re_body_length)
+                re_body_data = o2.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}")
+                item.client.write(re_send_data)
+
     @staticmethod
     async def check_clients():
         """

sri-server-bg03/run.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-echo "执行：启动" \
-&& python3 lib/Connection_e1.py
-
 #echo "执行：启动" \
-#&& python3 main.py
+#&& python3 lib/Connection_e1.py
+
+echo "执行：启动" \
+&& python3 main.py

sri-server-bg03/test/接口流程说明.md

@@ -28,6 +28,7 @@
 |-----|-----|------|-----|----------------|
 | 1-1 | 舱端  | 2014 | 服务器 | 状态改变           |
 | 1-2 | 服务器 | 4022 | 舱端  | 通知全部舱端状态改变     |
+| 1-3 | 服务器 | 6011 | 车端  | 发送舱端用户uuid等信息  |
 | 2-1 | 舱端  | 2001 | 服务端 | 请求视频           |
 | 2-2 | 服务器 | 4009 | 车端  | 转发给车（发送给车用户id） |
 | 2-3 | 车端  | 2002 | 服务器 | 响应视频请求         |

sri-server-bg03/xprotobuf/README-usage.md

@@ -7,7 +7,7 @@ apt update && apt install protobuf-compiler -y
 # 版本
 protoc --version
 # 生成
-cd /home/sri/repositories/repositories/sri-project.demo-py/sri-dino-pyserver01/xprotobuf
+cd /home/sri/repositories/repositories/SRI-DINO.Server-py/sri-server-bg03/xprotobuf
 protoc --python_out=. protocol.proto
 
 # 其他

sri-server-bg03/xprotobuf/protocol.proto

@@ -42,7 +42,9 @@ enum SCMessage
   SC_NotifyCloseVideo=4018;
   SC_KickOff=4019;
   SC_State=4022;
-  
+
+  S2V_SendUserInfo=6011;
+
 };
 enum CCMessage
 {
@@ -438,4 +440,11 @@ message CSState
 {
     UserState state=1;
     int32 uid=2;
+};
+
+message UserActivityInfo
+{
+    string user_uuid=1;
+    int32 cockpit_id=2;
+    int32 vehicle_id=3;
 };