Commit Graph

449 Commits (038d360dd4f2dd3c06f5d97dc66ed13fd78de212)

Author SHA1 Message Date
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 bd21d0e391 优化目录获取并法能力 2022-05-10 09:38:05 +08:00
648540858 c2aaae9325 初步实现语音喊话 2022-05-09 18:15:30 +08:00
648540858 9f0ef439cc Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial 2022-05-07 15:21:48 +08:00
648540858 36170df3f4 修复打包优化pom 2022-05-07 15:13:56 +08:00
648540858 ca16a79255 添加语音发送通道和语音接收通道字段 2022-05-07 09:52:02 +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
648540858 ee62f17170 统一userAgent 2022-05-06 15:55:32 +08:00
648540858 5d901b5e3f 使用阿里代码规范。规范代码写法 2022-05-06 10:12:34 +08:00
648540858 c286ecb455 使用阿里代码规范。规范代码写法 2022-05-05 17:07:16 +08:00
648540858 7f0ca85850 规范代码写法 2022-05-05 14:36:27 +08:00
648540858 ff3c30f32e 优化收到心跳设置设备上线的逻辑 2022-05-05 14:26:42 +08:00
648540858 d679a9fcf8 添加对点播时设备自定义ssrc的支持 2022-04-28 17:28:51 +08:00
648540858 a53fe7761f
Merge pull request #457 from J1031/bugfix/transaction_is_null
修复ServerTransaction空指针异常
2022-04-28 14:02:18 +08:00
648540858 420a87cfd7 优化对Parental字段的判断 2022-04-28 10:05:56 +08:00
648540858 4e0a463f88 优化对Parental字段的判断 2022-04-28 09:47:46 +08:00
quangz effe71640d 修复ServerTransaction空指针异常 2022-04-27 18:51:47 +08:00
648540858 102aad1f5d 判空 2022-04-26 18:46:18 +08:00
648540858 363606d845 优化级联目录发送 2022-04-26 18:29:47 +08:00
648540858 9ce22eba3c 行政区划作为级联数据的处理,修复设备树的显示 2022-04-26 17:24:41 +08:00
648540858 0b6b72ae44 多级虚拟组织处理修复 2022-04-25 17:13:22 +08:00
648540858 a012007f36 多级虚拟组织处理修复 2022-04-25 17:12:29 +08:00
648540858 26c3ca6a21 对于虚拟目录中出现多级虚拟组织的情况进行处理 2022-04-25 16:55:38 +08:00
648540858 5dc08a45f8 增加redis通知方式向设备/平台发送报警消息功能 2022-04-24 16:33:59 +08:00
648540858 1e2d207aea 添加优化后的地图页面,完全一处百度地图相关的api 2022-04-22 16:21:05 +08:00
648540858 d7bfd9bfa7 Merge remote-tracking branch 'origin/wvp-28181-2.0' into map 2022-04-21 10:30:46 +08:00
xiaoxie f635f9c300 修复录像列表:实测部分厂家(TP-Link IPC43AW)录像列表接口,返回的xml报文数据中有多余的空格,导致解析String为Integer失败,增加trim修复这个问题 2022-04-20 13:56:30 +08:00
648540858 088419b4d8 Merge remote-tracking branch 'origin/wvp-28181-2.0' into map 2022-04-20 09:38:09 +08:00