Merge branch 'master' into 重构/1078

src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java

@@ -34,5 +34,5 @@ public class SipConfig {
 
 	private boolean alarm = false;
 
-	private long timeout = 150;
+	private long timeout = 500;
 }

src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java

@@ -190,5 +190,11 @@ public class UserSetting {
      */
     private boolean autoRegisterPlatform = false;
 
+    /**
+     * 按需发送推流设备位置， 默认发送移动位置订阅时如果位置不变则不发送， 设置为false按照国标间隔持续发送
+     */
+    private boolean sendPositionOnDemand = true;
+
+
 
 }