Merge branch 'wvp-28181-2.0' into main-dev

Browse Source

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageHandlerAbstract.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java

...

This commit is contained in:

648540858

2023-09-11 11:21:50 +08:00

parent d9cfe061b9 f57ed350b3

commit 88350873ee

365 changed files with 3884 additions and 2745 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

0

src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/MobilePosition/MobilePositionController.java Normal file → Executable file

0

src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/SseController/SseController.java Normal file → Executable file

0

src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/alarm/AlarmController.java Normal file → Executable file

0

src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceConfig.java Normal file → Executable file

0

src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java Normal file → Executable file

0

src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java Normal file → Executable file

0

src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java Normal file → Executable file

0

src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/bean/GbStreamParam.java Normal file → Executable file

0

src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/media/MediaController.java Normal file → Executable file

0

src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java Normal file → Executable file

0

src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/bean/ChannelReduce.java Normal file → Executable file

0

src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/bean/UpdateChannelParam.java Normal file → Executable file

0

src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java Normal file → Executable file

0

src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/bean/PlayResult.java Normal file → Executable file

0

src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java Normal file → Executable file

0

src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/ptz/PtzController.java Normal file → Executable file

0

src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java Normal file → Executable file