648540858
|
26739237e2
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
# Conflicts:
# sql/update.sql
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# web_src/src/components/dialog/deviceEdit.vue
# web_src/src/components/dialog/devicePlayer.vue
|
2022-06-27 10:16:21 +08:00 |
|
mk1990
|
23bd11869b
|
添加国标级联录像控制功能
|
2022-06-22 16:47:26 +08:00 |
|
mk1990
|
c239ee277c
|
添加国标级联录像控制功能
|
2022-06-22 16:39:07 +08:00 |
|
mk1990
|
5e5437b630
|
添加国标级联录像控制功能
|
2022-06-22 16:31:58 +08:00 |
|
mk1990
|
4b4afa4ef7
|
添加国标级联录像控制功能
|
2022-06-22 16:26:41 +08:00 |
|
mk1990
|
519a08e530
|
添加国标级联录像控制功能
|
2022-06-22 14:39:57 +08:00 |
|
mk1990
|
4d2c36edcd
|
fix设备状态查询接口
|
2022-06-22 13:09:09 +08:00 |
|
648540858
|
f7006e4881
|
修复播放中zlm离线导致的bye发送失败
|
2022-06-15 14:55:33 +08:00 |
|
648540858
|
c022213972
|
设备支持设置地理坐标系，并将级联输出坐标系统一为wgs84
|
2022-06-14 17:00:24 +08:00 |
|
648540858
|
e0344ccf97
|
国标级联推送推流 支持多wvp间自动选择与推送
|
2022-06-14 14:37:34 +08:00 |
|
648540858
|
d3e815bf16
|
修复订阅超时
|
2022-06-04 10:18:04 +08:00 |
|
648540858
|
5df95ba850
|
级联回放增加MediaStatus消息 #377
|
2022-06-04 00:02:39 +08:00 |
|
648540858
|
19a52a20f3
|
固定时区为Asia/Shanghai
|
2022-06-03 18:52:40 +08:00 |
|
648540858
|
47abdde339
|
解决设备上线停止线程导致的报错，优化录像的获取以及通道的更新
|
2022-06-03 16:24:11 +08:00 |
|
648540858
|
9a0ea9e322
|
修复级联点播时海康使用自定义ssrc的情况
|
2022-06-01 11:35:53 +08:00 |
|
648540858
|
8555d64f95
|
修复点播超时的事件设置
|
2022-05-31 16:20:46 +08:00 |
|
648540858
|
0e2908c1be
|
#488
|
2022-05-27 23:14:17 +08:00 |
|
648540858
|
2a5404c68f
|
兼容海康信令问题 #493
|
2022-05-26 13:45:57 +08:00 |
|
648540858
|
a4a0394f6b
|
Merge pull request #487 from hotcoffie/wvp-28181-2.0
fix：之前引入了错误的DigestServerAuthenticationHelper
|
2022-05-23 10:39:05 +08:00 |
|
xiaoxie
|
6cee5a0751
|
fix：之前引入了错误的DigestServerAuthenticationHelper
|
2022-05-23 10:37:38 +08:00 |
|
648540858
|
cb845726f6
|
优化代码
|
2022-05-23 10:16:46 +08:00 |
|
xiaoxie
|
d739bfa597
|
处理冲突
|
2022-05-23 09:44:21 +08:00 |
|
xiaoxie
|
07fa589e06
|
处理冲突
|
2022-05-23 09:42:32 +08:00 |
|
648540858
|
590358c313
|
修复国标级联录像查询 #485
|
2022-05-21 21:13:12 +08:00 |
|
648540858
|
9c555b56b7
|
优化语音广播的TCP主动模式
|
2022-05-18 18:14:46 +08:00 |
|
648540858
|
6fa9dae824
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
|
2022-05-18 18:13:59 +08:00 |
|
648540858
|
973e75f808
|
优化收到心跳的信息更新判断
|
2022-05-18 16:08:52 +08:00 |
|
648540858
|
549bdfdd6a
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
|
2022-05-18 11:20:13 +08:00 |
|
钢翼
|
debfb2222f
|
无认证密码时，不校验是否存在授权头
|
2022-05-17 08:18:38 +08:00 |
|
648540858
|
39efda779f
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
|
2022-05-16 11:47:17 +08:00 |
|
648540858
|
9a80e10f6e
|
使用 java.time.Instant代替 java.util.Date
|
2022-05-13 22:15:31 +08:00 |
|
648540858
|
95642d0bb8
|
优化录像结束发送BYE判断
|
2022-05-13 21:10:02 +08:00 |
|
648540858
|
98e6cf5bae
|
优化海康录像下载
|
2022-05-13 21:05:33 +08:00 |
|
648540858
|
1757203202
|
支持海康摄像头国标录像查看播放
|
2022-05-13 15:32:30 +08:00 |
|
648540858
|
0781d9bc28
|
修复缺失的设备时间
|
2022-05-12 17:48:52 +08:00 |
|
648540858
|
9fa739ac02
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
|
2022-05-12 10:54:46 +08:00 |
|
648540858
|
a030d00c88
|
修复代码
|
2022-05-12 10:48:50 +08:00 |
|
648540858
|
f6893cf95b
|
优化设备在线状态
|
2022-05-11 18:37:24 +08:00 |
|
648540858
|
a9bdb0a706
|
优化语音广播流程
|
2022-05-10 17:45:07 +08:00 |
|
648540858
|
f8f65d473b
|
优化语音广播流程
|
2022-05-10 13:08:32 +08:00 |
|
648540858
|
c395cf42d1
|
修复发流接口的调用
|
2022-05-10 11:01:33 +08:00 |
|
648540858
|
16cb8cd195
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
|
2022-05-10 11:00:51 +08:00 |
|
648540858
|
a1321c29c5
|
优化级联点播流程
|
2022-05-10 10:58:26 +08:00 |
|
648540858
|
4a0f5cf76d
|
去除调试内容
|
2022-05-10 10:11:46 +08:00 |
|
648540858
|
6e48dd3f32
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
|
2022-05-10 09:46:47 +08:00 |
|
648540858
|
93e6347f18
|
优化推流调用
|
2022-05-10 09:45:09 +08:00 |
|
648540858
|
c2aaae9325
|
初步实现语音喊话
|
2022-05-09 18:15:30 +08:00 |
|
648540858
|
36170df3f4
|
修复打包优化pom
|
2022-05-07 15:13:56 +08:00 |
|
648540858
|
523139143f
|
Merge pull request #468 from TristingChen/resetQuery--add
开发----增加预置位查询接口开发
|
2022-05-07 09:00:22 +08:00 |
|
chenjialing
|
cc63a52884
|
开发----增加预置位查询接口开发
|
2022-05-06 17:44:56 +08:00 |
|