diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java index 1f73370b1..5b901ad2c 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java @@ -95,5 +95,4 @@ public class RegisterResponseProcessor extends SIPResponseProcessorAbstract { } } } - } diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/RtpServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/RtpServerServiceImpl.java index 91b2878e2..7a5030b6f 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/RtpServerServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/RtpServerServiceImpl.java @@ -139,7 +139,7 @@ public class RtpServerServiceImpl implements IReceiveRtpServerService { ssrc = ssrcFactory.getPlaySsrc(mediaServer); } - String streamId = String.format("%08x", Long.parseLong(ssrc)).toLowerCase(); + String streamId = String.format("%08x", Long.parseLong(ssrc)).toUpperCase(); String streamReplace = String.format("%s_%s", device.getDeviceId(), channel.getDeviceId()); int tcpMode = device.getStreamMode().equals("TCP-ACTIVE")? 2: (device.getStreamMode().equals("TCP-PASSIVE")? 1:0); @@ -309,7 +309,7 @@ public class RtpServerServiceImpl implements IReceiveRtpServerService { // 收流超时 // 关闭收流端口 String closeStreamId = rtpServerParam.getMediaServer().isRtpEnable() - ? String.format("%08x", rtpServerParam.getSsrc()) : rtpServerParam.getStreamId(); + ? String.format("%08x", rtpServerParam.getSsrc()).toUpperCase() : rtpServerParam.getStreamId(); mediaServerService.closeRTPServer(rtpServerParam.getMediaServer(), rtpServerParam.getApp(), closeStreamId); subscribe.removeSubscribe(rtpHook); callback.run(InviteErrorCode.ERROR_FOR_STREAM_TIMEOUT.getCode(), InviteErrorCode.ERROR_FOR_STREAM_TIMEOUT.getMsg(), null); @@ -324,8 +324,15 @@ public class RtpServerServiceImpl implements IReceiveRtpServerService { int rtpServerPort; if (rtpServerParam.getMediaServer().isRtpEnable()) { - String zlmStreamId = String.format("%08x", rtpServerParam.getSsrc()); - Long checkSsrc = rtpServerParam.isSsrcCheck() ? rtpServerParam.getSsrc() : 0L; + String zlmStreamId; + long checkSsrc; + if (rtpServerParam.getSsrc() != null) { + zlmStreamId = String.format("%08x", rtpServerParam.getSsrc()).toUpperCase(); + checkSsrc = rtpServerParam.isSsrcCheck() ? rtpServerParam.getSsrc() : 0L; + }else { + zlmStreamId = rtpServerParam.getStreamId(); + checkSsrc = 0L; + } rtpServerPort = mediaServerService.createRTPServer(rtpServerParam.getMediaServer(), rtpServerParam.getApp(), zlmStreamId, checkSsrc, rtpServerParam.getPort(), rtpServerParam.isOnlyAuto(), rtpServerParam.isDisableAudio(), rtpServerParam.isReUsePort(), rtpServerParam.getTcpMode()); } else { diff --git a/web/src/permission.js b/web/src/permission.js index 0117d8678..9a824083c 100644 --- a/web/src/permission.js +++ b/web/src/permission.js @@ -7,7 +7,7 @@ import getPageTitle from '@/utils/get-page-title' NProgress.configure({ showSpinner: false }) // NProgress Configuration -const whiteList = ['/login'] // no redirect whitelist +const whiteList = ['/login', '/play/share'] // no redirect whitelist router.beforeEach(async(to, from, next) => { // start progress bar diff --git a/web/src/router/index.js b/web/src/router/index.js index d89643fec..f38b57683 100644 --- a/web/src/router/index.js +++ b/web/src/router/index.js @@ -288,15 +288,10 @@ export const constantRoutes = [ ] }, { - path: '/play/wasm/:url', - name: 'wasmPlayer', + path: '/play/share', + name: 'sharePlayer', hidden: true, - component: () => import('@/views/common/jessibuca.vue') - }, - { - path: '/play/rtc/:url', - name: 'rtcPlayer', - component: () => import('@/views/common/rtcPlayer.vue') + component: () => import('@/views/common/share.vue') }, // 404 page must be placed at the end !!! { path: '*', redirect: '/404', hidden: true } diff --git a/web/src/views/alarm/index.vue b/web/src/views/alarm/index.vue index 141b82144..41284ac07 100644 --- a/web/src/views/alarm/index.vue +++ b/web/src/views/alarm/index.vue @@ -164,7 +164,6 @@