From 35c0394c5bbff4dc8ae58a8dbaea40019fc284f2 Mon Sep 17 00:00:00 2001 From: Lawrence <1934378145@qq.com> Date: Mon, 19 Oct 2020 20:29:21 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 0b5fec8a..62b9d926 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,5 @@ - 4.0.0 @@ -12,7 +12,7 @@ com.genersoft wvp web video platform - + UTF-8 @@ -42,15 +42,15 @@ spring-boot-starter-tomcat - org.springframework.boot - spring-boot-starter-web - + org.springframework.boot + spring-boot-starter-web + - org.springframework - spring-context - - - + org.springframework + spring-context + + + com.alibaba @@ -62,7 +62,7 @@ mysql-connector-java 5.1.30 - + org.mybatis @@ -74,7 +74,7 @@ mybatis-spring ${mybatis.spring.version} - + com.github.pagehelper @@ -99,7 +99,7 @@ fastjson 1.2.33 - + @@ -112,13 +112,13 @@ springfox-swagger-ui 2.6.1 - + org.springframework.boot spring-boot-starter-aop - + javax.sip jain-sip-ri From 27a2394115286ed3fce465943d6c8f95cf088769 Mon Sep 17 00:00:00 2001 From: Lawrence <1934378145@qq.com> Date: Mon, 19 Oct 2020 20:30:59 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E9=94=99=E8=AF=AF=EF=BC=88UDP=E8=AF=AF?= =?UTF-8?q?=E4=B8=BATCP=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java index d12f832c..bfdc8f6c 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java @@ -103,7 +103,7 @@ public class SipLayer implements SipListener { ListeningPoint udpListeningPoint = sipStack.createListeningPoint(sipConfig.getSipIp(), sipConfig.getSipPort(), "UDP"); SipProvider udpSipProvider = sipStack.createSipProvider(udpListeningPoint); udpSipProvider.addSipListener(this); - logger.info("Sip Server TCP 启动成功 port {" + sipConfig.getSipPort() + "}"); + logger.info("Sip Server UDP 启动成功 port {" + sipConfig.getSipPort() + "}"); return udpSipProvider; } From d0917964188bb2b309447072fd8462a4ebb4e3c4 Mon Sep 17 00:00:00 2001 From: Lawrence <1934378145@qq.com> Date: Mon, 19 Oct 2020 20:31:53 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/gb28181/event/offline/OfflineEventListener.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/OfflineEventListener.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/OfflineEventListener.java index e991a293..4adc8fba 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/OfflineEventListener.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/OfflineEventListener.java @@ -54,7 +54,5 @@ public class OfflineEventListener implements ApplicationListener { // 处理离线监听 storager.outline(event.getDeviceId()); - - // } } From ac7cc458be8309aabb580308aad271ecbf5adc3e Mon Sep 17 00:00:00 2001 From: Lawrence <1934378145@qq.com> Date: Mon, 19 Oct 2020 20:32:55 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E6=AD=A3RTP=E7=AB=AF=E5=8F=A3?= =?UTF-8?q?=E4=B8=8A=E9=99=90=E6=95=B0=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 9271ee28..ec497898 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -46,6 +46,6 @@ media: #zlm服务器的ip与http端口, 重点: 这是http端口 streamNoneReaderDelayMS: 1800000 # 无人观看多久自动关闭流 rtp: # 启用udp多端口模式 enable: true - udpPortRange: 30000,300500 # 端口范围 + udpPortRange: 30000,30500 # 端口范围 From 50c19f4763e428c82dbc6da3467f4897d338d6e2 Mon Sep 17 00:00:00 2001 From: Lawrence <1934378145@qq.com> Date: Mon, 19 Oct 2020 20:33:57 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/index.html b/web_src/index.html index 4761547f..cb0b3df9 100644 --- a/web_src/index.html +++ b/web_src/index.html @@ -3,7 +3,7 @@ - gb_web + GB28181 From 908145ceed661028410ad68caa6ddd07cf22b2fc Mon Sep 17 00:00:00 2001 From: Lawrence <1934378145@qq.com> Date: Mon, 19 Oct 2020 20:35:01 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E7=AA=81=E5=87=BA=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/src/components/channelList.vue | 647 ++++++++++++------------- 1 file changed, 317 insertions(+), 330 deletions(-) diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue index 8e6638a8..c478e6e3 100644 --- a/web_src/src/components/channelList.vue +++ b/web_src/src/components/channelList.vue @@ -1,359 +1,346 @@ From fcf64ffa5e843bb47fc07cc0ed3ab8221d4d2123 Mon Sep 17 00:00:00 2001 From: Lawrence <1934378145@qq.com> Date: Mon, 19 Oct 2020 20:37:02 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=9F=B3=E9=A2=91?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E5=88=A4=E6=96=AD=E4=BB=A3=E7=A0=81=E9=94=99?= =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E4=BB=85=E5=BD=93=E5=AD=98=E5=9C=A8AAC?= =?UTF-8?q?=E9=9F=B3=E8=BD=A8=E6=97=B6=E6=89=93=E5=BC=80=E9=9F=B3=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/gb28181/devicePlayer.vue | 682 +++++++++--------- 1 file changed, 339 insertions(+), 343 deletions(-) diff --git a/web_src/src/components/gb28181/devicePlayer.vue b/web_src/src/components/gb28181/devicePlayer.vue index 18a8d51b..97fb7620 100644 --- a/web_src/src/components/gb28181/devicePlayer.vue +++ b/web_src/src/components/gb28181/devicePlayer.vue @@ -1,379 +1,375 @@ From efcd77078edb25ed211225d954245f30507d1585 Mon Sep 17 00:00:00 2001 From: Lawrence <1934378145@qq.com> Date: Mon, 19 Oct 2020 20:45:59 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9RTP=E7=AB=AF=E5=8F=A3?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=96=B9=E6=B3=95=EF=BC=8C=E7=A1=AE=E4=BF=9D?= =?UTF-8?q?=E5=88=86=E9=85=8D=E5=81=B6=E6=95=B0=E7=AB=AF=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/genersoft/iot/vmp/media/zlm/ZLMUtils.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMUtils.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMUtils.java index f88d59c6..422f6220 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMUtils.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMUtils.java @@ -36,7 +36,7 @@ public class ZLMUtils { System.out.println(newPort); System.out.println(jsonObject.toJSONString()); return newPort; - }else { + } else { return getNewRTPPort(ssrc); } } @@ -48,11 +48,14 @@ public class ZLMUtils { udpPortRangeArray[1] = Integer.parseInt(udpPortRangeStrArray[1]); } - if (currentPort == 0 || currentPort ++ > udpPortRangeArray[1]) { + if (currentPort == 0 || currentPort++ > udpPortRangeArray[1]) { currentPort = udpPortRangeArray[0]; return udpPortRangeArray[0]; - }else { - return currentPort ++; + } else { + if (currentPort % 2 == 1) { + currentPort++; + } + return currentPort++; } } } From 5ab432856deb79c26a3b4ea05e8582acf9e80cdc Mon Sep 17 00:00:00 2001 From: Lawrence <1934378145@qq.com> Date: Mon, 19 Oct 2020 23:10:33 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=90=AB=E6=9C=89?= =?UTF-8?q?=E9=9F=B3=E9=A2=91=E9=80=9A=E9=81=93=EF=BC=8C=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E6=92=AD=E6=94=BE=E6=97=B6=E5=88=A4=E6=96=AD=E9=9F=B3=E9=A2=91?= =?UTF-8?q?=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gb28181/transmit/request/impl/MessageRequestProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java index 02f7e935..f4411e1c 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java @@ -203,7 +203,7 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor { deviceChannel.setLongitude(itemDevice.element("Longitude") == null? 0.00:Double.parseDouble(XmlUtil.getText(itemDevice,"Longitude"))); deviceChannel.setLatitude(itemDevice.element("Latitude") == null? 0.00:Double.parseDouble(XmlUtil.getText(itemDevice,"Latitude"))); deviceChannel.setPTZType(itemDevice.element("PTZType") == null? 0:Integer.parseInt(XmlUtil.getText(itemDevice,"PTZType"))); - deviceChannel.setHasAudio(false); // 默认含有音频为false + deviceChannel.setHasAudio(true); // 默认含有音频，播放时再检查是否有音频及是否AAC storager.updateChannel(device.getDeviceId(), deviceChannel); }