Commit Graph

3584 Commits

Author SHA1 Message Date
648540858
8ba30e83ef 1078-修复错别字 2024-04-07 07:19:02 +08:00
648540858
98d9eb5314 1078-添加云台红外补光控制 2024-04-07 07:17:35 +08:00
648540858
a8a4aecc15 1078-添加云台雨刷控制 2024-04-07 07:15:43 +08:00
648540858
b649464753 1078-添加云台光圈控制 2024-04-07 07:12:51 +08:00
648540858
ebdd9ab534 1078-添加云台焦距控制 2024-04-07 07:09:49 +08:00
648540858
a1ab834875 1078-添加云台旋转 2024-04-07 07:07:27 +08:00
648540858
4ec4d618d6 1078-添加文件上传控制 2024-04-07 07:02:06 +08:00
648540858
5fc1000fcc 1078-添加文件上传完成通知 2024-04-07 06:56:39 +08:00
648540858
302eb98d51 1078-添加文件上传指令 2024-04-07 06:44:52 +08:00
648540858
984d8743be 1078-优化录像回放开始和停止 2024-04-06 00:42:54 +08:00
648540858
26bbeac6c7 1078-添加录像回放开始和停止 2024-04-06 00:06:40 +08:00
648540858
81c2b5715c 1078-添加录像回放列表查询 2024-04-04 16:54:08 +08:00
648540858
3e5da98539 1078-支持点播暂停/继续 2024-04-04 07:19:46 +08:00
648540858
a7b7371e74 1078-增加结束点播 2024-04-03 18:00:48 +08:00
648540858
0f420c43ac 1078-优化点播 2024-04-03 16:59:33 +08:00
648540858
abc3766556 1078-优化点播 2024-04-03 16:33:49 +08:00
648540858
62f716be9c 添加idea logo 2024-04-03 15:04:33 +08:00
648540858
5743917439 添加idea logo 2024-04-03 15:03:49 +08:00
648540858
603ce18573 1078-添加点播支持 2024-04-02 23:26:40 +08:00
648540858
6acc395ad2 Merge branch 'master' into 1078 2024-04-02 18:33:53 +08:00
648540858
a1c02605c1 abl-实现closeRtpServer 2024-04-02 14:41:02 +08:00
648540858
86a35f3612 合并开源主线 2024-04-02 11:25:19 +08:00
648540858
1bb813758a Merge branch 'master' into dev/abl支持
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
2024-04-02 11:20:51 +08:00
648540858
67688d4a4b 优化停止国标收流 2024-04-02 11:20:19 +08:00
648540858
969ff86ebe 放行abl hook 接口 2024-04-02 09:53:47 +08:00
648540858
8b90fade9e 支持使用abl接收国标流 2024-04-02 00:05:09 +08:00
648540858
b78769f997 临时提交 2024-04-01 18:35:26 +08:00
648540858
33b75be71a 支持abl hook 2024-04-01 18:21:38 +08:00
648540858
b7b950ec8b 支持展示abl-logo 2024-04-01 16:47:45 +08:00
648540858
4d6f881460 修复空指针异常 2024-04-01 16:20:30 +08:00
648540858
722f1d0ee7 国标级联-修复拉流代理播放 2024-04-01 16:17:01 +08:00
648540858
426ea72d7f 修复拉流代理播放 2024-04-01 15:46:36 +08:00
648540858
73733ab13f 修复推流播放 2024-04-01 15:40:21 +08:00
648540858
fd2ef6effe 修复国标点播 2024-04-01 15:29:49 +08:00
648540858
ecd1d2a414 临时提交 2024-04-01 15:22:45 +08:00
leesam
23beb4fde0 Merge branch 'master' into develop-add-api-key 2024-04-01 09:19:46 +08:00
648540858
2738750c3e 移除失效的服务 2024-04-01 09:11:56 +08:00
648540858
5973dcd975 修复点播与录像回放 2024-03-31 00:34:44 +08:00
648540858
4548695a0b hook优化 2024-03-31 00:28:45 +08:00
648540858
0447b83c3a 临时提交 2024-03-29 23:41:00 +08:00
648540858
0324855190 Merge branch 'master' into dev/abl支持 2024-03-29 22:55:09 +08:00
648540858
bb6ecb1552 Merge remote-tracking branch 'origin/master' 2024-03-29 19:18:50 +08:00
648540858
486daf4dfe 调整看守位控制接口 2024-03-29 19:18:34 +08:00
pei
728e60ce84 处理可能会出现的空指针异常 2024-03-29 11:55:44 +08:00
648540858
d34371a9f9 优化通道列表按钮排列 2024-03-28 23:06:27 +08:00
648540858
7a3b9c6f69 调整hook订阅通知的位置 2024-03-28 19:10:53 +08:00
648540858
cc793d16f5 调整hook订阅通知的位置 2024-03-28 18:35:28 +08:00
648540858
d6df7c8355 Merge branch 'master' into dev/abl支持 2024-03-28 18:13:36 +08:00
648540858
cf3d98102a Merge branch 'master' into 2.7.0 2024-03-28 18:08:57 +08:00
648540858
1de344674a 使用冒号分隔redis的key 2024-03-28 18:08:33 +08:00