From a7638a68f1b1f7d4a829fb02824c7247bbc476a6 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Sat, 25 May 2024 15:08:09 +0800
Subject: [PATCH] 适配海康NVR
---
ard-work/src/main/resources/templates/test.html | 224 ++++++++++++++++++++++++++++++++------------
ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java | 53 ++++++----
ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java | 1
ard-work/src/main/java/com/ruoyi/utils/sdk/common/SdkErrorCodeEnum.java | 1
server/mediamtx/mediamtx.yml | 4
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java | 4
6 files changed, 197 insertions(+), 90 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java b/ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java
index a8cf456..696247d 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java
@@ -73,6 +73,7 @@
/**
* 光电类型
+ * 0-小光电 1-大光电 2-终端NVR 3-超脑
*/
@Excel(name = "光电类型")
private String gdtype;
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java
index 6149416..d35b60d 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java
@@ -56,13 +56,13 @@
private SysDeptMapper sysDeptMapper;
@Resource
private RedisCache redisCache;
- @Autowired
+ @Resource
private ISysDeptService deptService;
@Resource
private ArdChannelMapper ardChannelMapper;
@Resource
private IVtduService vtduService;
- @Autowired
+ @Resource
protected Validator validator;
@PostConstruct
diff --git a/ard-work/src/main/java/com/ruoyi/utils/sdk/common/SdkErrorCodeEnum.java b/ard-work/src/main/java/com/ruoyi/utils/sdk/common/SdkErrorCodeEnum.java
index c9c51f8..7efaa05 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/sdk/common/SdkErrorCodeEnum.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/sdk/common/SdkErrorCodeEnum.java
@@ -12,6 +12,7 @@
NET_DVR_PASSWORD_ERROR(1, "用户名密码错误。注册时输入的用户名或者密码错误"),
NET_DVR_NOINIT(3, "SDK未初始化"),
+ NET_DVR_CHANNEL_ERROR(4, "通道号错误"),
NET_DVR_NETWORK_FAIL_CONNECT(7, "连接设备失败。设备不在线或网络原因引起的连接超时等"),
NET_DVR_NETWORK_SEND_ERROR(8, "向设备发送失败"),
NET_DVR_NETWORK_RECV_TIMEOUT(10, "从设备接收数据超时"),
diff --git a/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java b/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java
index 5c9587f..3b0c5ce 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java
@@ -149,8 +149,14 @@
camera.setLoginId(lUserID);
camera.setState("1");
- camera.setChanNum((int) m_strDeviceInfo.struDeviceV30.byChanNum);
- camera.setStartDChan((int) m_strDeviceInfo.struDeviceV30.byStartDChan);
+ int chanNum = m_strDeviceInfo.struDeviceV30.byChanNum;
+ int startDchan = m_strDeviceInfo.struDeviceV30.byStartDChan + 1;
+ if (camera.getGdtype().equals("2")) {
+ chanNum = m_strDeviceInfo.struDeviceV30.byIPChanNum;
+ startDchan = m_strDeviceInfo.struDeviceV30.byStartDChan;
+ }
+ camera.setChanNum(chanNum);
+ camera.setStartDChan(startDchan);
//获取最新通道
List<ArdChannel> cameraChannelList = getIPChannelInfo(camera);
if (cameraChannelList.size() > 0) {
@@ -260,8 +266,14 @@
camera.setLoginId(lUserID);
camera.setState("1");
- camera.setChanNum((int) m_strDeviceInfo.struDeviceV30.byChanNum);
- camera.setStartDChan((int) m_strDeviceInfo.struDeviceV30.byStartDChan);
+ int chanNum = m_strDeviceInfo.struDeviceV30.byChanNum;
+ int startDchan = m_strDeviceInfo.struDeviceV30.byStartDChan + 1;
+ if (camera.getGdtype().equals("2")) {
+ chanNum = m_strDeviceInfo.struDeviceV30.byIPChanNum;
+ startDchan = m_strDeviceInfo.struDeviceV30.byStartDChan;
+ }
+ camera.setChanNum(chanNum);
+ camera.setStartDChan(startDchan);
//获取最新通道
List<ArdChannel> cameraChannelList = getIPChannelInfo(camera);
@@ -1249,8 +1261,8 @@
@Override
public AjaxResult controlDefogcfg(CameraCmd cmd) {
String cameraId = cmd.getCameraId();
+ Integer chanNo=cmd.getChanNo();
boolean enable = cmd.isEnable();
- Integer channelNum = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return AjaxResult.warn("设备未登录");
}
@@ -1258,10 +1270,10 @@
NET_DVR_CAMERAPARAMCFG_EX struCameraParam = new NET_DVR_CAMERAPARAMCFG_EX();
Pointer point = struCameraParam.getPointer();
IntByReference ibrBytesReturned = new IntByReference(0);
- boolean b_GetCameraParam = hCNetSDK.NET_DVR_GetDVRConfig(userId, NET_DVR_GET_CCDPARAMCFG_EX, channelNum, point, struCameraParam.size(), ibrBytesReturned);
+ boolean b_GetCameraParam = hCNetSDK.NET_DVR_GetDVRConfig(userId, NET_DVR_GET_CCDPARAMCFG_EX, chanNo, point, struCameraParam.size(), ibrBytesReturned);
if (!b_GetCameraParam) {
int code = hCNetSDK.NET_DVR_GetLastError();
- log.error("获取前端参数失败: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+ log.error("获取前端参数失败: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
return AjaxResult.warn("获取前端参数失败:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
struCameraParam.read();
@@ -1276,10 +1288,10 @@
}
struCameraParam.struDefogCfg = defogcfg;
struCameraParam.write();
- boolean bool = hCNetSDK.NET_DVR_SetDVRConfig(userId, NET_DVR_SET_CCDPARAMCFG_EX, channelNum, point, struCameraParam.size());
+ boolean bool = hCNetSDK.NET_DVR_SetDVRConfig(userId, NET_DVR_SET_CCDPARAMCFG_EX, chanNo, point, struCameraParam.size());
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
- log.error("切换透雾失败: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+ log.error("切换透雾失败: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
return AjaxResult.warn("切换透雾失败:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
log.debug("切换透雾成功");
@@ -1610,7 +1622,7 @@
public String record(CameraCmd cmd) {
try {
String cameraId = cmd.getCameraId();
- Integer channelNum = cmd.getChanNo();
+ Integer chanNo = cmd.getChanNo();
String path = FileUtils.createFile("D:/recordTemp/" + cameraId + ".mp4");
boolean enable = cmd.isEnable();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
@@ -1620,7 +1632,7 @@
//强制I帧结构体对象
HCNetSDK.NET_DVR_I_FRAME netDvrIFrame = new HCNetSDK.NET_DVR_I_FRAME(); //新建结构体对象
netDvrIFrame.read();
- netDvrIFrame.dwChannel = channelNum;//因为上文代码中设置了通道号，按照上文中的设置
+ netDvrIFrame.dwChannel = chanNo;//因为上文代码中设置了通道号，按照上文中的设置
netDvrIFrame.byStreamType = 0;
netDvrIFrame.dwSize = netDvrIFrame.size();
netDvrIFrame.write();
@@ -1630,7 +1642,7 @@
//预览参数
NET_DVR_PREVIEWINFO previewinfo = new NET_DVR_PREVIEWINFO();
previewinfo.read();
- previewinfo.lChannel = channelNum;
+ previewinfo.lChannel = chanNo;
previewinfo.dwStreamType = 0;//码流类型：0-主码流，1-子码流，2-三码流，3-虚拟码流，以此类推
previewinfo.dwLinkMode = 0;//连接方式：0-TCP方式，1-UDP方式，2-多播方式，3-RTP方式，4-RTP/RTSP，5-RTP/HTTP，6-HRUDP（可靠传输），7-RTSP/HTTPS，8-NPQ
previewinfo.hPlayWnd = null;//播放窗口的句柄，为NULL表示不解码显示。
@@ -1653,6 +1665,7 @@
return "";
}
log.debug("录像开始");
+
} else {
if (GlobalVariable.previewMap.containsKey(cameraId)) {
Integer lRealHandle = GlobalVariable.previewMap.get(cameraId);
@@ -1835,14 +1848,9 @@
//获取IP通道
public List<ArdChannel> getIPChannelInfo(ArdCameras camera) {
-
//获取通道
List<ArdChannel> channelList = new ArrayList<>();
try {
- if (camera.getGdtype().equals("3")) {
- camera.setChanNum(64);//超脑获取在线通道数
- camera.setStartDChan(0);//超脑初始通道为0
- }
IntByReference ibrBytesReturned = new IntByReference(0);//获取IP接入配置参数
HCNetSDK.NET_DVR_IPPARACFG_V40 m_strIpparaCfg = new HCNetSDK.NET_DVR_IPPARACFG_V40();
m_strIpparaCfg.write();
@@ -1853,12 +1861,12 @@
//log.debug("起始数字通道号：" + m_strIpparaCfg.dwStartDChan);//m_strIpparaCfg.dwDChanNum
for (int iChannum = 0; iChannum < camera.getChanNum(); iChannum++) {
ArdChannel ardChannel = new ArdChannel();
- int channum = iChannum + camera.getStartDChan() + 1;
+ int chanNo = iChannum + camera.getStartDChan();
HCNetSDK.NET_DVR_PICCFG_V40 strPicCfg = new HCNetSDK.NET_DVR_PICCFG_V40();
strPicCfg.dwSize = strPicCfg.size();
strPicCfg.write();
Pointer pStrPicCfg = strPicCfg.getPointer();
- NativeLong lChannel = new NativeLong(channum);
+ NativeLong lChannel = new NativeLong(chanNo);
IntByReference pInt = new IntByReference(0);
boolean b_GetPicCfg = hCNetSDK.NET_DVR_GetDVRConfig(camera.getLoginId(), HCNetSDK.NET_DVR_GET_PICCFG_V40, lChannel.intValue(),
pStrPicCfg, strPicCfg.size(), pInt);
@@ -1872,11 +1880,12 @@
m_strIpparaCfg.struStreamMode[iChannum].uGetStream.struChanInfo.read();
int channel = m_strIpparaCfg.struStreamMode[iChannum].uGetStream.struChanInfo.byIPID + m_strIpparaCfg.struStreamMode[iChannum].uGetStream.struChanInfo.byIPIDHigh * 256;
String channelName = new String(strPicCfg.sChanName, "GBK").trim();
+ channelName = channelName.equals("") ? "通道" + chanNo : channelName;
ardChannel.setDeviceId(camera.getId());
ardChannel.setName(channelName);
- ardChannel.setChanNo(channum);
- if (camera.getGdtype().equals("3")) {
- //超脑只获取在线通道
+ ardChannel.setChanNo(chanNo);
+ if (camera.getGdtype().equals("3") || camera.getGdtype().equals("2")) {
+ //NVR只获取在线通道
if (m_strIpparaCfg.struStreamMode[iChannum].uGetStream.struChanInfo.byEnable == 1) {
//log.debug("IP通道" + channum + "在线");
channelList.add(ardChannel);
diff --git a/ard-work/src/main/resources/templates/test.html b/ard-work/src/main/resources/templates/test.html
index 53fbf60..6c967e0 100644
--- a/ard-work/src/main/resources/templates/test.html
+++ b/ard-work/src/main/resources/templates/test.html
@@ -10,22 +10,23 @@
.top-buffer {
margin-top: 10px;
}
-
.container {
border: 2px solid #1b6d85;
- padding: 20px;
+ padding: 15px;
}
</style>
<body>
<div class="container">
- <div class="row ">
- <div class="col-md-12">
- 相机id：<select id="select" style="width: 330px;">
- </select>
- </div>
- </div>
<div class="row">
<div class="col-md-5">
+ <div class="row top-buffer">
+ 设备：<select id="selectDev" style="width: 330px;">
+ </select>
+ </div>
+ <div class="row top-buffer">
+ 通道：<select id="selectChn" style="width: 330px;">
+ </select>
+ </div>
<div class="row top-buffer">
<div class="col-md-1 col-md-offset-1">
<button id="up" type="button" class="btn btn-primary">上</button>
@@ -125,6 +126,9 @@
<div class="col-md-6">
<div class="row">
<div class="row top-buffer">
+ <button id="preview" type="button" class="btn btn-primary">预览</button>
+ </div>
+ <div class="row top-buffer">
<video id="video" muted autoplay loop controls
style="width: 100%; height: 360px; object-fit: fill; border: 2px solid #3498db;"/>
</div>
@@ -137,10 +141,30 @@
</div>
</div>
<script th:inline="javascript">
-
- var cameraId, opt, optOpen, optClose, token;
+ var cameraId, chanNo,opt, optOpen, optClose, token;
window.onload = function () {
console.log(RTCRtpReceiver.getCapabilities('video').codecs)
+ opt = {"username": "admin", "password": "admin123"};
+ $.ajax({
+ headers: {
+ 'Accept': 'application/json',
+ 'Content-Type': 'application/json'
+ },
+ url: "../login",
+ type: "post",
+ dataType: "json",
+ data: JSON.stringify(opt),
+ success: function (data) {
+ token = data.token;
+ getDeviceList();// 获取设备列表
+ }
+ })
+ // 初始化内容
+ console.log(cameraMap);
+ }
+
+ //获取设备
+ function getDeviceList() {
$.ajax({
url: "../cameraSdk/list",
type: "get",
@@ -149,6 +173,7 @@
var arr = data.data;
for (var i = 0; i < arr.length; i++) {
console.log(arr[i].id);
+ console.log(arr[i].name)
var camera = {
name: arr[i].name,
factory: arr[i].factory,
@@ -162,31 +187,83 @@
};
cameraMap.set(arr[i].id, camera);
//先创建好select里面的option元素
- var option = document.createElement("option");
+ var option = $("<option>");
//给option的text赋值,这就是你点开下拉框能够看到的东西
- $(option).text(arr[i].id);
+ $(option).val(arr[i].id);
+ $(option).text(arr[i].name);
//获取select 下拉框对象,并将option添加进select
- $('#select').append(option);
+ $('#selectDev').append(option);
}
+ $("#selectDev").trigger("change");
}
})
- opt = {"username": "admin", "password": "admin123"};
+ }
+
+ //选择设备
+ $("#selectDev").change(function () {
+ // 在这里处理选择事件
+ var cameraId = $(this).find("option:selected").val();
+ var name = $(this).find("option:selected").text();
+ getChannelList(cameraId);
+ console.log("选择了：" + cameraId + "---" + name);
+ });
+
+ //获取通道
+ function getChannelList(cameraId) {
+ console.log(cameraId)
+ var myEntity = {
+ deviceId: cameraId,
+ pageNum: 1,
+ pageSize: 64
+ }
+ var queryString = $.param(myEntity);
$.ajax({
headers: {
'Accept': 'application/json',
- 'Content-Type': 'application/json'
+ 'Content-Type': 'application/json',
+ 'Authorization': token
},
- url: "../login",
- type: "post",
- dataType: "json",
- data: JSON.stringify(opt),
+ url: "../device/channel/list?" + queryString,
+ type: "get",
success: function (data) {
- token = data.token;
+ console.log(data);
+ var arr = data.rows;
+ $('#selectChn').empty();
+ for (var i = 0; i < arr.length; i++) {
+ console.log(arr[i].chanNo);
+ console.log(arr[i].name);
+ //先创建好select里面的option元素
+ var option = document.createElement("option");
+ //给option的text赋值,这就是你点开下拉框能够看到的东西
+ $(option).text(arr[i].name);
+ $(option).val(arr[i].chanNo);
+ //获取select 下拉框对象,并将option添加进select
+ $('#selectChn').append(option);
+ }
}
})
- // 初始化内容
- console.log(cameraMap);
}
+
+ //预览
+ $('#preview').click(() => {
+ var cameraId = $('#selectDev option:selected').val();
+ var chanNo = $('#selectChn option:selected').val();
+ console.log(cameraId + " " + chanNo)
+ $.ajax({
+ headers: {
+ 'Accept': 'application/json',
+ 'Content-Type': 'application/json',
+ 'Authorization': token
+ },
+ url: "../vtdu/media/" + cameraId + "_" + chanNo,
+ type: "get",
+ dataType: "json",
+ success: function (data) {
+ realView(data.data.webrtcUrl + "/", "video");
+ }
+ })
+ });
+
//云台上下左右
$("#up").mousedown(function () {
var url = "../cameraSdk/PTZControlWithSpeed";
@@ -314,8 +391,9 @@
})
$("#setPreset").click(function () {
- cameraId = $('#select option:selected').val();
- opt = {"cameraId": cameraId, "chanNo": 1, "speed": 8, "presetIndex": 1};
+ cameraId = $('#selectDev option:selected').val();
+ chanNo = $('#selectChn option:selected').val();
+ opt = {"cameraId": cameraId, "chanNo": chanNo, "speed": 8, "presetIndex": 1};
$.ajax({
headers: {
'Accept': 'application/json',
@@ -332,8 +410,9 @@
})
})
$("#gotoPreset").click(function () {
- cameraId = $('#select option:selected').val();
- opt = {"cameraId": cameraId, "chanNo": 1, "speed": 8, "presetIndex": 1};
+ cameraId = $('#selectDev option:selected').val();
+ chanNo = $('#selectChn option:selected').val();
+ opt = {"cameraId": cameraId, "chanNo": chanNo, "speed": 8, "presetIndex": 1};
$.ajax({
headers: {
'Accept': 'application/json',
@@ -350,8 +429,9 @@
})
})
$("#getPTZ").click(function () {
- cameraId = $('#select option:selected').val();
- opt = {"cameraId": cameraId, "chanNo": 1};
+ cameraId = $('#selectDev option:selected').val();
+ chanNo = $('#selectChn option:selected').val();
+ opt = {"cameraId": cameraId, "chanNo": chanNo};
$.ajax({
headers: {
'Accept': 'application/json',
@@ -371,13 +451,14 @@
})
})
$("#setPTZ").click(function () {
- cameraId = $('#select option:selected').val();
+ cameraId = $('#selectDev option:selected').val();
+ chanNo = $('#selectChn option:selected').val();
var p = $('#p').val();
var t = $('#t').val();
var z = $('#z').val();
//定义一个带有Map字段的实体对象
var myEntity = {
- chanNo: 1,
+ chanNo: chanNo,
cameraId: cameraId,
ptzMap: {
p: p,
@@ -402,7 +483,8 @@
})
})
$("#setTargetPostion").click(function () {
- cameraId = $('#select option:selected').val();
+ cameraId = $('#selectDev option:selected').val();
+ chanNo = $('#selectChn option:selected').val();
var camera = cameraMap.get(cameraId);
var camP = camera.longitude + ',' + camera.latitude + ',' + camera.altitude;
var targetP = $('#targetPostion').val();
@@ -410,7 +492,7 @@
arr = arr.map(item => parseFloat(item));
//定义一个带有Map字段的实体对象
var myEntity = {
- chanNo: 1,
+ chanNo: chanNo,
cameraId: cameraId,
targetPosition: arr
};
@@ -431,8 +513,9 @@
})
})
$("#setZeroPTZ").click(function () {
- cameraId = $('#select option:selected').val();
- opt = {"cameraId": cameraId, "chanNo": 1};
+ cameraId = $('#selectDev option:selected').val();
+ chanNo = $('#selectChn option:selected').val();
+ opt = {"cameraId": cameraId, "chanNo": chanNo};
$.ajax({
headers: {
'Accept': 'application/json',
@@ -449,8 +532,9 @@
})
})
$("#WiperPwron").click(function () {
- cameraId = $('#select option:selected').val();
- opt = {"cameraId": cameraId, "chanNo": 1, "speed": 8, "enable": true, "code": 16};
+ cameraId = $('#selectDev option:selected').val();
+ chanNo = $('#selectChn option:selected').val();
+ opt = {"cameraId": cameraId, "chanNo": chanNo, "speed": 8, "enable": true, "code": 16};
$.ajax({
headers: {
'Accept': 'application/json',
@@ -468,9 +552,10 @@
})
var defogflag = true;
$("#Defogcfg").click(function () {
- cameraId = $('#select option:selected').val();
- optOpen = {"cameraId": cameraId, "chanNo": 1, "enable": true};
- optClose = {"cameraId": cameraId, "chanNo": 1, "enable": false};
+ cameraId = $('#selectDev option:selected').val();
+ chanNo = $('#selectChn option:selected').val();
+ optOpen = {"cameraId": cameraId, "chanNo": chanNo, "enable": true};
+ optClose = {"cameraId": cameraId, "chanNo": chanNo, "enable": false};
if (defogflag) {
$(this).text("关闭透雾");
defogflag = false;
@@ -510,9 +595,10 @@
})
var infrareflag = true;
$("#Infrarecfg").click(function () {
- cameraId = $('#select option:selected').val();
- optOpen = {"cameraId": cameraId, "chanNo": 1, "enable": true};
- optClose = {"cameraId": cameraId, "chanNo": 1, "enable": false};
+ cameraId = $('#selectDev option:selected').val();
+ chanNo = $('#selectChn option:selected').val();
+ optOpen = {"cameraId": cameraId, "chanNo": chanNo, "enable": true};
+ optClose = {"cameraId": cameraId, "chanNo": chanNo, "enable": false};
if (infrareflag) {
$(this).text("关闭红外");
infrareflag = false;
@@ -552,9 +638,10 @@
})
var focusModeflag = true;
$("#FocusMode").click(function () {
- cameraId = $('#select option:selected').val();
- optOpen = {"cameraId": cameraId, "chanNo": 1, "enable": true};
- optClose = {"cameraId": cameraId, "chanNo": 1, "enable": false};
+ cameraId = $('#selectDev option:selected').val();
+ chanNo = $('#selectChn option:selected').val();
+ optOpen = {"cameraId": cameraId, "chanNo": chanNo, "enable": true};
+ optClose = {"cameraId": cameraId, "chanNo": chanNo, "enable": false};
if (focusModeflag) {
$(this).text("自动聚焦");
focusModeflag = false;
@@ -592,8 +679,9 @@
}
})
$("#getFocusPos").click(function () {
- cameraId = $('#select option:selected').val();
- opt = {"cameraId": cameraId, "chanNo": 1};
+ cameraId = $('#selectDev option:selected').val();
+ chanNo = $('#selectChn option:selected').val();
+ opt = {"cameraId": cameraId, "chanNo": chanNo};
$.ajax({
headers: {
'Accept': 'application/json',
@@ -612,9 +700,10 @@
})
var heateRpwronflag = true;
$("#HeateRpwron").click(function () {
- cameraId = $('#select option:selected').val();
- optOpen = {"cameraId": cameraId, "chanNo": 1, "enable": true};
- optClose = {"cameraId": cameraId, "chanNo": 1, "enable": false};
+ cameraId = $('#selectDev option:selected').val();
+ chanNo = $('#selectChn option:selected').val();
+ optOpen = {"cameraId": cameraId, "chanNo": chanNo, "enable": true};
+ optClose = {"cameraId": cameraId, "chanNo": chanNo, "enable": false};
if (heateRpwronflag) {
$(this).text("关闭云台加热");
heateRpwronflag = false;
@@ -653,9 +742,10 @@
})
var CameraDeicingflag = true;
$("#CameraDeicing").click(function () {
- cameraId = $('#select option:selected').val();
- optOpen = {"cameraId": cameraId, "chanNo": 1, "enable": true};
- optClose = {"cameraId": cameraId, "chanNo": 1, "enable": false};
+ cameraId = $('#selectDev option:selected').val();
+ chanNo = $('#selectChn option:selected').val();
+ optOpen = {"cameraId": cameraId, "chanNo": chanNo, "enable": true};
+ optClose = {"cameraId": cameraId, "chanNo": chanNo, "enable": false};
if (CameraDeicingflag) {
$(this).text("关闭镜头加热");
CameraDeicingflag = false;
@@ -693,8 +783,9 @@
}
})
$("#realCutPic").click(function () {
- cameraId = $('#select option:selected').val();
- opt = {"cameraId": cameraId, "chanNo": 1};
+ cameraId = $('#selectDev option:selected').val();
+ chanNo = $('#selectChn option:selected').val();
+ opt = {"cameraId": cameraId, "chanNo": chanNo};
$.ajax({
headers: {
'Accept': 'application/json',
@@ -712,8 +803,9 @@
})
})
$("#saveCutPic").click(function () {
- cameraId = $('#select option:selected').val();
- opt = {"cameraId": cameraId, "chanNo": 1};
+ cameraId = $('#selectDev option:selected').val();
+ chanNo = $('#selectChn option:selected').val();
+ opt = {"cameraId": cameraId, "chanNo": chanNo};
$.ajax({
headers: {
'Accept': 'application/json',
@@ -735,9 +827,10 @@
})
var recordflag = true;
$("#record").click(function () {
- cameraId = $('#select option:selected').val();
- optOpen = {"cameraId": cameraId, "chanNo": 1, "enable": true};
- optClose = {"cameraId": cameraId, "chanNo": 1, "enable": false};
+ cameraId = $('#selectDev option:selected').val();
+ chanNo = $('#selectChn option:selected').val();
+ optOpen = {"cameraId": cameraId, "chanNo": chanNo, "enable": true};
+ optClose = {"cameraId": cameraId, "chanNo": chanNo, "enable": false};
if (recordflag) {
$(this).text("停止录像");
recordflag = false;
@@ -779,8 +872,9 @@
/*云台公共方法*/
function commondMethod(url, code, enable) {
- cameraId = $('#select option:selected').val();
- opt = {"cameraId": cameraId, "chanNo": 1, "speed": 4, "enable": enable, "code": code};
+ cameraId = $('#selectDev option:selected').val();
+ chanNo = $('#selectChn option:selected').val();
+ opt = {"cameraId": cameraId, "chanNo": chanNo, "speed": 4, "enable": enable, "code": code};
$.ajax({
headers: {
'Accept': 'application/json',
@@ -798,14 +892,16 @@
}
$('video').click(function (e) {
- var cameraId = $('#select option:selected').val();
+ var cameraId = $('#selectDev option:selected').val();
+ var chanNo = $('#selectChn option:selected').val();
+ console.log(cameraId + " " + chanNo)
$.ajax({
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json',
'Authorization': token
},
- url: "../vtdu/media/" + cameraId + "_" + 1,
+ url: "../vtdu/media/" + cameraId + "_" + chanNo,
type: "get",
dataType: "json",
success: function (data) {
diff --git a/server/mediamtx/mediamtx.yml b/server/mediamtx/mediamtx.yml
index 0d0358e..cbe09e8 100644
--- a/server/mediamtx/mediamtx.yml
+++ b/server/mediamtx/mediamtx.yml
@@ -225,7 +225,7 @@
webrtcICEInterfaces: []
# List of public IP addresses that are to be used as a host.
# This is used typically for servers that are behind 1:1 D-NAT.
-webrtcICEHostNAT1To1IPs: [192.168.1.227]
+webrtcICEHostNAT1To1IPs: []
# Address of a ICE UDP listener in format host:port.
# If filled, ICE traffic will pass through a single UDP port,
# allowing the deployment of the server inside a container or behind a NAT.
@@ -235,7 +235,7 @@
# allowing the deployment of the server inside a container or behind a NAT.
# Using this setting forces usage of the TCP protocol, which is not
# optimal for WebRTC.
-webrtcICETCPMuxAddress: 192.168.1.227:1234
+webrtcICETCPMuxAddress: 192.168.1.227:19302
###############################################
# Global settings -> SRT
--
Gitblit v1.9.3