guzijian / wvp-GB28181-pro · Commits

Commit 76a75bf3d06b25cefee22245b4fb1eca0225f181

Authored by Lawrence
1 parent 60b8934a

修正云台指令码变焦速度编码错误

Inline Side-by-side
Showing 1 changed file with 7 additions and 5 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
  View file @76a75bf
... ... @@ -101,7 +101,7 @@ public class SIPCommander implements ISIPCommander {
101 101 * @param upDown 镜头上移下移 0:停止 1:上移 2:下移
102 102 * @param inOut 镜头放大缩小 0:停止 1:缩小 2:放大
103 103 * @param moveSpeed 镜头移动速度 默认 0XFF (0-255)
104   - * @param zoomSpeed 镜头缩放速度 默认 0X1 (0-255)
  104 + * @param zoomSpeed 镜头缩放速度 默认 0X1 (0-15)
105 105 */
106 106 public static String cmdString(int leftRight, int upDown, int inOut, int moveSpeed, int zoomSpeed) {
107 107 int cmdCode = 0;
... ... @@ -127,10 +127,12 @@ public class SIPCommander implements ISIPCommander {
127 127 strTmp = String.format("%02X", moveSpeed);
128 128 builder.append(strTmp, 0, 2);
129 129 builder.append(strTmp, 0, 2);
130   - strTmp = String.format("%X", zoomSpeed);
  130 + // strTmp = String.format("%X", zoomSpeed);
  131 + int zs=(zoomSpeed<<4 & 0XF0);
  132 + strTmp = String.format("%X", zs);
131 133 builder.append(strTmp, 0, 1).append("0");
132 134 //计算校验码
133   - int checkCode = (0XA5 + 0X0F + 0X01 + cmdCode + moveSpeed + moveSpeed + (zoomSpeed << 4 & 0XF0)) % 0X100;
  135 + int checkCode = (0XA5 + 0X0F + 0X01 + cmdCode + moveSpeed + moveSpeed + zs/*(zoomSpeed << 4 & 0XF0)*/) % 0X100;
134 136 strTmp = String.format("%02X", checkCode);
135 137 builder.append(strTmp, 0, 2);
136 138 return builder.toString();
... ... @@ -152,13 +154,14 @@ public class SIPCommander implements ISIPCommander {
152 154 public boolean ptzCmd(Device device, String channelId, int leftRight, int upDown, int inOut, int moveSpeed,
153 155 int zoomSpeed) {
154 156 try {
  157 + String cmdStr= cmdString(leftRight, upDown, inOut, moveSpeed, zoomSpeed);
155 158 StringBuffer ptzXml = new StringBuffer(200);
156 159 ptzXml.append("<?xml version=\"1.0\" ?>");
157 160 ptzXml.append("<Control>");
158 161 ptzXml.append("<CmdType>DeviceControl</CmdType>");
159 162 ptzXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>");
160 163 ptzXml.append("<DeviceID>" + channelId + "</DeviceID>");
161   - ptzXml.append("<PTZCmd>" + cmdString(leftRight, upDown, inOut, moveSpeed, zoomSpeed) + "</PTZCmd>");
  164 + ptzXml.append("<PTZCmd>" + cmdStr + "</PTZCmd>");
162 165 ptzXml.append("<Info>");
163 166 ptzXml.append("</Info>");
164 167 ptzXml.append("</Control>");
... ... @@ -166,7 +169,6 @@ public class SIPCommander implements ISIPCommander {
166 169 Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), "ViaPtzBranch", "FromPtzTag", "ToPtzTag");
167 170  
168 171 transmitRequest(device, request);
169   -
170 172 return true;
171 173 } catch (SipException | ParseException | InvalidArgumentException e) {
172 174 e.printStackTrace();
... ...