Commit Graph

18 Commits

Author SHA1 Message Date
64850858
3491da2511 添加云端录像功能 2021-06-01 17:05:07 +08:00
panlinlin
cfb9393e1a 修复分享功能 2021-05-06 10:54:41 +08:00
panlinlin
b3cbb433a7 修复分享功能 2021-05-06 10:44:16 +08:00
panlinlin
910b6600a6 添加系统设置界面,未完成 2021-04-29 17:14:37 +08:00
panlinlin
af5f95d8ae 优化播放器以及部分日志 2021-04-21 18:14:45 +08:00
panlinlin
850a5b2c6b 增加推流转发到国标,尚不完善 2021-04-02 19:04:01 +08:00
panlinlin
a3692072a1 添加拉流代理与国标关联, 支持代理rtsp/rtmp/...,转发到国标 2021-04-01 18:06:21 +08:00
panlinlin
22f58d318f 添加推流列表和拉流代理,下一步与国标关联 2021-03-30 18:46:34 +08:00
panlinlin
a2eb45de09 添加获取直播流的api 2021-03-26 18:32:36 +08:00
panlinlin
7be7d8f794 重命名设备管理组件 2021-03-25 17:48:20 +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
Lawrence
5e7c3ed971 增加移动位置显示功能 2021-01-27 15:24:28 +08:00
Lawrence
6002969517 修改本地jar库路径描述,避免marven编译Warning 2021-01-09 14:58:08 +08:00
panlinlin
a8a36efb93 完成向上级联->保活 2021-01-06 18:35:38 +08:00
Lawrence
7b5fe25b96 与master分支同步 2020-12-16 20:29:19 +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
bce4e95482 修复子节点显示错误 2020-10-12 10:11:24 +08:00