panlinlin
|
f244525f17
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2021-04-06 15:13:40 +08:00 |
|
panlinlin
|
3168b90520
|
页面销毁时关闭sseSource
|
2021-04-06 15:13:23 +08:00 |
|
panlinlin
|
690179bfc5
|
移除推流的国标关联移除未推流的数据
|
2021-04-03 21:19:08 +08:00 |
|
panlinlin
|
157216a4da
|
增加推流转发到国标，尚不完善
|
2021-04-02 19:14:12 +08:00 |
|
panlinlin
|
850a5b2c6b
|
增加推流转发到国标，尚不完善
|
2021-04-02 19:04:01 +08:00 |
|
panlinlin
|
8b2b7dc451
|
更新readme
|
2021-04-01 18:07:16 +08:00 |
|
panlinlin
|
a3692072a1
|
添加拉流代理与国标关联, 支持代理rtsp/rtmp/...，转发到国标
|
2021-04-01 18:06:21 +08:00 |
|
panlinlin
|
22f58d318f
|
添加推流列表和拉流代理，下一步与国标关联
|
2021-03-30 18:46:34 +08:00 |
|
648540858
|
7a0c45f691
|
Merge pull request #74 from lawrencehj/wvp-28181-2.0
实现语音广播信令等（web语音推流开发中）
|
2021-03-27 13:56:56 +08:00 |
|
lawrencehj
|
9579fa905f
|
实现语音广播信令（web语音推流开发中）
|
2021-03-26 20:15:12 +08:00 |
|
lawrencehj
|
fb3187b614
|
启动时清除先前注册上级平台的缓存
|
2021-03-26 19:58:46 +08:00 |
|
lawrencehj
|
97eea135da
|
修正更名deviceList.vue后跳转错误
|
2021-03-26 19:54:29 +08:00 |
|
panlinlin
|
a2eb45de09
|
添加获取直播流的api
|
2021-03-26 18:32:36 +08:00 |
|
panlinlin
|
7be7d8f794
|
重命名设备管理组件
|
2021-03-25 17:48:20 +08:00 |
|
panlinlin
|
53053eb794
|
解决循环依赖导致的打包失败
|
2021-03-25 16:45:29 +08:00 |
|
648540858
|
3a1002970a
|
Merge pull request #67 from lawrencehj/wvp-28181-2.0
增加上级平台信令功能实现，解决上级点播的一些问题
|
2021-03-24 15:39:47 +08:00 |
|
lawrencehj
|
b88061544b
|
增加上级平台云台控制功能
|
2021-03-16 11:47:45 +08:00 |
|
lawrencehj
|
87de1658ce
|
完成响应上级远程启动信令执行
|
2021-03-15 15:24:41 +08:00 |
|
lawrencehj
|
b9d1a5ce28
|
完善向上级注册/注销过程
|
2021-03-15 15:22:04 +08:00 |
|
lawrencehj
|
3a432a5c10
|
修正loggor提示信息
|
2021-03-15 15:17:55 +08:00 |
|
lawrencehj
|
46016ad435
|
Merge remote-tracking branch 'upstream/wvp-28181-2.0' into wvp-28181-2.0
|
2021-03-14 21:33:00 +08:00 |
|
lawrencehj
|
587aaf8ecf
|
增加上级远程启动TeleBoot功能的支持
|
2021-03-14 21:25:52 +08:00 |
|
lawrencehj
|
2e403fc527
|
修正本地平台播放时上级无法点播同一流视频的问题
|
2021-03-14 21:23:47 +08:00 |
|
lawrencehj
|
b492e78afd
|
优化代码
|
2021-03-14 21:21:51 +08:00 |
|
lawrencehj
|
dc6b76b4db
|
增加上级点播停止后通知设备停止推流功能，并自动与本地播放协同
|
2021-03-14 21:20:47 +08:00 |
|
lawrencehj
|
bf22ca6dbb
|
增加上级平台查询DeviceInfo和DeviceStatus的响应功能
|
2021-03-14 21:13:28 +08:00 |
|
lawrencehj
|
8c5b2ec955
|
增加上级平台查询DeviceInfo和DeviceStatus的响应功能
|
2021-03-14 21:03:53 +08:00 |
|
lawrencehj
|
06a510e7f3
|
修复ssrc释放失败问题、修正branch字段以符合国标
|
2021-03-14 20:54:51 +08:00 |
|
648540858
|
60b20659c6
|
Merge pull request #64 from lawrencehj/wvp-28181-2.0
修正一处可能导致死循环的代码
|
2021-03-10 20:43:29 +08:00 |
|
lawrencehj
|
12eb57f146
|
增加接收Bye请求后停止向上级推流功能
|
2021-03-10 14:39:40 +08:00 |
|
lawrencehj
|
2839c5df3f
|
修正某些branch不符合GB之处
|
2021-03-10 14:38:31 +08:00 |
|
lawrencehj
|
6d20f7dd9a
|
修正平台Keepalive错误
|
2021-03-10 14:37:17 +08:00 |
|
lawrencehj
|
8063172e09
|
修正一处可能导致死循环的代码
|
2021-03-10 12:21:05 +08:00 |
|
648540858
|
1100255ec9
|
Merge pull request #63 from lawrencehj/wvp-28181-2.0
实现级联点播的RTP推送
|
2021-03-10 09:35:20 +08:00 |
|
lawrencehj
|
66b7d6e1ae
|
实现级联点播RTP推送
|
2021-03-09 20:05:37 +08:00 |
|
lawrencehj
|
f83bb3639a
|
去除冗余代码和死代码
|
2021-03-09 20:02:56 +08:00 |
|
panlinlin
|
67a62aae4e
|
对级联点播信令进行处理
|
2021-03-02 18:23:06 +08:00 |
|
panlinlin
|
84411c2800
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2021-03-01 18:13:26 +08:00 |
|
panlinlin
|
4e3e66247c
|
使用jainsip的方式解析sdp
|
2021-03-01 18:12:56 +08:00 |
|
648540858
|
047b3f2da7
|
Merge pull request #58 from lawrencehj/wvp-28181-2.0
同步主线Alarm处理功能
|
2021-03-01 09:26:32 +08:00 |
|
lawrencehj
|
b870842be8
|
同步主线Alarm处理功能
|
2021-02-27 19:25:28 +08:00 |
|
panlinlin
|
ffda27c0a4
|
同步主线
|
2021-02-26 11:10:22 +08:00 |
|
panlinlin
|
48c0893de3
|
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
|
2021-02-25 18:10:02 +08:00 |
|
648540858
|
c0f967eb96
|
Merge pull request #52 from lawrencehj/master
将录像文件统计改为独立线程进行，实现超时返回已接收结果，优化代码消除编译报警项
|
2021-02-06 10:54:10 +08:00 |
|
lawrencehj
|
347cac1859
|
去除冗余代码，修正编译报警项
|
2021-02-05 15:15:39 +08:00 |
|
lawrencehj
|
bd75cd30a5
|
将录像文件统计改为独立线程进行，实现超时返回已接收结果
|
2021-02-05 15:00:47 +08:00 |
|
648540858
|
6070af1fae
|
Merge pull request #47 from lawrencehj/master
增加订阅与通知方法，增加移动位置支持等
|
2021-02-04 10:35:02 +08:00 |
|
lawrencehj
|
1457621ebb
|
增加多种信令的API调用接口
|
2021-02-03 11:08:10 +08:00 |
|
lawrencehj
|
85cf36386e
|
增强数据格式校验和转换功能
|
2021-02-03 11:05:27 +08:00 |
|
lawrencehj
|
15c1342cf2
|
增加多种信令的支持
|
2021-02-03 11:00:24 +08:00 |
|