Commit ba6d84cdc82bd2b5aa938b3b4abd122cc8e77b1b
1 parent
fede660d
删除部分代码
Showing
2 changed files
with
1 additions
and
49 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/PtzCmdHelper.java deleted
100644 → 0
| 1 | -package com.genersoft.iot.vmp.gb28181.transmit.cmd.impl; | |
| 2 | - | |
| 3 | -public class PtzCmdHelper { | |
| 4 | - /** | |
| 5 | - * | |
| 6 | - * @param leftRight 镜头左移右移 0:停止 1:左移 2:右移 | |
| 7 | - * @param upDown 镜头上移下移 0:停止 1:上移 2:下移 | |
| 8 | - * @param inOut 镜头放大缩小 0:停止 1:缩小 2:放大 | |
| 9 | - * @param moveSpeed 镜头移动速度 默认 0XFF (0-255) | |
| 10 | - * @param zoomSpeed 镜头缩放速度 默认 0X1 (0-255) | |
| 11 | - * @return | |
| 12 | - */ | |
| 13 | - //云台控制发送了消息，相机会一直执行，直到其他命令或者发送了停止命令，切记要考虑这个机制 | |
| 14 | - public static String create(int leftRight, int upDown, int inOut, int moveSpeed, int zoomSpeed) { | |
| 15 | - int cmdCode = 0; | |
| 16 | - if (leftRight == 2) cmdCode|=0x01; // 右移 | |
| 17 | - else if(leftRight == 1) cmdCode|=0x02; // 左移 | |
| 18 | - if (upDown == 2) cmdCode|=0x04; // 下移 | |
| 19 | - else if(upDown == 1) cmdCode|=0x08; // 上移 | |
| 20 | - if (inOut == 2) cmdCode |= 0x10; // 放大 | |
| 21 | - else if(inOut == 1) cmdCode |= 0x20; // 缩小 | |
| 22 | - char[] szCmd = new char[16]; | |
| 23 | - String strTmp; | |
| 24 | - szCmd[0] = 'A'; //字节1 A5 | |
| 25 | - szCmd[1] = '5'; | |
| 26 | - szCmd[2] = '0'; //字节2 0F | |
| 27 | - szCmd[3] = 'F'; | |
| 28 | - szCmd[4] = '0'; //字节3 地址的低8位 | |
| 29 | - szCmd[5] = '1'; | |
| 30 | - strTmp = String.format("%02X", cmdCode); | |
| 31 | - szCmd[6] = strTmp.charAt(0); //字节4 控制码 | |
| 32 | - szCmd[7] = strTmp.charAt(1); | |
| 33 | - strTmp = String.format("%02X", moveSpeed); | |
| 34 | - szCmd[8] = strTmp.charAt(0); //字节5 水平控制速度 | |
| 35 | - szCmd[9] = strTmp.charAt(1); | |
| 36 | - szCmd[10] = strTmp.charAt(0); //字节6 垂直控制速度 | |
| 37 | - szCmd[11] = strTmp.charAt(1); | |
| 38 | - strTmp = String.format("%X", zoomSpeed); | |
| 39 | - szCmd[12] = strTmp.charAt(0); //字节7高4位 缩放控制速度 | |
| 40 | - szCmd[13] = '0'; //字节7低4位 地址的高4位 | |
| 41 | - //计算校验码 | |
| 42 | - int nCheck = (0XA5 + 0X0F + 0X01 + cmdCode + moveSpeed + moveSpeed + (zoomSpeed << 4 & 0XF0)) % 0X100; | |
| 43 | - strTmp = String.format("%02X", nCheck); | |
| 44 | - szCmd[14] = strTmp.charAt(0); //字节8 校验码 | |
| 45 | - szCmd[15] = strTmp.charAt(1); | |
| 46 | - return String.valueOf(szCmd); | |
| 47 | - } | |
| 48 | -} |
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
| ... | ... | @@ -115,7 +115,7 @@ public class SIPCommander implements ISIPCommander { |
| 115 | 115 | ptzXml.append("<CmdType>DeviceControl</CmdType>"); |
| 116 | 116 | ptzXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>"); |
| 117 | 117 | ptzXml.append("<DeviceID>" + channelId + "</DeviceID>"); |
| 118 | - ptzXml.append("<PTZCmd>" + PtzCmdHelper.create(leftRight, upDown, inOut, moveSpeed, zoomSpeed) + "</PTZCmd>"); | |
| 118 | + ptzXml.append("<PTZCmd>" + "</PTZCmd>"); | |
| 119 | 119 | ptzXml.append("<Info>"); |
| 120 | 120 | ptzXml.append("</Info>"); |
| 121 | 121 | ptzXml.append("</Control>"); | ... | ... |