From ba6d84cdc82bd2b5aa938b3b4abd122cc8e77b1b Mon Sep 17 00:00:00 2001
From: songww <songww@inspur.com>
Date: 星期六, 16 五月 2020 14:47:28 +0800
Subject: [PATCH] 删除部分代码
---
/dev/null | 48 ------------------------------------------------
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java | 2 +-
2 files changed, 1 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/PtzCmdHelper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/PtzCmdHelper.java
deleted file mode 100644
index f3b411b..0000000
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/PtzCmdHelper.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.genersoft.iot.vmp.gb28181.transmit.cmd.impl;
-
-public class PtzCmdHelper {
- /**
- *
- * @param leftRight 闀滃ご宸︾Щ鍙崇Щ 0:鍋滄 1:宸︾Щ 2:鍙崇Щ
- * @param upDown 闀滃ご涓婄Щ涓嬬Щ 0:鍋滄 1:涓婄Щ 2:涓嬬Щ
- * @param inOut 闀滃ご鏀惧ぇ缂╁皬 0:鍋滄 1:缂╁皬 2:鏀惧ぇ
- * @param moveSpeed 闀滃ご绉诲姩閫熷害 榛樿 0XFF (0-255)
- * @param zoomSpeed 闀滃ご缂╂斁閫熷害 榛樿 0X1 (0-255)
- * @return
- */
- //浜戝彴鎺у埗鍙戦�佷簡娑堟伅锛岀浉鏈轰細涓�鐩存墽琛岋紝鐩村埌鍏朵粬鍛戒护鎴栬�呭彂閫佷簡鍋滄鍛戒护锛屽垏璁拌鑰冭檻杩欎釜鏈哄埗
- public static String create(int leftRight, int upDown, int inOut, int moveSpeed, int zoomSpeed) {
- int cmdCode = 0;
- if (leftRight == 2) cmdCode|=0x01; // 鍙崇Щ
- else if(leftRight == 1) cmdCode|=0x02; // 宸︾Щ
- if (upDown == 2) cmdCode|=0x04; // 涓嬬Щ
- else if(upDown == 1) cmdCode|=0x08; // 涓婄Щ
- if (inOut == 2) cmdCode |= 0x10; // 鏀惧ぇ
- else if(inOut == 1) cmdCode |= 0x20; // 缂╁皬
- char[] szCmd = new char[16];
- String strTmp;
- szCmd[0] = 'A'; //瀛楄妭1 A5
- szCmd[1] = '5';
- szCmd[2] = '0'; //瀛楄妭2 0F
- szCmd[3] = 'F';
- szCmd[4] = '0'; //瀛楄妭3 鍦板潃鐨勪綆8浣�
- szCmd[5] = '1';
- strTmp = String.format("%02X", cmdCode);
- szCmd[6] = strTmp.charAt(0); //瀛楄妭4 鎺у埗鐮�
- szCmd[7] = strTmp.charAt(1);
- strTmp = String.format("%02X", moveSpeed);
- szCmd[8] = strTmp.charAt(0); //瀛楄妭5 姘村钩鎺у埗閫熷害
- szCmd[9] = strTmp.charAt(1);
- szCmd[10] = strTmp.charAt(0); //瀛楄妭6 鍨傜洿鎺у埗閫熷害
- szCmd[11] = strTmp.charAt(1);
- strTmp = String.format("%X", zoomSpeed);
- szCmd[12] = strTmp.charAt(0); //瀛楄妭7楂�4浣� 缂╂斁鎺у埗閫熷害
- szCmd[13] = '0'; //瀛楄妭7浣�4浣� 鍦板潃鐨勯珮4浣�
- //璁＄畻鏍￠獙鐮�
- int nCheck = (0XA5 + 0X0F + 0X01 + cmdCode + moveSpeed + moveSpeed + (zoomSpeed << 4 & 0XF0)) % 0X100;
- strTmp = String.format("%02X", nCheck);
- szCmd[14] = strTmp.charAt(0); //瀛楄妭8 鏍￠獙鐮�
- szCmd[15] = strTmp.charAt(1);
- return String.valueOf(szCmd);
- }
-}
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 82dcee8..9a664fc 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
@@ -115,7 +115,7 @@
ptzXml.append("<CmdType>DeviceControl</CmdType>");
ptzXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>");
ptzXml.append("<DeviceID>" + channelId + "</DeviceID>");
- ptzXml.append("<PTZCmd>" + PtzCmdHelper.create(leftRight, upDown, inOut, moveSpeed, zoomSpeed) + "</PTZCmd>");
+ ptzXml.append("<PTZCmd>" + "</PTZCmd>");
ptzXml.append("<Info>");
ptzXml.append("</Info>");
ptzXml.append("</Control>");
--
Gitblit v1.8.0