panlinlin
|
89244932c6
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
4 years ago |
|
panlinlin
|
a4ab9a0a6c
|
集成rtc播放器
|
4 years ago |
|
panlinlin
|
f10a9238dc
|
规范化api， 进行中。。。
|
4 years ago |
|
panlinlin
|
2310087e03
|
规范化api， 进行中。。。
|
4 years ago |
|
panlinlin
|
c7b2004e43
|
更新readme
|
4 years ago |
|
panlinlin
|
5ba39861d7
|
修复添加级联平台是三个布尔字段无效的bug
|
4 years ago |
|
panlinlin
|
87acd73efc
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
4 years ago |
|
panlinlin
|
deef511362
|
页面销毁时关闭sseSource
|
4 years ago |
|
panlinlin
|
2b1e56973e
|
移除推流的国标关联移除未推流的数据
|
4 years ago |
|
panlinlin
|
20dca0f6b6
|
增加推流转发到国标，尚不完善
|
4 years ago |
|
panlinlin
|
b17280522b
|
增加推流转发到国标，尚不完善
|
4 years ago |
|
panlinlin
|
f83a192bfd
|
更新readme
|
4 years ago |
|
panlinlin
|
7dc8fd4a1e
|
添加拉流代理与国标关联, 支持代理rtsp/rtmp/...，转发到国标
|
4 years ago |
|
panlinlin
|
56859d09df
|
添加推流列表和拉流代理，下一步与国标关联
|
4 years ago |
|
648540858
|
f8fe76add2
|
Merge pull request #74 from lawrencehj/wvp-28181-2.0
实现语音广播信令等（web语音推流开发中）
|
4 years ago |
|
lawrencehj
|
f9d30bdfad
|
实现语音广播信令（web语音推流开发中）
|
4 years ago |
|
lawrencehj
|
c5a05c15df
|
启动时清除先前注册上级平台的缓存
|
4 years ago |
|
lawrencehj
|
88dd1aca45
|
修正更名deviceList.vue后跳转错误
|
4 years ago |
|
panlinlin
|
edb033ccd7
|
添加获取直播流的api
|
4 years ago |
|
panlinlin
|
9a4b0de1af
|
重命名设备管理组件
|
4 years ago |
|
panlinlin
|
b37a77f23f
|
解决循环依赖导致的打包失败
|
4 years ago |
|
648540858
|
bb22908cf7
|
Merge pull request #67 from lawrencehj/wvp-28181-2.0
增加上级平台信令功能实现，解决上级点播的一些问题
|
4 years ago |
|
lawrencehj
|
2a273acd09
|
增加上级平台云台控制功能
|
4 years ago |
|
lawrencehj
|
3609d36111
|
完成响应上级远程启动信令执行
|
4 years ago |
|
lawrencehj
|
95889f358c
|
完善向上级注册/注销过程
|
4 years ago |
|
lawrencehj
|
fa98c6b8c2
|
修正loggor提示信息
|
4 years ago |
|
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 |
