From cf23816c80771c9e22bb50d0d89feb34d2edca79 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 13 一月 2022 16:42:58 +0800
Subject: [PATCH] 恢复合并的limit值
---
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiControlController.java | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiControlController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiControlController.java
index f784d3e..eac742c 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiControlController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiControlController.java
@@ -41,53 +41,57 @@
@RequestParam(required = false)Integer speed){
if (logger.isDebugEnabled()) {
- logger.debug(String.format("妯℃嫙鎺ュ彛> 璁惧浜戝彴鎺у埗 API璋冪敤锛宒eviceId锛�%s 锛宑hannelId锛�%s 锛宑ommand锛�%d 锛宻peed锛�%d ",
- serial, code, command, speed));
+ logger.debug("妯℃嫙鎺ュ彛> 璁惧浜戝彴鎺у埗 API璋冪敤锛宒eviceId锛歿} 锛宑hannelId锛歿} 锛宑ommand锛歿} 锛宻peed锛歿} ",
+ serial, code, command, speed);
}
+ if (channel == null) {channel = 0;}
+ if (speed == null) {speed = 0;}
Device device = storager.queryVideoDevice(serial);
- int leftRight = 0;
- int upDown = 0;
- int inOut = 0;
- switch (command) {
+ if (device == null) {
+ JSONObject result = new JSONObject();
+ result.put("error","device[ " + serial + " ]鏈壘鍒�");
+ return result;
+ }
+ int cmdCode = 0;
+ switch (command){
case "left":
- leftRight = 1;
+ cmdCode = 2;
break;
case "right":
- leftRight = 2;
+ cmdCode = 1;
break;
case "up":
- upDown = 1;
+ cmdCode = 8;
break;
case "down":
- upDown = 2;
+ cmdCode = 4;
break;
case "upleft":
- upDown = 1;
- leftRight = 1;
+ cmdCode = 10;
+ break;
case "upright":
- upDown = 1;
- leftRight = 2;
+ cmdCode = 9;
break;
case "downleft":
- upDown = 2;
- leftRight = 1;
+ cmdCode = 6;
break;
case "downright":
- upDown = 2;
- leftRight = 2;
+ cmdCode = 5;
break;
case "zoomin":
- inOut = 2;
+ cmdCode = 16;
break;
case "zoomout":
- inOut = 1;
+ cmdCode = 32;
break;
case "stop":
+ cmdCode = 0;
break;
-
+ default:
+ break;
}
// 榛樿鍊� 50
- cmder.ptzCmd(device, code, leftRight, upDown, inOut, speed==0 ? 129 : speed, 50);
+ cmder.frontEndCmd(device, code, cmdCode, speed, speed, speed);
return null;
}
}
--
Gitblit v1.8.0