From 7c1e2217d0e4aad7498a5c136710c33cb55d00d0 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期三, 17 七月 2024 15:11:00 +0800
Subject: [PATCH] 三一车辆模型bug修改提交
---
ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/module/ConfigModule.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/module/ConfigModule.java b/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/module/ConfigModule.java
index 631218d..7075434 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/module/ConfigModule.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/module/ConfigModule.java
@@ -81,20 +81,23 @@
return result;
}
- public static String getChannelName(NetSDKLib.LLong hLoginHandle,Integer channel) {
+
+ //鏌ヨ閫氶亾鍚嶇О
+ public static String getChannelName(NetSDKLib.LLong hLoginHandle, Integer channel) {
String channelName = "";
NetSDKLib.AV_CFG_ChannelName channelTitleName = new NetSDKLib.AV_CFG_ChannelName();
- if (ToolKits.GetDevConfig(hLoginHandle, channel, NetSDKLib.CFG_CMD_CHANNELTITLE, channelTitleName)) {
+ if (ToolKits.GetDevConfig(hLoginHandle, channel - 1, NetSDKLib.CFG_CMD_CHANNELTITLE, channelTitleName)) {
try {
channelName = new String(channelTitleName.szName, "GBK");
} catch (Exception e) {
- System.err.println("getChannelName Failed!");
+ log.error("getChannelName Failed!");
}
} else {
- System.err.println("Get Channel Name Failed." + ToolKits.getErrorCodePrint());
+ log.error("Get Channel Name Failed." + ToolKits.getErrorCodePrint());
}
return channelName;
}
+
public static boolean GetDevConfig(NetSDKLib.LLong hLoginHandle, int nChn, String strCmd, Structure cmdObject) {
boolean result = true;
IntByReference error = new IntByReference(0);
@@ -111,6 +114,7 @@
return result;
}
+ //鏌ヨ鐩告満鐘舵��
public static boolean queryCameraState(NetSDKLib.LLong hLoginHandle, Integer chanNum, Integer chanNo) {
boolean bRet = false;
try {
@@ -141,9 +145,9 @@
stOut.read();
ToolKits.GetPointerDataToStructArr(stOut.pCameraStateInfo, arrCameraStatus); // 灏哖ointer鎷疯礉鍒版暟缁勫唴瀛�
final String[] connectionState = {"鏈煡", "姝ｅ湪杩炴帴", "宸茶繛鎺�", "鏈繛鎺�", "閫氶亾鏈厤缃�,鏃犱俊鎭�", "閫氶亾鏈夐厤缃�,浣嗚绂佺敤"};
- log.debug(connectionState[arrCameraStatus[chanNo - 1].emConnectionState]);
+
if (connectionState[arrCameraStatus[chanNo - 1].emConnectionState].equals("宸茶繛鎺�")) {
- log.debug("閫氶亾" + arrCameraStatus[chanNo - 1].nChannel + connectionState[arrCameraStatus[chanNo - 1].emConnectionState]);
+ //log.debug("閫氶亾锛�" + arrCameraStatus[chanNo - 1].nChannel + "鐘舵�侊細" + connectionState[arrCameraStatus[chanNo - 1].emConnectionState]);
bRet = true;
} else {
bRet = false;
@@ -205,6 +209,5 @@
return result;
}
-
}
--
Gitblit v1.9.3