lawrencehj
|
03ec48e32c
|
Merge remote-tracking branch 'upstream/wvp-28181-2.0' into wvp-28181-2.0
|
4 years ago |
|
lawrencehj
|
712b25fb6e
|
增加上级远程启动TeleBoot功能的支持
|
4 years ago |
|
lawrencehj
|
968ec879f5
|
修正本地平台播放时上级无法点播同一流视频的问题
|
4 years ago |
|
lawrencehj
|
8a00a036c4
|
优化代码
|
4 years ago |
|
lawrencehj
|
a71063dd1f
|
增加上级点播停止后通知设备停止推流功能，并自动与本地播放协同
|
4 years ago |
|
lawrencehj
|
32fbfd8d1e
|
增加上级平台查询DeviceInfo和DeviceStatus的响应功能
|
4 years ago |
|
lawrencehj
|
a2bea34ac1
|
增加上级平台查询DeviceInfo和DeviceStatus的响应功能
|
4 years ago |
|
lawrencehj
|
616e1be0b4
|
修复ssrc释放失败问题、修正branch字段以符合国标
|
4 years ago |
|
648540858
|
b05ddb2003
|
Merge pull request #64 from lawrencehj/wvp-28181-2.0
修正一处可能导致死循环的代码
|
4 years ago |
|
lawrencehj
|
2c1dbe63de
|
增加接收Bye请求后停止向上级推流功能
|
4 years ago |
|
lawrencehj
|
343882e4c4
|
修正某些branch不符合GB之处
|
4 years ago |
|
lawrencehj
|
b01ec1d727
|
修正平台Keepalive错误
|
4 years ago |
|
lawrencehj
|
f840c85666
|
修正一处可能导致死循环的代码
|
4 years ago |
|
648540858
|
cbd2bc8e99
|
Merge pull request #63 from lawrencehj/wvp-28181-2.0
实现级联点播的RTP推送
|
4 years ago |
|
lawrencehj
|
df34954c9e
|
实现级联点播RTP推送
|
4 years ago |
|
lawrencehj
|
b7857027d5
|
去除冗余代码和死代码
|
4 years ago |
|
panlinlin
|
2f165d595a
|
对级联点播信令进行处理
|
4 years ago |
|
panlinlin
|
418970eab2
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
4 years ago |
|
panlinlin
|
421c2f5602
|
使用jainsip的方式解析sdp
|
4 years ago |
|
648540858
|
e361f14a96
|
Merge pull request #58 from lawrencehj/wvp-28181-2.0
同步主线Alarm处理功能
|
4 years ago |
|
lawrencehj
|
a078ace99c
|
同步主线Alarm处理功能
|
4 years ago |
|
panlinlin
|
d0f5d684a9
|
同步主线
|
4 years ago |
|
panlinlin
|
0f58218bad
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
# Conflicts:
# README.md
# src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java
# src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEvent.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.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/impl/VideoManagerStoragerImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/SseController/SseController.java
# src/main/java/com/genersoft/iot/vmp/vmanager/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/PlayServiceImpl.java
# src/main/resources/wvp.sqlite
# web_src/.postcssrc.js
# web_src/src/components/UiHeader.vue
# web_src/src/main.js
# web_src/src/router/index.js
|
4 years ago |
|
648540858
|
e864becace
|
Merge pull request #52 from lawrencehj/master
将录像文件统计改为独立线程进行，实现超时返回已接收结果，优化代码消除编译报警项
|
4 years ago |
|
lawrencehj
|
a8603075d4
|
去除冗余代码，修正编译报警项
|
4 years ago |
|
lawrencehj
|
6868577e32
|
将录像文件统计改为独立线程进行，实现超时返回已接收结果
|
4 years ago |
|
648540858
|
d3fa1dd226
|
Merge pull request #47 from lawrencehj/master
增加订阅与通知方法，增加移动位置支持等
|
4 years ago |
|
lawrencehj
|
65b4c5cec9
|
增加多种信令的API调用接口
|
4 years ago |
|
lawrencehj
|
c1d4e1944d
|
增强数据格式校验和转换功能
|
4 years ago |
|
lawrencehj
|
18c3b59318
|
增加多种信令的支持
|
4 years ago |
|
lawrencehj
|
693aac283a
|
调整界面布局
|
4 years ago |
|
Lawrence
|
a522d09734
|
修复各页面按下回车键都会退回Contral页面的问题
|
4 years ago |
|
Lawrence
|
c807572bdf
|
修改说明
|
4 years ago |
|
Lawrence
|
70564219ae
|
增加SSE跨域支持
|
4 years ago |
|
Lawrence
|
636b7c5475
|
增加移动位置API接口支持
|
4 years ago |
|
Lawrence
|
bf76240724
|
增加对Subscribe（订阅）方法的支持
|
4 years ago |
|
Lawrence
|
667266f387
|
增加移动位置查询和订阅功能，优化信令Tag的生成
|
4 years ago |
|
Lawrence
|
5d541e4ae6
|
增加对Notify方法的支持
|
4 years ago |
|
Lawrence
|
dd3b8c25e5
|
支持移动位置和GPS报警信息处理
|
4 years ago |
|
Lawrence
|
c223d4e4ec
|
增加数据格式检验，避免设备返回错误格式造成抛错误
|
4 years ago |
|
Lawrence
|
84ecc89f8a
|
增加移动位置处理支持
|
4 years ago |
|
Lawrence
|
b915e7bc37
|
增加配置选项
|
4 years ago |
|
Lawrence
|
cda49944f7
|
支持移动位置存储
|
4 years ago |
|
Lawrence
|
9571eb3a15
|
增加移动位置显示功能
|
4 years ago |
|
panlinlin
|
c1b3f2beb4
|
国标级联--点播-未完成
|
4 years ago |
|
Lawrence
|
b0088b8bd3
|
修正不支持的method处理错误
|
4 years ago |
|
648540858
|
9d19f6b9d6
|
Merge pull request #46 from lawrencehj/wvp-28181-2.0
修正SSE不能分别发送到同时浏览的前端的问题等
|
4 years ago |
|
648540858
|
4c042e249b
|
Merge pull request #45 from lawrencehj/master
修正SSE不能分别发送到同时浏览的前端的问题等
|
4 years ago |
|
Lawrence
|
f3975fdefc
|
调整格式
|
4 years ago |
|
Lawrence
|
e4918d29f3
|
添加浏览器ID，确保SSE可同时推送到不同的前端
|
4 years ago |
