Merge pull request #9 from lawrencehj/master
实现GB28181 A.3前端设备控制协议，支持单一jar打包（包含修改过的jar依赖）
This commit is contained in:
648540858
GitHub
commit
f875c1da27
16
pom.xml
16
pom.xml
@ -122,9 +122,9 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>javax.sip</groupId>
|
<groupId>javax.sip</groupId>
|
||||||
<artifactId>jain-sip-ri</artifactId>
|
<artifactId>jain-sip-ri</artifactId>
|
||||||
<version>1.3.0-91</version>
|
<version>1.3.0-92</version>
|
||||||
<scope>system</scope>
|
<!-- <scope>system</scope>
|
||||||
<systemPath>${basedir}/libs/jain-sip-ri-1.3.0-91.jar</systemPath>
|
<systemPath>${project.basedir}/libs/jain-sip-ri-1.3.0-91.jar</systemPath> -->
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.dom4j</groupId>
|
<groupId>org.dom4j</groupId>
|
||||||
@ -177,6 +177,16 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<source>1.8</source>
|
<source>1.8</source>
|
||||||
<target>1.8</target>
|
<target>1.8</target>
|
||||||
|
<webResources>
|
||||||
|
<resource>
|
||||||
|
<directory>${project.basedir}/libs</directory>
|
||||||
|
<targetPath>WEB-INF/lib</targetPath>
|
||||||
|
<filtering>true</filtering>
|
||||||
|
<includes>
|
||||||
|
<include>**/*.jar</include>
|
||||||
|
</includes>
|
||||||
|
</resource>
|
||||||
|
</webResources>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
|
|||||||
@ -64,6 +64,18 @@ public interface ISIPCommander {
|
|||||||
*/
|
*/
|
||||||
public boolean ptzCmd(Device device,String channelId,int leftRight, int upDown, int inOut, int moveSpeed, int zoomSpeed);
|
public boolean ptzCmd(Device device,String channelId,int leftRight, int upDown, int inOut, int moveSpeed, int zoomSpeed);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 前端控制，包括PTZ指令、FI指令、预置位指令、巡航指令、扫描指令和辅助开关指令
|
||||||
|
*
|
||||||
|
* @param device 控制设备
|
||||||
|
* @param channelId 预览通道
|
||||||
|
* @param cmdCode 指令码
|
||||||
|
* @param parameter1 数据1
|
||||||
|
* @param parameter2 数据2
|
||||||
|
* @param combineCode2 组合码2
|
||||||
|
*/
|
||||||
|
public boolean frontEndCmd(Device device, String channelId, int cmdCode, int parameter1, int parameter2, int combineCode2);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 请求预览视频流
|
* 请求预览视频流
|
||||||
*
|
*
|
||||||
|
|||||||
@ -163,6 +163,32 @@ public class SIPCommander implements ISIPCommander {
|
|||||||
return builder.toString();
|
return builder.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 云台指令码计算
|
||||||
|
*
|
||||||
|
* @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)
|
||||||
|
*/
|
||||||
|
public static String frontEndCmdString(int cmdCode, int parameter1, int parameter2, int combineCode2) {
|
||||||
|
StringBuilder builder = new StringBuilder("A50F01");
|
||||||
|
String strTmp;
|
||||||
|
strTmp = String.format("%02X", cmdCode);
|
||||||
|
builder.append(strTmp, 0, 2);
|
||||||
|
strTmp = String.format("%02X", parameter1);
|
||||||
|
builder.append(strTmp, 0, 2);
|
||||||
|
strTmp = String.format("%02X", parameter2);
|
||||||
|
builder.append(strTmp, 0, 2);
|
||||||
|
strTmp = String.format("%X", combineCode2);
|
||||||
|
builder.append(strTmp, 0, 1).append("0");
|
||||||
|
//计算校验码
|
||||||
|
int checkCode = (0XA5 + 0X0F + 0X01 + cmdCode + parameter1 + parameter2 + (combineCode2 & 0XF0)) % 0X100;
|
||||||
|
strTmp = String.format("%02X", checkCode);
|
||||||
|
builder.append(strTmp, 0, 2);
|
||||||
|
return builder.toString();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 云台控制，支持方向与缩放控制
|
* 云台控制，支持方向与缩放控制
|
||||||
@ -201,6 +227,41 @@ public class SIPCommander implements ISIPCommander {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 前端控制，包括PTZ指令、FI指令、预置位指令、巡航指令、扫描指令和辅助开关指令
|
||||||
|
*
|
||||||
|
* @param device 控制设备
|
||||||
|
* @param channelId 预览通道
|
||||||
|
* @param cmdCode 指令码
|
||||||
|
* @param parameter1 数据1
|
||||||
|
* @param parameter2 数据2
|
||||||
|
* @param combineCode2 组合码2
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public boolean frontEndCmd(Device device, String channelId, int cmdCode, int parameter1, int parameter2, int combineCode2) {
|
||||||
|
try {
|
||||||
|
String cmdStr= frontEndCmdString(cmdCode, parameter1, parameter2, combineCode2);
|
||||||
|
System.out.println("控制字符串：" + cmdStr);
|
||||||
|
StringBuffer ptzXml = new StringBuffer(200);
|
||||||
|
ptzXml.append("<?xml version=\"1.0\" ?>\r\n");
|
||||||
|
ptzXml.append("<Control>\r\n");
|
||||||
|
ptzXml.append("<CmdType>DeviceControl</CmdType>\r\n");
|
||||||
|
ptzXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
|
||||||
|
ptzXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
|
||||||
|
ptzXml.append("<PTZCmd>" + cmdStr + "</PTZCmd>\r\n");
|
||||||
|
ptzXml.append("<Info>\r\n");
|
||||||
|
ptzXml.append("</Info>\r\n");
|
||||||
|
ptzXml.append("</Control>\r\n");
|
||||||
|
|
||||||
|
Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), "ViaPtzBranch", "FromPtzTag", "ToPtzTag");
|
||||||
|
|
||||||
|
transmitRequest(device, request);
|
||||||
|
return true;
|
||||||
|
} catch (SipException | ParseException | InvalidArgumentException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* 请求预览视频流
|
* 请求预览视频流
|
||||||
*
|
*
|
||||||
|
|||||||
@ -138,7 +138,7 @@ public class DeviceController {
|
|||||||
DeviceChannel deviceChannel = storager.queryChannel(deviceId,channelId);
|
DeviceChannel deviceChannel = storager.queryChannel(deviceId,channelId);
|
||||||
if (deviceChannel == null) {
|
if (deviceChannel == null) {
|
||||||
PageResult<DeviceChannel> deviceChannelPageResult = new PageResult<>();
|
PageResult<DeviceChannel> deviceChannelPageResult = new PageResult<>();
|
||||||
new ResponseEntity<>(deviceChannelPageResult,HttpStatus.OK);
|
return new ResponseEntity<>(deviceChannelPageResult,HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
PageResult pageResult = storager.querySubChannels(deviceId, channelId, query, channelType, online, page, count);
|
PageResult pageResult = storager.querySubChannels(deviceId, channelId, query, channelType, online, page, count);
|
||||||
|
|||||||
@ -40,14 +40,35 @@ public class PtzController {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@PostMapping("/ptz/{deviceId}/{channelId}")
|
@PostMapping("/ptz/{deviceId}/{channelId}")
|
||||||
public ResponseEntity<String> ptz(@PathVariable String deviceId,@PathVariable String channelId,int leftRight, int upDown, int inOut, int moveSpeed, int zoomSpeed){
|
public ResponseEntity<String> ptz(@PathVariable String deviceId,@PathVariable String channelId,int cmdCode, int horizonSpeed, int verticalSpeed, int zoomSpeed){
|
||||||
|
|
||||||
if (logger.isDebugEnabled()) {
|
if (logger.isDebugEnabled()) {
|
||||||
logger.debug(String.format("设备云台控制 API调用，deviceId：%s ，channelId：%s ，leftRight：%d ，upDown：%d ，inOut：%d ，moveSpeed：%d ，zoomSpeed：%d",deviceId, channelId, leftRight, upDown, inOut, moveSpeed, zoomSpeed));
|
logger.debug(String.format("设备云台控制 API调用，deviceId：%s ，channelId：%s ，cmdCode：%d ，horizonSpeed：%d ，verticalSpeed：%d ，zoomSpeed：%d",deviceId, channelId, cmdCode, horizonSpeed, verticalSpeed, zoomSpeed));
|
||||||
}
|
}
|
||||||
Device device = storager.queryVideoDevice(deviceId);
|
Device device = storager.queryVideoDevice(deviceId);
|
||||||
|
|
||||||
cmder.ptzCmd(device, channelId, leftRight, upDown, inOut, moveSpeed, zoomSpeed);
|
cmder.frontEndCmd(device, channelId, cmdCode, horizonSpeed, verticalSpeed, zoomSpeed);
|
||||||
|
return new ResponseEntity<String>("success",HttpStatus.OK);
|
||||||
|
}
|
||||||
|
// public ResponseEntity<String> ptz(@PathVariable String deviceId,@PathVariable String channelId,int leftRight, int upDown, int inOut, int moveSpeed, int zoomSpeed){
|
||||||
|
|
||||||
|
// if (logger.isDebugEnabled()) {
|
||||||
|
// logger.debug(String.format("设备云台控制 API调用，deviceId：%s ，channelId：%s ，leftRight：%d ，upDown：%d ，inOut：%d ，moveSpeed：%d ，zoomSpeed：%d",deviceId, channelId, leftRight, upDown, inOut, moveSpeed, zoomSpeed));
|
||||||
|
// }
|
||||||
|
// Device device = storager.queryVideoDevice(deviceId);
|
||||||
|
|
||||||
|
// cmder.ptzCmd(device, channelId, leftRight, upDown, inOut, moveSpeed, zoomSpeed);
|
||||||
|
// return new ResponseEntity<String>("success",HttpStatus.OK);
|
||||||
|
// }
|
||||||
|
@PostMapping("/frontEndCommand/{deviceId}/{channelId}")
|
||||||
|
public ResponseEntity<String> frontEndCommand(@PathVariable String deviceId,@PathVariable String channelId,int cmdCode, int parameter1, int parameter2, int combindCode2){
|
||||||
|
|
||||||
|
if (logger.isDebugEnabled()) {
|
||||||
|
logger.debug(String.format("设备云台控制 API调用，deviceId：%s ，channelId：%s ，cmdCode：%d parameter1：%d parameter2：%d",deviceId, channelId, cmdCode, parameter1, parameter2));
|
||||||
|
}
|
||||||
|
Device device = storager.queryVideoDevice(deviceId);
|
||||||
|
|
||||||
|
cmder.frontEndCmd(device, channelId, cmdCode, parameter1, parameter2, combindCode2);
|
||||||
return new ResponseEntity<String>("success",HttpStatus.OK);
|
return new ResponseEntity<String>("success",HttpStatus.OK);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -40,7 +40,7 @@
|
|||||||
|
|
||||||
<!-- <el-date-picker v-model="videoHistory.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="结束时间"-->
|
<!-- <el-date-picker v-model="videoHistory.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="结束时间"-->
|
||||||
<!-- @change="recordList()"></el-date-picker>-->
|
<!-- @change="recordList()"></el-date-picker>-->
|
||||||
<el-table :data="videoHistory.searchHistoryResult" height="150" v-load="recordsLoading">
|
<el-table :data="videoHistory.searchHistoryResult" height="150" v-loading="recordsLoading">
|
||||||
<el-table-column label="名称" prop="name"></el-table-column>
|
<el-table-column label="名称" prop="name"></el-table-column>
|
||||||
<el-table-column label="文件" prop="filePath"></el-table-column>
|
<el-table-column label="文件" prop="filePath"></el-table-column>
|
||||||
<el-table-column label="开始时间" prop="startTime" :formatter="timeFormatter"></el-table-column>
|
<el-table-column label="开始时间" prop="startTime" :formatter="timeFormatter"></el-table-column>
|
||||||
@ -55,32 +55,61 @@
|
|||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
<!--遥控界面-->
|
<!--遥控界面-->
|
||||||
<el-tab-pane label="云台控制" name="control">
|
<el-tab-pane label="云台控制" name="control">
|
||||||
<div style="display: flex; justify-content: center;">
|
<div style="display: flex; justify-content: left;">
|
||||||
<div class="control-wrapper">
|
<div class="control-wrapper">
|
||||||
<div class="control-btn control-top" @mousedown="ptzCamera(0, 1, 0)" @mouseup="ptzCamera(0, 0, 0)">
|
<div class="control-btn control-top" @mousedown="ptzCamera(0, 2, 0)" @mouseup="ptzCamera(0, 0, 0)">
|
||||||
<i class="el-icon-caret-top"></i>
|
<i class="el-icon-caret-top"></i>
|
||||||
<div class="control-inner-btn control-inner"></div>
|
<div class="control-inner-btn control-inner"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="control-btn control-left" @mousedown="ptzCamera(1, 0, 0)" @mouseup="ptzCamera(0, 0, 0)">
|
<div class="control-btn control-left" @mousedown="ptzCamera(2, 0, 0)" @mouseup="ptzCamera(0, 0, 0)">
|
||||||
<i class="el-icon-caret-left"></i>
|
<i class="el-icon-caret-left"></i>
|
||||||
<div class="control-inner-btn control-inner"></div>
|
<div class="control-inner-btn control-inner"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="control-btn control-bottom" @mousedown="ptzCamera(0, 2, 0)" @mouseup="ptzCamera(0, 0, 0)">
|
<div class="control-btn control-bottom" @mousedown="ptzCamera(0, 1, 0)" @mouseup="ptzCamera(0, 0, 0)">
|
||||||
<i class="el-icon-caret-bottom"></i>
|
<i class="el-icon-caret-bottom"></i>
|
||||||
<div class="control-inner-btn control-inner"></div>
|
<div class="control-inner-btn control-inner"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="control-btn control-right" @mousedown="ptzCamera(2, 0, 0)" @mouseup="ptzCamera(0, 0, 0)">
|
<div class="control-btn control-right" @mousedown="ptzCamera(1, 0, 0)" @mouseup="ptzCamera(0, 0, 0)">
|
||||||
<i class="el-icon-caret-right"></i>
|
<i class="el-icon-caret-right"></i>
|
||||||
<div class="control-inner-btn control-inner"></div>
|
<div class="control-inner-btn control-inner"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="control-round">
|
<div class="control-round">
|
||||||
<div class="control-round-inner"><i class="fa fa-pause-circle"></i></div>
|
<div class="control-round-inner"><i class="fa fa-pause-circle"></i></div>
|
||||||
</div>
|
</div>
|
||||||
<div style="position: absolute; left: 7.25rem; top: 1.25rem" @mousedown="ptzCamera(0, 0, 2)" @mouseup="ptzCamera(0, 0, 0)"><i class="el-icon-zoom-in" style="font-size: 1.875rem;"></i></div>
|
<div style="position: absolute; left: 7.25rem; top: 1.25rem" @mousedown="ptzCamera(0, 0, 1)" @mouseup="ptzCamera(0, 0, 0)"><i class="el-icon-zoom-in" style="font-size: 1.875rem;"></i></div>
|
||||||
<div style="position: absolute; left: 7.25rem; top: 3.25rem; font-size: 1.875rem;" @mousedown="ptzCamera(0, 0, 1)" @mouseup="ptzCamera(0, 0, 0)"><i class="el-icon-zoom-out"></i></div>
|
<div style="position: absolute; left: 7.25rem; top: 3.25rem; font-size: 1.875rem;" @mousedown="ptzCamera(0, 0, 2)" @mouseup="ptzCamera(0, 0, 0)"><i class="el-icon-zoom-out"></i></div>
|
||||||
|
</div>
|
||||||
|
<div class="control-panel">
|
||||||
|
<el-button-group>
|
||||||
|
<el-tag style="position :absolute; left: 0rem; top: 0rem; width: 5rem; text-align: center" size="medium" type="info">预置位编号</el-tag>
|
||||||
|
<el-input-number style="position: absolute; left: 5rem; top: 0rem; width: 6rem" size="mini" v-model="presetPos" controls-position="right" :precision="0" :step="1" :min="1" :max="255"></el-input-number>
|
||||||
|
<el-button style="position: absolute; left: 11rem; top: 0rem; width: 5rem" size="mini" icon="el-icon-add-location" @click="presetPosition(129, presetPos)">设置</el-button>
|
||||||
|
<el-button style="position: absolute; left: 27rem; top: 0rem; width: 5rem" size="mini" type="primary" icon="el-icon-place" @click="presetPosition(130, presetPos)">调用</el-button>
|
||||||
|
<el-button style="position: absolute; left: 16rem; top: 0rem; width: 5rem" size="mini" icon="el-icon-delete-location" @click="presetPosition(131, presetPos)">删除</el-button>
|
||||||
|
<el-tag style="position :absolute; left: 0rem; top: 2.5rem; width: 5rem; text-align: center" size="medium" type="info">巡航速度</el-tag>
|
||||||
|
<el-input-number style="position: absolute; left: 5rem; top: 2.5rem; width: 6rem" size="mini" v-model="cruisingSpeed" controls-position="right" :precision="0" :min="1" :max="4095"></el-input-number>
|
||||||
|
<el-button style="position: absolute; left: 11rem; top: 2.5rem; width: 5rem" size="mini" icon="el-icon-loading" @click="setSpeedOrTime(134, cruisingGroup, cruisingSpeed)">设置</el-button>
|
||||||
|
<el-tag style="position :absolute; left: 16rem; top: 2.5rem; width: 5rem; text-align: center" size="medium" type="info">停留时间</el-tag>
|
||||||
|
<el-input-number style="position: absolute; left: 21rem; top: 2.5rem; width: 6rem" size="mini" v-model="cruisingTime" controls-position="right" :precision="0" :min="1" :max="4095"></el-input-number>
|
||||||
|
<el-button style="position: absolute; left: 27rem; top: 2.5rem; width: 5rem" size="mini" icon="el-icon-timer" @click="setSpeedOrTime(135, cruisingGroup, cruisingTime)">设置</el-button>
|
||||||
|
<el-tag style="position :absolute; left: 0rem; top: 4.5rem; width: 5rem; text-align: center" size="medium" type="info">巡航组编号</el-tag>
|
||||||
|
<el-input-number style="position: absolute; left: 5rem; top: 4.5rem; width: 6rem" size="mini" v-model="cruisingGroup" controls-position="right" :precision="0" :min="0" :max="255"></el-input-number>
|
||||||
|
<el-button style="position: absolute; left: 11rem; top: 4.5rem; width: 5rem" size="mini" icon="el-icon-add-location" @click="setCommand(132, cruisingGroup, presetPos)">添加点</el-button>
|
||||||
|
<el-button style="position: absolute; left: 16rem; top: 4.5rem; width: 5rem" size="mini" icon="el-icon-delete-location" @click="setCommand(133, cruisingGroup, presetPos)">删除点</el-button>
|
||||||
|
<el-button style="position: absolute; left: 21rem; top: 4.5rem; width: 5rem" size="mini" icon="el-icon-delete" @click="setCommand(133, cruisingGroup, 0)">删除组</el-button>
|
||||||
|
<el-button style="position: absolute; left: 27rem; top: 5rem; width: 5rem" size="mini" type="primary" icon="el-icon-video-camera-solid" @click="setCommand(136, cruisingGroup, 0)">巡航</el-button>
|
||||||
|
<el-tag style="position :absolute; left: 0rem; top: 7rem; width: 5rem; text-align: center" size="medium" type="info">扫描速度</el-tag>
|
||||||
|
<el-input-number style="position: absolute; left: 5rem; top: 7rem; width: 6rem" size="mini" v-model="scanSpeed" controls-position="right" :precision="0" :min="1" :max="4095"></el-input-number>
|
||||||
|
<el-button style="position: absolute; left: 11rem; top: 7rem; width: 5rem" size="mini" icon="el-icon-loading" @click="setSpeedOrTime(138, scanGroup, scanSpeed)">设置</el-button>
|
||||||
|
<el-tag style="position :absolute; left: 0rem; top: 9rem; width: 5rem; text-align: center" size="medium" type="info">扫描组编号</el-tag>
|
||||||
|
<el-input-number style="position: absolute; left: 5rem; top: 9rem; width: 6rem" size="mini" v-model="scanGroup" controls-position="right" :precision="0" :step="1" :min="0" :max="255"></el-input-number>
|
||||||
|
<el-button style="position: absolute; left: 11rem; top: 9rem; width: 5rem" size="mini" icon="el-icon-d-arrow-left" @click="setCommand(137, scanGroup, 1)">左边界</el-button>
|
||||||
|
<el-button style="position: absolute; left: 16rem; top: 9rem; width: 5rem" size="mini" icon="el-icon-d-arrow-right" @click="setCommand(137, scanGroup, 2)">右边界</el-button>
|
||||||
|
<el-button style="position: absolute; left: 27rem; top: 7rem; width: 5rem" size="mini" type="primary" icon="el-icon-video-camera-solid" @click="setCommand(137, scanGroup, 0)">扫描</el-button>
|
||||||
|
<el-button style="position: absolute; left: 27rem; top: 9rem; width: 5rem" size="mini" type="danger" icon="el-icon-switch-button" @click="ptzCamera(0, 0, 0)">停止</el-button>
|
||||||
|
</el-button-group>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
</el-tabs>
|
</el-tabs>
|
||||||
</div>
|
</div>
|
||||||
@ -152,7 +181,12 @@ export default {
|
|||||||
timeVal: 0,
|
timeVal: 0,
|
||||||
timeMin: 0,
|
timeMin: 0,
|
||||||
timeMax: 1440,
|
timeMax: 1440,
|
||||||
|
presetPos: 1,
|
||||||
|
cruisingSpeed: 100,
|
||||||
|
cruisingTime: 5,
|
||||||
|
cruisingGroup: 0,
|
||||||
|
scanSpeed: 100,
|
||||||
|
scanGroup: 0,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
@ -291,14 +325,41 @@ export default {
|
|||||||
let that = this;
|
let that = this;
|
||||||
this.$axios({
|
this.$axios({
|
||||||
method: 'post',
|
method: 'post',
|
||||||
url: '/api/ptz/' + this.deviceId + '/' + this.channelId + '?leftRight=' + leftRight + '&upDown=' + upDown +
|
// url: '/api/ptz/' + this.deviceId + '/' + this.channelId + '?leftRight=' + leftRight + '&upDown=' + upDown +
|
||||||
'&inOut=' + zoom + '&moveSpeed=50&zoomSpeed=50'
|
// '&inOut=' + zoom + '&moveSpeed=50&zoomSpeed=50'
|
||||||
|
url: '/api/ptz/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + (zoom * 16 + upDown * 4 + leftRight) + '&horizonSpeed=30&verticalSpeed=30&zoomSpeed=' + (2 * 16)
|
||||||
}).then(function (res) {});
|
}).then(function (res) {});
|
||||||
},
|
},
|
||||||
//////////////////////播放器事件处理//////////////////////////
|
//////////////////////播放器事件处理//////////////////////////
|
||||||
videoError: function (e) {
|
videoError: function (e) {
|
||||||
console.log("播放器错误：" + JSON.stringify(e));
|
console.log("播放器错误：" + JSON.stringify(e));
|
||||||
},
|
},
|
||||||
|
presetPosition: function (cmdCode, presetPos) {
|
||||||
|
console.log('预置位控制：' + this.presetPos + ' : 0x' + cmdCode.toString(16));
|
||||||
|
let that = this;
|
||||||
|
this.$axios({
|
||||||
|
method: 'post',
|
||||||
|
url: '/api/frontEndCommand/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + cmdCode + '¶meter1=0¶meter2=' + presetPos + '&combindCode2=0'
|
||||||
|
}).then(function (res) {});
|
||||||
|
},
|
||||||
|
setSpeedOrTime: function (cmdCode, groupNum, parameter) {
|
||||||
|
let that = this;
|
||||||
|
let parameter2 = parameter % 256;
|
||||||
|
let combindCode2 = Math.floor(parameter / 256) * 16;
|
||||||
|
console.log('前端控制：0x' + cmdCode.toString(16) + ' 0x' + groupNum.toString(16) + ' 0x' + parameter2.toString(16) + ' 0x' + combindCode2.toString(16));
|
||||||
|
this.$axios({
|
||||||
|
method: 'post',
|
||||||
|
url: '/api/frontEndCommand/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + cmdCode + '¶meter1=' + groupNum + '¶meter2=' + parameter2 + '&combindCode2=' + combindCode2
|
||||||
|
}).then(function (res) {});
|
||||||
|
},
|
||||||
|
setCommand: function (cmdCode, groupNum, parameter) {
|
||||||
|
let that = this;
|
||||||
|
console.log('前端控制：0x' + cmdCode.toString(16) + ' 0x' + groupNum.toString(16) + ' 0x' + parameter.toString(16) + ' 0x0');
|
||||||
|
this.$axios({
|
||||||
|
method: 'post',
|
||||||
|
url: '/api/frontEndCommand/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + cmdCode + '¶meter1=' + groupNum + '¶meter2=' + parameter + '&combindCode2=0'
|
||||||
|
}).then(function (res) {});
|
||||||
|
},
|
||||||
formatTooltip: function (val) {
|
formatTooltip: function (val) {
|
||||||
var h = parseInt(val / 60);
|
var h = parseInt(val / 60);
|
||||||
var hStr = h < 10 ? ("0" + h) : h;
|
var hStr = h < 10 ? ("0" + h) : h;
|
||||||
@ -356,11 +417,20 @@ export default {
|
|||||||
height: 6.25rem;
|
height: 6.25rem;
|
||||||
max-width: 6.25rem;
|
max-width: 6.25rem;
|
||||||
max-height: 6.25rem;
|
max-height: 6.25rem;
|
||||||
margin: 0 auto;
|
|
||||||
border-radius: 100%;
|
border-radius: 100%;
|
||||||
|
margin-top: 2.5rem;
|
||||||
|
margin-left: 0.5rem;
|
||||||
float: left;
|
float: left;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.control-panel {
|
||||||
|
position: relative;
|
||||||
|
top: 0;
|
||||||
|
left: 5rem;
|
||||||
|
height: 11rem;
|
||||||
|
max-height: 11rem;
|
||||||
|
}
|
||||||
|
|
||||||
.control-btn {
|
.control-btn {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
@ -393,8 +463,8 @@ export default {
|
|||||||
|
|
||||||
.control-round-inner {
|
.control-round-inner {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 15%;
|
left: 13%;
|
||||||
top: 15%;
|
top: 13%;
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user