Commit Graph

324 Commits

Author SHA1 Message Date
96ec7a2b07 增加屏蔽门状态返回 2023-10-19 17:31:26 +08:00
joylink_zhaoerwei
1ffe7fa6a5 增加地图的公里标主坐标系 2023-10-19 17:23:44 +08:00
xzb
76edc8de95 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message into HEAD 2023-10-19 17:12:21 +08:00
xzb
754049d011 信号机模型类型 2023-10-19 17:11:28 +08:00
8f23c4062d 增加门控箱交互接口;修改门控箱构建逻辑bug;增加屏蔽门状态 2023-10-19 17:09:36 +08:00
weizhihong
cff3d23475 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-19 16:08:16 +08:00
weizhihong
57e0118a53 【修改灯激活属性】 2023-10-19 16:08:09 +08:00
xzb
97319ed5b8 signal 故障 2023-10-19 15:06:41 +08:00
xzb
4ea207ebba Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message into HEAD 2023-10-19 14:15:39 +08:00
xzb
d7435063ab signal 故障 2023-10-19 14:15:01 +08:00
joylink_zhaoerwei
7fa55788f5 字段名字调整 2023-10-19 10:33:44 +08:00
joylink_zhaoerwei
fa48e1cd4f 加注释 2023-10-19 10:13:04 +08:00
joylink_zhaoerwei
5ec37803d5 站台关联字段调整 2023-10-19 08:57:54 +08:00
weizhihong
43345d1094 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-18 14:53:41 +08:00
weizhihong
c108e156eb 【修改延时时间位置】 2023-10-18 14:53:33 +08:00
fan
df8a26fc7f Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-18 14:41:39 +08:00
fan
d6e94b4560 pslButton数据调整 2023-10-18 14:41:34 +08:00
Yuan
4db072e4cd ibp按钮是否带灯 2023-10-18 11:08:42 +08:00
weizhihong
291c568905 【按钮增加灯状态】 2023-10-18 10:11:23 +08:00
weizhihong
7b83f10ef6 【增加列车更新时间字段】 2023-10-17 18:03:33 +08:00
weizhihong
0868e9273f Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-17 15:46:33 +08:00
weizhihong
d1b6798d30 【增加按钮、指示灯、警铃状态】 2023-10-17 15:46:27 +08:00
fan
6ca28f502f spks调整 2023-10-17 14:20:22 +08:00
xzb
7a105e7c0e signal 2023-10-17 09:23:38 +08:00
xzb
c3893c5b49 信号机状态 2023-10-16 11:10:54 +08:00
xzb
3f409d717b 信号机状态 2023-10-16 11:01:12 +08:00
c18ac281a6 添加请求消息文件 2023-10-13 17:51:38 +08:00
fan
f43d8dbec4 ibp proto文件调整 2023-10-13 16:37:47 +08:00
fan
4a20e38f8c Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-13 16:11:44 +08:00
fan
4becdaf8b0 spks调整 2023-10-13 16:11:40 +08:00
Yuan
4901aa6c0d Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-message 2023-10-13 16:07:38 +08:00
Yuan
d0e2f78203 ibp关联组合 2023-10-13 16:07:36 +08:00
xzb
3ca9d88a1f Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message into HEAD 2023-10-13 15:58:31 +08:00
fan
73dcb43c76 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-13 15:57:52 +08:00
fan
58977714f4 psl关联设备数据调整 2023-10-13 15:57:48 +08:00
xzb
b86f21606e Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message into HEAD
# Conflicts:
#	protos/device_state.proto
2023-10-13 15:57:29 +08:00
xzb
0b44d2adad 信号机 2023-10-13 15:56:47 +08:00
xzb
d5ef2b4d1b Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-13 15:53:44 +08:00
xzb
62c82bd041 信号机状态推送 2023-10-13 15:53:32 +08:00
Yuan
cc23df9076 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-message 2023-10-13 15:22:23 +08:00
Yuan
2f5db03f59 ibp灯 2023-10-13 15:22:20 +08:00
xzb
bbead938bb Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-13 15:18:27 +08:00
xzb
8c5cf8f0d5 信号机状态推送 2023-10-13 15:18:12 +08:00
xzb
ad518abef0 信号机 2023-10-13 14:56:23 +08:00
Yuan
7d027a7e5e ibp 2023-10-13 14:02:12 +08:00
Yuan
3c13e9122b merge 2023-10-13 13:59:35 +08:00
Yuan
593a7c477e ibp 2023-10-13 13:58:53 +08:00
fan
b33cc6eee0 proto文件调整 2023-10-13 13:36:39 +08:00
fan
3179930523 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-13 13:32:46 +08:00
fan
9eedbdd555 proto文件调整 2023-10-13 13:32:41 +08:00