From 2d2832dbe98967a661323dd0a3fdc1607106b983 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 22 二月 2023 18:01:30 +0800
Subject: [PATCH] 优化各个配置启动顺序

---
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java |   31 +++++++++++++------------------
 1 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
index 6937641..fbd9ece 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
@@ -808,7 +808,7 @@
      * @param presetIndex 璋冪敤棰勭疆浣嶇紪鍙凤紝寮�鍚湅瀹堜綅鏃朵娇鐢紝鍙栧�艰寖鍥�0~255
      */
     @Override
-    public void homePositionCmd(Device device, String channelId,String frontCmd, String enabled, String resetTime, String presetIndex, SipSubscribe.Event errorEvent,SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException {
+    public void homePositionCmd(Device device, String channelId, String enabled, String resetTime, String presetIndex, SipSubscribe.Event errorEvent,SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException {
 
         StringBuffer cmdXml = new StringBuffer(200);
         String charset = device.getCharset();
@@ -822,26 +822,21 @@
             cmdXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
         }
         cmdXml.append("<HomePosition>\r\n");
-        if (StringUtils.hasText(frontCmd)){
-            cmdXml.append(frontCmd);
-        }else{
-            if (NumericUtil.isInteger(enabled) && (!enabled.equals("0"))) {
-                cmdXml.append("<Enabled>1</Enabled>\r\n");
-                if (NumericUtil.isInteger(resetTime)) {
-                    cmdXml.append("<ResetTime>" + resetTime + "</ResetTime>\r\n");
-                } else {
-                    cmdXml.append("<ResetTime>0</ResetTime>\r\n");
-                }
-                if (NumericUtil.isInteger(presetIndex)) {
-                    cmdXml.append("<PresetIndex>" + presetIndex + "</PresetIndex>\r\n");
-                } else {
-                    cmdXml.append("<PresetIndex>0</PresetIndex>\r\n");
-                }
+        if (NumericUtil.isInteger(enabled) && (!enabled.equals("0"))) {
+            cmdXml.append("<Enabled>1</Enabled>\r\n");
+            if (NumericUtil.isInteger(resetTime)) {
+                cmdXml.append("<ResetTime>" + resetTime + "</ResetTime>\r\n");
             } else {
-                cmdXml.append("<Enabled>0</Enabled>\r\n");
+                cmdXml.append("<ResetTime>0</ResetTime>\r\n");
             }
+            if (NumericUtil.isInteger(presetIndex)) {
+                cmdXml.append("<PresetIndex>" + presetIndex + "</PresetIndex>\r\n");
+            } else {
+                cmdXml.append("<PresetIndex>0</PresetIndex>\r\n");
+            }
+        } else {
+            cmdXml.append("<Enabled>0</Enabled>\r\n");
         }
-
         cmdXml.append("</HomePosition>\r\n");
         cmdXml.append("</Control>\r\n");
 

--
Gitblit v1.8.0