Merge branch 'wvp-28181-2.0'

Browse Source

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/resources/all-application.yml
#	web_src/src/components/dialog/devicePlayer.vue

...

This commit is contained in:

648540858

2023-01-13 16:21:17 +08:00

parent e14cef8062 ebcd2320a9

commit dea44dcd78

81 changed files with 1830 additions and 1258 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

doc/_media/2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 469 KiB

BIN

doc/_media/3-1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 136 KiB

BIN

doc/_media/3-2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 650 KiB

BIN

doc/_media/3-3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.0 MiB

BIN

doc/_media/3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 146 KiB

BIN

doc/_media/index.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 154 KiB