Commit Graph

410 Commits

Author SHA1 Message Date
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
xzb
7a24c7aae2 信号机显示枚举定义 2023-10-13 10:47:46 +08:00
xzb
e92189e023 信号机显示枚举定义 2023-10-13 10:34:39 +08:00
xzb
b14d5add8a 信号机显示枚举定义 2023-10-13 10:18:30 +08:00
Yuan
5604ad84ed Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-message 2023-10-12 16:21:18 +08:00
Yuan
9041048e5a ibp 2023-10-12 16:21:12 +08:00
fan
608836a628 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-12 15:47:25 +08:00
fan
4867ce05a6 门控箱数据调整 2023-10-12 15:47:20 +08:00
joylink_zhaoerwei
23160cc746 屏蔽门增加编组列表数据管理 2023-10-12 15:14:03 +08:00
fan
6a2a393bf0 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-12 13:22:32 +08:00
fan
25a46b7963 地图数据调整 2023-10-12 13:22:26 +08:00
joylink_zhaoerwei
0a58cc6327 设备关联关系增加类型 2023-10-12 10:14:38 +08:00
fan
85290a8ba9 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-12 10:12:08 +08:00
fan
2b6e6b32a2 psl数据调整 2023-10-12 10:12:02 +08:00
joylink_zhaoerwei
c772733535 屏蔽门 2023-10-11 17:35:10 +08:00