Commit Graph

12115 Commits

Author SHA1 Message Date
Yuan
94d56cff1d Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-09-26 18:32:34 +08:00
Yuan
9b611239a9 pis滚动文字修改 2022-09-26 18:32:30 +08:00
joylink_cuiweidong
4b3fefbf27 代码调整 2022-09-26 18:27:05 +08:00
joylink_cuiweidong
e042b728e8 真实cctv 断线重连 2022-09-26 17:51:50 +08:00
joylink_cuiweidong
43a43f2724 修改三维的订阅路径 2022-09-26 16:31:33 +08:00
dong
5b95a05e29 代码调整 2022-09-26 15:31:00 +08:00
dong
419742737b 代码调整 2022-09-26 15:29:14 +08:00
dong
1bd6c8ea2e 代码调整 2022-09-26 15:11:55 +08:00
fan
9bc3133f02 ISCS状态调整 2022-09-26 14:27:41 +08:00
Yuan
c403857230 ISCS信息发布修改 2022-09-26 10:46:28 +08:00
Yuan
5e0983b124 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-09-26 10:09:44 +08:00
Yuan
276bffb930 PIS修改LOGO, 列车PIS适配, 文字修改 2022-09-26 10:09:36 +08:00
fan
282001a7be Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-26 09:51:56 +08:00
fan
a3c280bf73 iSCS定时任务广播系统取仿真系统时间 2022-09-26 09:51:36 +08:00
2b96d9168b 修改PA系统停止播放无效bug 2022-09-23 21:25:16 +08:00
Yuan
c80213c9b1 站台PIS列车时间显示调整 2022-09-23 18:32:48 +08:00
Yuan
c467da9a09 图片URL改为PNG 2022-09-23 16:37:58 +08:00
Yuan
285e9b8ab6 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-09-23 16:30:11 +08:00
Yuan
06ff678a48 图片URL修改 2022-09-23 16:30:05 +08:00
dong
b1d6d3ba3f 实训设计添加按钮Id 2022-09-23 16:22:46 +08:00
Yuan
d388631b60 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-09-23 16:12:05 +08:00
Yuan
21e3d49f48 车辆和站台PIS增加背景图 2022-09-23 16:11:59 +08:00
dong
255964bfe3 代码调整 2022-09-23 14:11:08 +08:00
Yuan
99a364abf9 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-09-23 11:18:34 +08:00
Yuan
b6401aef96 ISCS 信息发布修改 2022-09-23 11:18:27 +08:00
fan
8d2a995fba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-23 09:20:26 +08:00
fan
f0ee41a06c pa 时间处理 2022-09-23 09:20:06 +08:00
Yuan
6313b17345 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-09-22 18:21:28 +08:00
Yuan
8d314acc54 PIS滚动信息修改 && ISCS车站广播 2022-09-22 18:19:40 +08:00
fan
22355cf11a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-22 17:41:00 +08:00
fan
768af89057 ISCS资源增加类型 2022-09-22 17:40:50 +08:00
dong
c76ca2288c 代码调整 2022-09-22 17:03:13 +08:00
fan
986fe7eada PA系统调整 2022-09-22 16:58:23 +08:00
80b509464a 修改PA系统语音播放bug 2022-09-21 15:41:53 +08:00
fan
63d02669dc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-21 14:13:54 +08:00
fan
61ff3e0c73 设备管理配置接口调整 2022-09-21 14:13:42 +08:00
dong
119d2b3c60 代码调整 2022-09-21 14:08:51 +08:00
fan
d3a06586ba ISCS设备登录调整&&广播系统调整 2022-09-21 13:15:14 +08:00
dong
572643f80a 代码调整 2022-09-21 09:56:53 +08:00
Yuan
bec6112216 PIS列车进站时间修改 2022-09-21 09:38:11 +08:00
dong
bc9d81c301 代码调整 2022-09-20 17:54:14 +08:00
fan
2892517d36 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-20 17:41:33 +08:00
fan
b85fc187a0 iScs语音广播调整 2022-09-20 17:41:01 +08:00
dong
8fb99c668d 窗口间通信 2022-09-20 17:25:21 +08:00
fan
a49f1b2c7a ISCS语音播放1 2022-09-20 16:20:48 +08:00
fan
fda7794512 ISCS语音播放 2022-09-20 16:03:08 +08:00
fan
761a96997d 实训校验调整 2022-09-20 15:35:57 +08:00
fan
e970ca2792 生成音频资源 2022-09-20 10:43:40 +08:00
fan
d5e9c55fcd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-20 10:19:21 +08:00
fan
50745ec076 实训步骤id调整 2022-09-20 10:18:59 +08:00