From 677a9e785a87f1b51408626e23ab89fe9bfa1856 Mon Sep 17 00:00:00 2001 From: Kairlec Date: Mon, 4 Nov 2024 14:40:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BA=A7=E8=81=94?= =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E5=B9=BF=E6=92=AD=E5=9C=A8=E4=B8=8A=E7=BA=A7?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E7=82=B9=E6=92=AD=E8=A7=86=E9=A2=91=E6=97=B6?= =?UTF-8?q?=E4=B8=8B=E4=B8=8D=E4=BC=9A=E5=90=91=E4=B8=8A=E7=BA=A7=E5=8F=91?= =?UTF-8?q?=E9=80=81INVITE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/gb28181/service/impl/PlatformServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformServiceImpl.java index ea5dbd10..19a5e56f 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformServiceImpl.java @@ -486,7 +486,7 @@ public class PlatformServiceImpl implements IPlatformService { log.info("[国标级联] 语音喊话未找到可用的zlm. platform: {}", platform.getServerGBId()); return; } - InviteInfo inviteInfoForOld = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, channel.getGbId()); + InviteInfo inviteInfoForOld = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.BROADCAST, channel.getGbId()); if (inviteInfoForOld != null && inviteInfoForOld.getStreamInfo() != null) { // 如果zlm不存在这个流，则删除数据即可 From 36650778aa69d7a1ac1b01125acc88d28714d02d Mon Sep 17 00:00:00 2001 From: Kairlec Date: Thu, 7 Nov 2024 10:20:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BA=A7=E8=81=94?= =?UTF-8?q?=E5=B9=BF=E6=92=AD=E7=BB=99=E4=B8=8A=E7=BA=A7=E7=9A=84INVITE?= =?UTF-8?q?=E7=BC=BA=E5=B0=91f=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vmp/gb28181/transmit/cmd/impl/SIPCommanderForPlatform.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderForPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderForPlatform.java index e0f92f33..918a29fa 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderForPlatform.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderForPlatform.java @@ -737,6 +737,8 @@ public class SIPCommanderForPlatform implements ISIPCommanderForPlatform { } content.append("y=" + ssrcInfo.getSsrc() + "\r\n");//ssrc + // f字段:f= v/编码格式/分辨率/帧率/码率类型/码率大小a/编码格式/码率大小/采样率 + content.append("f=v/////a/1/8/1\r\n"); CallIdHeader callIdHeader = sipSender.getNewCallIdHeader(sipLayer.getLocalIp(platform.getDeviceIp()), platform.getTransport()); Request request = headerProviderPlatformProvider.createInviteRequest(platform, channel.getGbDeviceId(), From f6c8c8a92ea867a632f013b721178061e5259a45 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Thu, 7 Nov 2024 14:04:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dnpm=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/web_src/package.json b/web_src/package.json index 0a6a1d55..c314b9ba 100644 --- a/web_src/package.json +++ b/web_src/package.json @@ -16,7 +16,6 @@ "@wchbrad/vue-easy-tree": "^1.0.12", "axios": "^0.24.0", "core-js": "^2.6.5", - "defineProperty": "link:@babel/runtime/helpers/defineProperty", "echarts": "^4.9.0", "element-ui": "^2.15.14", "fingerprintjs2": "^2.1.2", @@ -24,7 +23,6 @@ "ol": "^6.14.1", "postcss-pxtorem": "^5.1.1", "screenfull": "5.1.0", - "slicedToArray": "link:@babel/runtime/helpers/slicedToArray", "strip-ansi": "^7.1.0", "uuid": "^8.3.2", "v-charts": "^1.19.0",