648540858 5a7a7a12bd Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java # src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/InviteResponseProcessor.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java # src/main/java/com/genersoft/iot/vmp/service/IPlayService.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java # src/main/resources/all-application.yml # web_src/config/index.js # web_src/src/components/dialog/devicePlayer.vue		2023-06-27 16:46:26 +08:00
..
ability	优化notify性能，增加notify超出处理能力时直接回复错误码，不做处理。	2023-04-19 11:09:26 +08:00
introduction	Merge branch 'wvp-28181-2.0' into main-dev	2023-06-27 16:46:26 +08:00
qa	更新文档	2023-05-12 12:40:22 +08:00
skill	添加文档	2022-08-09 09:45:32 +08:00
theory	级联语音对讲部分	2022-12-13 11:57:07 +08:00
about_doc.md	添加文档	2022-08-09 09:45:32 +08:00
broadcast.md	添加文档	2023-02-10 15:33:00 +08:00
disclaimers.md	添加文档	2022-08-09 09:45:32 +08:00