Pre Merge pull request !36 from 阿斌/N/A

fix: remove conflicting files `AblUrls.java` on Windows

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java

@@ -1203,7 +1203,13 @@ public class SIPCommander implements ISIPCommander {
         } else {
             callIdHeader = sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport());
         }
-        SIPRequest request = (SIPRequest) headerProvider.createSubscribeRequest(device, subscribePostitionXml.toString(), sipTransactionInfo, device.getSubscribeCycleForMobilePosition(), "presence",callIdHeader); //Position;id=" + tm.substring(tm.length() - 4));
+
+        int subscribeCycleForMobilePosition = device.getSubscribeCycleForMobilePosition();
+        if (subscribeCycleForMobilePosition > 0) {
+            // 移动位置订阅有效期不小于 30 秒
+            subscribeCycleForMobilePosition = Math.max(subscribeCycleForMobilePosition, 30);
+        }
+        SIPRequest request = (SIPRequest) headerProvider.createSubscribeRequest(device, subscribePostitionXml.toString(), sipTransactionInfo, subscribeCycleForMobilePosition, "presence",callIdHeader); //Position;id=" + tm.substring(tm.length() - 4));
 
         sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, errorEvent, okEvent);
         return request;
@@ -1275,8 +1281,13 @@ public class SIPCommander implements ISIPCommander {
             callIdHeader = sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport());
         }
 
+        int subscribeCycleForCatalog = device.getSubscribeCycleForCatalog();
+        if (subscribeCycleForCatalog > 0) {
+            // 目录订阅有效期不小于 30 秒
+            subscribeCycleForCatalog = Math.max(subscribeCycleForCatalog, 30);
+        }
         // 有效时间默认为60秒以上
-        SIPRequest request = (SIPRequest) headerProvider.createSubscribeRequest(device, cmdXml.toString(), sipTransactionInfo, device.getSubscribeCycleForCatalog(), "Catalog",
+        SIPRequest request = (SIPRequest) headerProvider.createSubscribeRequest(device, cmdXml.toString(), sipTransactionInfo, subscribeCycleForCatalog, "Catalog",
                 callIdHeader);
         sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, errorEvent, okEvent);
         return request;

src/main/java/com/genersoft/iot/vmp/media/abl/bean/ABLUrls.java

@@ -17,5 +17,8 @@ public class ABLUrls {
     @JSONField(name = "http-mp4")
     private String httpMp4;
 
+    @JSONField(name = "http-hls")
+    private String httpHls;
+
     private String download;
 }

src/main/java/com/genersoft/iot/vmp/media/abl/bean/AblUrls.java

@@ -1,58 +0,0 @@
-package com.genersoft.iot.vmp.media.abl.bean;
-
-public class AblUrls {
-    private String rtsp;
-    private String rtmp;
-    private String httpFlv;
-    private String wsFlv;
-    private String httpMp4;
-    private String httpHls;
-
-    public String getRtsp() {
-        return rtsp;
-    }
-
-    public void setRtsp(String rtsp) {
-        this.rtsp = rtsp;
-    }
-
-    public String getRtmp() {
-        return rtmp;
-    }
-
-    public void setRtmp(String rtmp) {
-        this.rtmp = rtmp;
-    }
-
-    public String getHttpFlv() {
-        return httpFlv;
-    }
-
-    public void setHttpFlv(String httpFlv) {
-        this.httpFlv = httpFlv;
-    }
-
-    public String getWsFlv() {
-        return wsFlv;
-    }
-
-    public void setWsFlv(String wsFlv) {
-        this.wsFlv = wsFlv;
-    }
-
-    public String getHttpMp4() {
-        return httpMp4;
-    }
-
-    public void setHttpMp4(String httpMp4) {
-        this.httpMp4 = httpMp4;
-    }
-
-    public String getHttpHls() {
-        return httpHls;
-    }
-
-    public void setHttpHls(String httpHls) {
-        this.httpHls = httpHls;
-    }
-}

src/main/java/com/genersoft/iot/vmp/media/abl/bean/hook/OnStreamArriveABLHookParam.java

@@ -1,6 +1,6 @@
 package com.genersoft.iot.vmp.media.abl.bean.hook;
 
-import com.genersoft.iot.vmp.media.abl.bean.AblUrls;
+import com.genersoft.iot.vmp.media.abl.bean.ABLUrls;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -108,5 +108,5 @@ public class OnStreamArriveABLHookParam extends ABLHookParam{
     private Integer audioBitrate;
 
 
-    private AblUrls url;
+    private ABLUrls url;
 }

src/main/resources/civilCode.csv

@@ -861,7 +861,7 @@
 320623,如东县,3206
 320681,启东市,3206
 320682,如皋市,3206
-320684,海门市,3206
+320684,海门区,3206
 320685,海安市,3206
 3207,连云港市,32
 320703,连云区,3207
@@ -918,8 +918,6 @@
 33,浙江省, 
 3301,杭州市,33
 330102,上城区,3301
-330103,下城区,3301
-330104,江干区,3301
 330105,拱墅区,3301
 330106,西湖区,3301
 330108,滨江区,3301
@@ -927,6 +925,8 @@
 330110,余杭区,3301
 330111,富阳区,3301
 330112,临安区,3301
+330113,临平区,3301
+330114,钱塘区,3301
 330122,桐庐县,3301
 330127,淳安县,3301
 330182,建德市,3301