panlinlin
|
18cfba612b
|
1078-支持快照的展示
|
2024-06-08 22:58:23 +08:00 |
|
panlinlin
|
6074638f5b
|
1078-支持控制是否要音频
|
2024-06-08 22:47:25 +08:00 |
|
panlinlin
|
dbb2492640
|
1078-修复断开连接时设备未下线的BUG
|
2024-06-08 21:54:58 +08:00 |
|
panlinlin
|
7ffe773175
|
1078-调整数据库建表语句
|
2024-06-08 21:17:37 +08:00 |
|
648540858
|
942a41c630
|
1078-增加流地址标识
|
2024-06-08 00:56:05 +08:00 |
|
648540858
|
595d9be283
|
1078-优化点播以及通道表结构
|
2024-06-08 00:46:08 +08:00 |
|
648540858
|
6ae623d639
|
1078-临时提交
|
2024-06-07 14:35:07 +08:00 |
|
648540858
|
0103d5819b
|
1078-调整页面
|
2024-06-07 14:03:41 +08:00 |
|
648540858
|
972ef30f8d
|
1078-部标通道添加音频控制
|
2024-06-07 07:21:40 +08:00 |
|
648540858
|
913d358a11
|
1078-部标通道添加音频控制
|
2024-06-07 00:20:52 +08:00 |
|
648540858
|
5d5d654410
|
1078-添加部标通道页面
|
2024-06-07 00:10:36 +08:00 |
|
648540858
|
f7d811a299
|
1078-调整业务信息
|
2024-06-06 07:26:20 +08:00 |
|
648540858
|
5c826ef449
|
1078-添加通道信息
|
2024-06-06 00:23:16 +08:00 |
|
648540858
|
0de2bb54cd
|
1078-完成录像文件下载
|
2024-06-04 23:59:08 +08:00 |
|
648540858
|
83875a5905
|
1078-修复ftp-server对文件上传的通知
|
2024-06-04 07:15:05 +08:00 |
|
648540858
|
3728219177
|
1078-添加录像上传
|
2024-06-02 00:50:45 +08:00 |
|
648540858
|
e8d832d0a5
|
1078-添加ftpserver
|
2024-05-30 23:41:22 +08:00 |
|
648540858
|
89101b2731
|
1078-增加ftp-server
|
2024-05-30 18:36:24 +08:00 |
|
648540858
|
56fdbd34f4
|
1078-优化回放流地址格式
|
2024-05-30 11:34:18 +08:00 |
|
648540858
|
6efff9daf9
|
1078-优化回放
|
2024-05-30 10:29:14 +08:00 |
|
648540858
|
74c98c8636
|
1078-录像回放控制
|
2024-05-29 23:53:20 +08:00 |
|
648540858
|
15a551d983
|
1078-标记待实现 9105
|
2024-05-29 18:40:31 +08:00 |
|
648540858
|
2b1645729b
|
1078-切换码流类型
|
2024-05-29 18:36:19 +08:00 |
|
648540858
|
84ef932964
|
1078-修复双向对讲
|
2024-05-29 18:27:10 +08:00 |
|
648540858
|
2aef6ab6f1
|
1078-支持语音广播
|
2024-05-29 17:34:38 +08:00 |
|
648540858
|
de6a3ceb76
|
1078-双向对讲完成
|
2024-05-29 17:26:28 +08:00 |
|
648540858
|
87ecf68332
|
1078-双向对讲
|
2024-05-29 16:55:07 +08:00 |
|
648540858
|
01fbf102c2
|
Merge branch 'refs/heads/master' into 1078
|
2024-05-29 15:03:20 +08:00 |
|
648540858
|
764d04b497
|
调整上级观看消息的发送
|
2024-05-29 15:02:51 +08:00 |
|
648540858
|
a945078788
|
1078-语音对讲
|
2024-05-29 00:02:31 +08:00 |
|
648540858
|
9ece77d54a
|
1078-点播添加类型
|
2024-05-28 18:58:16 +08:00 |
|
648540858
|
37b79633f0
|
Merge branch 'refs/heads/master' into 1078
|
2024-05-28 18:40:44 +08:00 |
|
648540858
|
bec35ebf94
|
调整录像进度获取流程
|
2024-05-28 16:06:08 +08:00 |
|
648540858
|
5a70a4742d
|
修正数据库sql文件
|
2024-05-28 10:39:26 +08:00 |
|
648540858
|
c69b64c756
|
修复CSEQ重置错误 #1449
|
2024-05-28 10:23:17 +08:00 |
|
648540858
|
de390d3982
|
Merge branch 'refs/heads/2.7.1'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
|
2024-05-28 10:16:46 +08:00 |
|
648540858
|
adfce4464d
|
1078-终端上传乘客流量
|
2024-05-27 23:55:44 +08:00 |
|
648540858
|
c8ddee905f
|
1078-补充终端音视频参数设置 + 查询终端音视频属性
|
2024-05-27 23:29:59 +08:00 |
|
648540858
|
1efabbe4cc
|
支持把推流的额外参数加入redis缓存
|
2024-05-24 10:50:29 +08:00 |
|
648540858
|
3a056acbc1
|
合并271分支
|
2024-05-24 10:18:29 +08:00 |
|
648540858
|
de6baa157e
|
合并271分支
|
2024-05-24 08:51:09 +08:00 |
|
648540858
|
8bdc406903
|
Merge branch 'refs/heads/2.7.1'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
|
2024-05-24 08:50:14 +08:00 |
|
648540858
|
8be6979911
|
1078-图像分析报警参数设置
|
2024-05-24 00:15:52 +08:00 |
|
648540858
|
aeeb61d141
|
合并271分支
|
2024-05-23 17:47:43 +08:00 |
|
648540858
|
475b8a49a3
|
优化录像文件信息入库
|
2024-05-23 17:44:30 +08:00 |
|
648540858
|
2c89fae49a
|
Merge branch 'refs/heads/2.7.1'
# Conflicts:
# pom.xml
# src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForMobilePositionProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java
# src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java
# src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
|
2024-05-23 17:32:15 +08:00 |
|
648540858
|
fe9b8154e0
|
去除调试日志
|
2024-05-23 17:15:14 +08:00 |
|
648540858
|
2daa59d78c
|
支持彻底关闭文档页面 + 修复云端录像偶现callId错误问题
|
2024-05-23 17:10:45 +08:00 |
|
648540858
|
1e9cdfe87f
|
1078-单独视频通道参数设置+特殊报警录像参数设置+视频相关报警屏蔽字
|
2024-05-22 21:24:47 +08:00 |
|
648540858
|
9817bf3fb7
|
1078-音视频参数设置+音视频通道列表设置
|
2024-05-21 23:58:23 +08:00 |
|