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 |
|
lawrencehj
|
e15842c53c
|
调整界面布局
|
2021-02-03 10:54:41 +08:00 |
|
Lawrence
|
40020cc5a9
|
修复各页面按下回车键都会退回Contral页面的问题
|
2021-01-28 14:26:48 +08:00 |
|
Lawrence
|
5e7c3ed971
|
增加移动位置显示功能
|
2021-01-27 15:24:28 +08:00 |
|
Lawrence
|
5c45808348
|
修正不支持的method处理错误
|
2021-01-22 15:36:23 +08:00 |
|
Lawrence
|
cf438d9963
|
添加浏览器ID，确保SSE可同时推送到不同的前端
|
2021-01-21 20:58:11 +08:00 |
|
Lawrence
|
74460e7c95
|
添加浏览器ID，确保SSE可同时推送到不同的前端
|
2021-01-21 19:57:57 +08:00 |
|
Lawrence
|
a6ed1268e3
|
添加报警响应、发布和SSE推送功能
|
2021-01-20 23:31:00 +08:00 |
|
Lawrence
|
1488b50c1d
|
增加报警信息推送请求和页面通知发布
|
2021-01-20 20:41:24 +08:00 |
|
Lawrence
|
02108af2f4
|
修正级联通道选择编辑关联错误
|
2021-01-20 20:25:44 +08:00 |
|
Lawrence
|
fa5f0082df
|
修正修改过上级平台信息后再次创建上级平台按钮不会变为'立即创建'的问题
|
2021-01-14 23:46:09 +08:00 |
|
Lawrence
|
2147e5e094
|
修正初次打开通道选择列表每页数量不对的问题
|
2021-01-14 23:41:54 +08:00 |
|
panlinlin
|
d0afd9b914
|
完成向上级联->通道推送
修复选择通道是查询的bug
|
2021-01-14 14:49:38 +08:00 |
|
panlinlin
|
9fdc010af7
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-13 18:11:45 +08:00 |
|
panlinlin
|
47047b91ab
|
回滚修复登陆的bug时不必修改的代码
|
2021-01-13 18:10:26 +08:00 |
|
panlinlin
|
7c13ec0c42
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-13 17:56:01 +08:00 |
|
panlinlin
|
38799fca56
|
修复登陆的bug
|
2021-01-13 17:49:19 +08:00 |
|
panlinlin
|
de56ff7c72
|
完成向上级联->选择通道-编辑页面密码不隐藏
|
2021-01-13 17:27:04 +08:00 |
|
panlinlin
|
f92b5ce097
|
完成向上级联->选择通道-003
|
2021-01-13 17:08:26 +08:00 |
|
panlinlin
|
7688a68fc2
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-12 10:48:01 +08:00 |
|
panlinlin
|
28de358c67
|
关闭播放窗口停止回放
回滚回放代码
|
2021-01-12 10:46:41 +08:00 |
|
panlinlin
|
a590f694f6
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2021-01-12 09:36:55 +08:00 |
|
Lawrence
|
39912aa9a2
|
修正页码计算错误
|
2021-01-11 21:03:23 +08:00 |
|
Lawrence
|
a532bd2aa9
|
平台向上级联，重新启用时自动重设Expires值
|
2021-01-11 20:54:29 +08:00 |
|
Lawrence
|
0a9d5a9bf5
|
格式调整
|
2021-01-11 20:44:24 +08:00 |
|
panlinlin
|
2746d8e447
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-11 17:51:44 +08:00 |
|
panlinlin
|
f84b6125c8
|
通过前端文件修复分页错误
|
2021-01-11 17:50:29 +08:00 |
|
panlinlin
|
1c8b072268
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-11 17:46:16 +08:00 |
|
Lawrence
|
50c0cec22c
|
离线设备禁用通道查看，避免后续无效操作
|
2021-01-11 09:35:07 +08:00 |
|
Lawrence
|
32ea365979
|
修改通道在线/离线描述，避免歧义
|
2021-01-11 09:27:04 +08:00 |
|
Lawrence
|
6ce6b95b56
|
修改通道在线/离线描述，避免歧义
|
2021-01-11 09:14:22 +08:00 |
|
Lawrence
|
b82b61038b
|
修正个别错误
|
2021-01-11 09:13:03 +08:00 |
|
Lawrence
|
f0f4537d80
|
离线设备禁用通道查看，避免后续无效操作
|
2021-01-11 09:11:56 +08:00 |
|
Lawrence
|
eec405028f
|
调整格式
|
2021-01-10 23:14:58 +08:00 |
|
Lawrence
|
d32fc9e801
|
删除多余注释
|
2021-01-10 23:08:47 +08:00 |
|
panlinlin
|
a796db6249
|
国标级联--选择通道003-前端页面
|
2021-01-10 20:14:11 +08:00 |
|
panlinlin
|
b4a7cfb563
|
完成向上级联->选择通道-001
|
2021-01-08 11:04:29 +08:00 |
|
panlinlin
|
2383f1515f
|
完成向上级联->选择通道-001
|
2021-01-08 11:02:53 +08:00 |
|
panlinlin
|
71a1dd8fc6
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-07 16:52:18 +08:00 |
|
panlinlin
|
a3afe9cc34
|
增加云台控制的速度控制
|
2021-01-07 16:44:42 +08:00 |
|
panlinlin
|
a8a36efb93
|
完成向上级联->保活
|
2021-01-06 18:35:38 +08:00 |
|
panlinlin
|
20669ed768
|
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
|
3a6fc34a11
|
优化录像查询，优化注释
|
2021-01-05 14:35:43 +08:00 |
|
panlinlin
|
b88ead03f9
|
存储部分使用sqlite代替redis-4
|
2021-01-05 11:25:05 +08:00 |
|
panlinlin
|
82c682c512
|
存储部分使用sqlite代替redis-3
|
2021-01-04 18:30:44 +08:00 |
|
panlinlin
|
2ab8b942bd
|
存储部分使用sqlite代替redis
|
2020-12-31 13:15:50 +08:00 |
|
panlinlin
|
e4d849304c
|
增加对水星IPC的兼容
增加对SIP错误的订阅，刷新通道或点播或回放出现sip错误时及时返回给页面
优化UI，增加按钮loading
|
2020-12-26 16:44:27 +08:00 |
|
648540858
|
c8fd03682a
|
补充漏掉的文件
|
2020-12-21 16:01:47 +08:00 |
|
panlinlin
|
82cceb6a4b
|
去除ssrc作为流ID传递，ssrc只作为sdp消息使用。动态端口的情况下支持固定流地址，同时支持未点播时直接播放流地址，代码自动发起点播
|
2020-12-19 21:52:20 +08:00 |
|
Lawrence
|
bf62eb1177
|
新建上级级联平台时自动填入本级平台参数
|
2020-12-17 14:50:49 +08:00 |
|
Lawrence
|
7b5fe25b96
|
与master分支同步
|
2020-12-16 20:29:19 +08:00 |
|
Lawrence
|
a76b464cd4
|
修正播放窗口关闭时销毁播放器的代码
|
2020-12-16 12:51:57 +08:00 |
|
Lawrence
|
f804dbfa34
|
修正转码播放停止后重复回调的错误
|
2020-12-16 12:41:49 +08:00 |
|
648540858
|
726730cbaa
|
使用异步接口, 更好的并发, 对hook使用订阅机制
替换前段播放器, 支持h265的播放
放弃循环获取编码信息,
|
2020-12-08 18:11:02 +08:00 |
|
648540858
|
a96d22701e
|
完成向上级联->注册
|
2020-11-24 16:41:00 +08:00 |
|
648540858
|
ae786534c6
|
[UI] 完成国标级联的CURD
|
2020-11-23 18:17:20 +08:00 |
|
648540858
|
51ff7ae180
|
添加addParentPlatform, queryParentPlatformList 接口
|
2020-11-20 18:02:01 +08:00 |
|
648540858
|
ba5ac5e8c1
|
添加自动通道刷新
|
2020-11-19 16:11:13 +08:00 |
|
648540858
|
17772daaaf
|
添加网页自动转码,以支持h265 g.711的播放
|
2020-11-19 16:00:02 +08:00 |
|
648540858
|
73fd076830
|
修复停止点播后,再次调用停止无法识别
|
2020-11-16 17:24:20 +08:00 |
|
Lawrence
|
e4920aeb20
|
修正不同终端开关音频设置不同引起播放问题的bug
|
2020-11-09 18:44:35 +08:00 |
|
Lawrence
|
411eea780a
|
改为24小时制显示
|
2020-11-09 18:42:59 +08:00 |
|
Lawrence
|
84611d7c4f
|
优化播放程序，缩短播放加载时间
|
2020-11-07 16:54:42 +08:00 |
|
Lawrence
|
32a7c12f82
|
完善前端控制信令，实现GB28181 A.3前端设备控制协议
|
2020-11-06 12:37:08 +08:00 |
|
Lawrence
|
5909578c41
|
录像查询更换日期后先清空原先的查询列表
|
2020-10-29 10:23:10 +08:00 |
|
648540858
|
021ba73002
|
修复ui录象播放
优化录象查询接口
|
2020-10-26 11:40:46 +08:00 |
|
Lawrence
|
c01acd3175
|
具有子节点的通道保留播放按钮，避免部分NVR无法查看直播流
|
2020-10-24 15:18:48 +08:00 |
|
Lawrence
|
b6e99efb55
|
使音频开关关闭生效
|
2020-10-24 15:16:10 +08:00 |
|
Lawrence
|
203888f306
|
修正音频编码判断代码错误，仅当存在AAC音轨时打开音频
|
2020-10-19 20:37:02 +08:00 |
|
Lawrence
|
535fbe982c
|
突出返回按钮
|
2020-10-19 20:35:01 +08:00 |
|
648540858
|
8369c616d2
|
修复ui开启音频无法播放的bug
修复可能导致录象查看的bug
修复开启openRTPServer时的bug
|
2020-10-19 14:25:41 +08:00 |
|
648540858
|
648853f18a
|
去除lombok框架
添加流传输模式udp/tcp被动支持
|
2020-10-16 16:49:41 +08:00 |
|
648540858
|
fd1dafc4a6
|
去除lombok框架
|
2020-10-16 14:57:10 +08:00 |
|
648540858
|
67764bedaf
|
修复点播判断错误导致的15s超长延时
增加默认不关闭推流, 无人观看超时或点击停止按钮关闭流
修复点播其他bug
|
2020-10-14 14:39:10 +08:00 |
|
648540858
|
cb45d84b94
|
修复无音频通道开启通道音频后无法播放的bug
修复点播接口真的收到视频后回复
|
2020-10-13 18:55:42 +08:00 |
|
648540858
|
79ee1e087f
|
添加通道音频设置
添加media配置
|
2020-10-13 17:16:38 +08:00 |
|
648540858
|
c7270f9320
|
离在线状态样式修改
修复未回复200ok导致catalog一直发送的bug
修改点播接口未收到视频后回复
|
2020-10-13 14:46:47 +08:00 |
|
648540858
|
f321337c69
|
web页面集成
|
2020-10-10 17:33:29 +08:00 |
|