Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,773 Commits
17 Branches
1 Tag
57 MiB
Commit Graph

1773 Commits (40e36a4e536ce9a12a80ba8c32f54d19212ce658)

Author SHA1 Message Date
Lawrence fb69312642 修正录像回放错误 2021-01-11 09:16:16 +08:00
Lawrence 42450af885 修改通道在线/离线描述，避免歧义 2021-01-11 09:14:22 +08:00
Lawrence a47a7ccb54 修正个别错误 2021-01-11 09:13:03 +08:00
Lawrence b0b924ee71 离线设备禁用通道查看，避免后续无效操作 2021-01-11 09:11:56 +08:00
Lawrence 80f6ecc617 修改本地jar包路径描述，避免marven编译Warning 2021-01-11 09:10:56 +08:00
Lawrence 68cad9a953 调整格式 2021-01-10 23:14:58 +08:00
Lawrence e8960c6f2f 取消报警响应后查询目录操作 2021-01-10 23:12:30 +08:00
Lawrence d5026897c1 修正回放错误，优化sdp排序，提高设备兼容性 2021-01-10 23:11:30 +08:00
Lawrence 37b1978da5 删除多余注释 2021-01-10 23:08:47 +08:00
Lawrence 625842fd0d Merge remote-tracking branch 'upstream/wvp-28181-2.0' into wvp-28181-2.0 2021-01-10 21:38:40 +08:00
panlinlin 658bec3ecc 国标级联--选择通道003-前端页面 2021-01-10 20:14:11 +08:00
Lawrence fc4cd01f67 修改本地jar库路径描述，避免marven编译Warning 2021-01-09 14:58:08 +08:00
panlinlin 7ed4a26be6 Merge remote-tracking branch 'origin/master' into wvp-28181-2.0 2021-01-09 12:16:16 +08:00
panlinlin 0dc017704a 去除无用的配置项 2021-01-09 12:12:50 +08:00
panlinlin 3131310642 完成向上级联->选择通道-002 2021-01-08 17:35:05 +08:00
panlinlin 7e581e9d3a Merge remote-tracking branch 'origin/master' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
 2021-01-08 17:31:49 +08:00
panlinlin 1342aad032 修复检测字段是否存在带来的停止按钮无法点击 
修改错别字
 2021-01-08 17:27:13 +08:00
panlinlin 675ce2346d Merge remote-tracking branch 'origin/master' into wvp-28181-2.0 2021-01-08 15:40:46 +08:00
panlinlin 224e904306 修复更新设备和通道信息时检测字段是否存在 2021-01-08 14:46:55 +08:00
panlinlin d3578a957d 添加对水星云台控制的支持 2021-01-08 13:33:19 +08:00
panlinlin 422ce8aebb 完成向上级联->选择通道-001 2021-01-08 11:04:29 +08:00
panlinlin 0020402685 完成向上级联->选择通道-001 2021-01-08 11:02:53 +08:00
panlinlin 397e0c4a27 Merge remote-tracking branch 'origin/master' into wvp-28181-2.0 2021-01-07 16:52:18 +08:00
panlinlin 568141b2bc 增加云台控制的速度控制 2021-01-07 16:44:42 +08:00
panlinlin 059a5a678a Merge remote-tracking branch 'origin/master' into wvp-28181-2.0 2021-01-07 15:31:16 +08:00
panlinlin 05960d3573 修复重启zlm导致的点播失败 2021-01-07 15:29:58 +08:00
panlinlin 9bf87971e7 完成向上级联->启动时自动注册 2021-01-07 14:56:10 +08:00
panlinlin 53ffefe091 完成向上级联->保存时注册或注销 2021-01-07 14:09:41 +08:00
panlinlin 54d7953179 完成向上级联->删除的时候注销 2021-01-07 13:15:39 +08:00
panlinlin 627a14f37e 完成向上级联->保活 2021-01-06 18:35:38 +08:00
panlinlin 9aa9b15b62 修改错误的注释 2021-01-06 10:01:28 +08:00
panlinlin 34135cce5d Merge remote-tracking branch 'origin/master' into wvp-28181-2.0 
# Conflicts:
#	README.md
#	src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHTTPProxyController.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
#	src/main/java/com/genersoft/iot/vmp/storager/jdbc/VideoManagerJdbcStoragerImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
#	src/main/resources/application-dev.yml
#	web_src/src/components/gb28181/devicePlayer.vue
 2021-01-05 15:56:19 +08:00
panlinlin 730a64be07 优化录像查询，优化注释 2021-01-05 14:35:43 +08:00
panlinlin 5ef229f02c 更新application.yml 2021-01-05 14:28:18 +08:00
panlinlin 70fca8ce5d 更新readme 2021-01-05 11:52:31 +08:00
panlinlin 381e3129a3 存储部分使用sqlite代替redis-4 2021-01-05 11:25:05 +08:00
panlinlin dcd78a1cfa 存储部分使用sqlite代替redis-3 2021-01-04 18:30:44 +08:00
panlinlin a25f7e4f99 存储部分使用sqlite代替redis-2 2020-12-31 13:22:22 +08:00
panlinlin 3d83775468 存储部分使用sqlite代替redis 2020-12-31 13:15:50 +08:00
panlinlin 00e61d9a80 增加对 需要扩展SDP的设备的单独设置 2020-12-28 11:45:40 +08:00
panlinlin 48896474e6 检查设备是否存在， 不存在则不回复心跳 2020-12-28 11:07:01 +08:00
panlinlin 6968839f21 修复空指针异常 2020-12-27 08:19:34 +08:00
panlinlin 418e441dfc 兼容水星IPC的录像查询 2020-12-26 20:08:04 +08:00
panlinlin f2279859b3 增加对水星IPC的兼容 
增加对SIP错误的订阅，刷新通道或点播或回放出现sip错误时及时返回给页面
优化UI，增加按钮loading
 2020-12-26 16:44:27 +08:00
panlinlin 17f4fe254a 增加对配置文件的校验 2020-12-25 18:11:03 +08:00
panlinlin 642d93c061 修复录像查询的VIA头 2020-12-25 15:27:25 +08:00
panlinlin d178c28317 修复空指针 2020-12-25 15:05:55 +08:00
648540858 ae32f978f6 添加maven源, 增加依赖下载速度 2020-12-22 15:04:19 +08:00
648540858 8d2ad02208 替换线程不安全的map 2020-12-22 09:48:51 +08:00
648540858 000bbad21e 恢复配置文件 2020-12-21 17:40:05 +08:00