From 4b6440a58c6402eacb09e9eba67f988bd65000a4 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 19 十月 2023 10:12:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/dhsdk/module/ConfigModule.java | 98 +++++++++++++++++++++++++++++++------------------
1 files changed, 62 insertions(+), 36 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/dhsdk/module/ConfigModule.java b/ard-work/src/main/java/com/ruoyi/device/dhsdk/module/ConfigModule.java
index 7678235..bb99075 100644
--- a/ard-work/src/main/java/com/ruoyi/device/dhsdk/module/ConfigModule.java
+++ b/ard-work/src/main/java/com/ruoyi/device/dhsdk/module/ConfigModule.java
@@ -1,36 +1,62 @@
-package com.ruoyi.device.dhsdk.module;
-
-import com.ruoyi.device.dhsdk.lib.NetSDKLib;
-import com.sun.jna.Structure;
-import com.sun.jna.ptr.IntByReference;
-
-/**
- * @Description:
- * @ClassName: ConfigModule
- * @Author: 鍒樿嫃涔�
- * @Date: 2023骞�10鏈�14鏃�14:57:01
- **/
-public class ConfigModule {
- public static NetSDKLib netsdk = NetSDKLib.NETSDK_INSTANCE;
-
- public static boolean GetDevConfig(NetSDKLib.LLong hLoginHandle, int nType, Structure cmdObject) {
- boolean result = false;
- IntByReference error = new IntByReference(0);
- int nBufferLen = 2 * 1024 * 1024;
- netsdk.CLIENT_QueryDevState(hLoginHandle, nType, cmdObject.getPointer(), nBufferLen, error, 3000);
- return result;
- }
- /**
- * 鏌ヨ璁惧鐘舵��
- */
- public static boolean queryDevState(NetSDKLib.LLong hLoginHandle, int nType, NetSDKLib.SdkStructure stuInfo) {
-
- IntByReference intRetLen = new IntByReference();
- stuInfo.write();
- if (!LoginModule.netsdk.CLIENT_QueryDevState(hLoginHandle, nType, stuInfo.getPointer(), stuInfo.size(), intRetLen, 3000)) {
- return false;
- }
- stuInfo.read();
- return true;
- }
-}
+package com.ruoyi.device.dhsdk.module;
+
+import com.ruoyi.device.dhsdk.lib.NetSDKLib;
+import com.sun.jna.Structure;
+import com.sun.jna.ptr.IntByReference;
+import static com.ruoyi.device.dhsdk.lib.ToolKits.getErrorCodePrint;
+
+/**
+ * @Description:
+ * @ClassName: ConfigModule
+ * @Author: 鍒樿嫃涔�
+ * @Date: 2023骞�10鏈�14鏃�14:57:01
+ **/
+public class ConfigModule {
+ public static NetSDKLib netsdk = NetSDKLib.NETSDK_INSTANCE;
+ public static NetSDKLib configsdk = NetSDKLib.CONFIG_INSTANCE;
+ /**
+ * 鏌ヨ璁惧鐘舵��
+ */
+ public static boolean queryDevState(NetSDKLib.LLong hLoginHandle, int nType, NetSDKLib.SdkStructure stuInfo) {
+
+ IntByReference intRetLen = new IntByReference();
+ stuInfo.write();
+ if (!netsdk.CLIENT_QueryDevState(hLoginHandle, nType, stuInfo.getPointer(), stuInfo.size(), intRetLen, 3000)) {
+ return false;
+ }
+ stuInfo.read();
+ return true;
+ }
+ /**
+ * 璁剧疆鍗曚釜閰嶇疆
+ * @param hLoginHandle 鐧婚檰鍙ユ焺
+ * @param nChn 閫氶亾鍙凤紝-1 琛ㄧず鍏ㄩ�氶亾
+ * @param strCmd 閰嶇疆鍚嶇О
+ * @param cmdObject 閰嶇疆瀵瑰簲鐨勭粨鏋勪綋瀵硅薄
+ * @return 鎴愬姛杩斿洖 true
+ */
+ public static boolean SetDevConfig(NetSDKLib.LLong hLoginHandle, int nChn, String strCmd, Structure cmdObject) {
+ boolean result = false;
+ int nBufferLen = 2*1024*1024;
+ byte szBuffer[] = new byte[nBufferLen];
+ for(int i=0; i<nBufferLen; i++)szBuffer[i]=0;
+ IntByReference error = new IntByReference(0);
+ IntByReference restart = new IntByReference(0);
+ cmdObject.write();
+ if (configsdk.CLIENT_PacketData(strCmd, cmdObject.getPointer(), cmdObject.size(), szBuffer, nBufferLen)) {
+ cmdObject.read();
+ if( configsdk.CLIENT_SetNewDevConfig(hLoginHandle, strCmd , nChn , szBuffer, nBufferLen, error, restart, 3000)) {
+ result = true;
+ } else {
+ System.err.printf("Set %s Config Failed! Last Error = %s\n" , strCmd , getErrorCodePrint());
+ result = false;
+ }
+ } else {
+ System.err.println("Packet " + strCmd + " Config Failed!" + getErrorCodePrint());
+ result = false;
+ }
+
+ return result;
+ }
+
+}
--
Gitblit v1.9.3