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 |
|
Lawrence
|
fc3e633d62
|
增加页面字体调整选项，增加功能腾出空间
|
4 years ago |
|
Lawrence
|
67cc668500
|
增加页面字体大小设置，方便增加功能调整页面
|
4 years ago |
|
Lawrence
|
4b9549dfbf
|
添加浏览器ID，确保SSE可同时推送到不同的前端
|
4 years ago |
|
Lawrence
|
0456d6e357
|
支持字体大小调整，方便扩展功能
|
4 years ago |
|
648540858
|
ff7ecd270c
|
Merge pull request #43 from lawrencehj/master
添加报警响应、发布和SSE推送功能
|
4 years ago |
|
648540858
|
2c47c8c86b
|
Merge pull request #42 from lawrencehj/wvp-28181-2.0
增加报警事件处理功能等
|
4 years ago |
|
Lawrence
|
abbfef2aef
|
添加报警响应、发布和SSE推送功能
|
4 years ago |
|
Lawrence
|
8da6906e40
|
修改功能说明
|
4 years ago |
|
Lawrence
|
9789c55ef9
|
增加SSE前端推送支持
|
4 years ago |
|
Lawrence
|
5d031b3df2
|
增加报警信息推送请求和页面通知发布
|
4 years ago |
|
Lawrence
|
6811b8dc5c
|
增加设备报警事件响应、发布和信息处理
|
4 years ago |
|
Lawrence
|
e4215917fc
|
增加前端Notify支持
|
4 years ago |
|
Lawrence
|
3bbb39d7b6
|
修正级联通道选择编辑关联错误
|
4 years ago |
|
panlinlin
|
2b850ba781
|
修复国标校时的时区的错误导致时间差八个小时的一个错别字
|
4 years ago |
|
panlinlin
|
dfb3454f6e
|
修复国标校时的时区的错误导致时间差八个小时
|
4 years ago |
|
panlinlin
|
1b44ba3367
|
完成向上级联->点播--002
|
4 years ago |
|
panlinlin
|
e09e541c82
|
完成向上级联->点播--精简代码
|
4 years ago |
