diff --git a/.gitignore b/.gitignore index d0ce846..0f36585 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ logs/ **/hiklib/** *.iml +**/sdk_log/** diff --git a/.gitignore b/.gitignore index d0ce846..0f36585 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ logs/ **/hiklib/** *.iml +**/sdk_log/** diff --git a/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/LoginModule.java b/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/LoginModule.java index 546535c..58c5a94 100644 --- a/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/LoginModule.java +++ b/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/LoginModule.java @@ -4,37 +4,74 @@ import com.netsdk.lib.ToolKits; import com.netsdk.lib.callback.impl.DefaultDisconnectCallback; import com.netsdk.lib.callback.impl.DefaultHaveReconnectCallBack; -import com.netsdk.lib.enumeration.ENUMERROR; import com.netsdk.module.entity.DeviceInfo; +import com.sun.jna.Pointer; +import com.sun.jna.Structure; +import com.sun.jna.ptr.IntByReference; + +import java.io.UnsupportedEncodingException; /** * 登陆接口实现 * 主要有 ：初始化、登陆、登出功能 */ public class LoginModule { - /** - * \if ENGLISH_LANG - * Login Device - * \else - * 登录设备 - * \endif - */ - public static boolean login(String m_strIp, int m_nPort, String m_strUser, String m_strPassword) { - BaseModule baseModule = new BaseModule(); - baseModule.init(DefaultDisconnectCallback.getINSTANCE(), DefaultHaveReconnectCallBack.getINSTANCE(), true); - DeviceInfo info = baseModule.login(m_strIp, m_nPort, m_strUser, m_strPassword); - if (info.getLoginHandler() != 0L) { - System.out.println("login success."); + /** + * \if ENGLISH_LANG + * Login Device + * \else + * 登录设备 + * \endif + */ + public static boolean login(String m_strIp, int m_nPort, String m_strUser, String m_strPassword) { + BaseModule baseModule = new BaseModule(); + baseModule.init(DefaultDisconnectCallback.getINSTANCE(), DefaultHaveReconnectCallBack.getINSTANCE(), true); + DeviceInfo info = baseModule.login(m_strIp, m_nPort, m_strUser, m_strPassword); + if (info.getLoginHandler() != 0L) { + System.out.println("login success."); - // 登出 + // 登出 // if (baseModule.logout(info.getLoginHandler())) { // System.out.println("logout success."); // } else { // System.out.println("logout failed.error is " + ENUMERROR.getErrorMessage()); // } - return true; - } + return true; + } - return false; - } + return false; + } + + public static boolean GetDevConfig(NetSDKLib netsdkapi, NetSDKLib.LLong hLoginHandle, int nChn, String strCmd, Structure cmdObject) { + boolean result = false; + IntByReference error = new IntByReference(0); + IntByReference retLen = new IntByReference(0); + int nBufferLen = 2097152; + byte[] strBuffer = new byte[nBufferLen]; + if (netsdkapi.CLIENT_GetNewDevConfig(hLoginHandle, strCmd, nChn, strBuffer, nBufferLen, error, 5000, (Pointer) null)) { + cmdObject.write(); + if (NetSDKLib.CONFIG_INSTANCE.CLIENT_ParseData(strCmd, strBuffer, cmdObject.getPointer(), cmdObject.size(), retLen.getPointer())) { + cmdObject.read(); + result = true; + } else { + System.err.println("Parse " + strCmd + " Config Failed!" + getErrorCode()); + result = false; + } + } else { + System.err.printf("Get %s Config Failed!Last Error = %x\n", strCmd, netsdkapi.CLIENT_GetLastError()); + result = false; + } + + String strOut = (new String(strBuffer)).trim(); + System.out.println("Get:" + strOut); + return result; + } + + public static String getErrorCode() { + return " { error code: ( 0x80000000|" + (NetSDKLib.NETSDK_INSTANCE.CLIENT_GetLastError() & 2147483647) + " ). 参考 LastError.java }"; + } + + public static void main(String[] args) { + System.out.println(LoginModule.login("192.168.83.171", 37777, "admin", "admin123")); + } } diff --git a/.gitignore b/.gitignore index d0ce846..0f36585 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ logs/ **/hiklib/** *.iml +**/sdk_log/** diff --git a/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/LoginModule.java b/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/LoginModule.java index 546535c..58c5a94 100644 --- a/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/LoginModule.java +++ b/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/LoginModule.java @@ -4,37 +4,74 @@ import com.netsdk.lib.ToolKits; import com.netsdk.lib.callback.impl.DefaultDisconnectCallback; import com.netsdk.lib.callback.impl.DefaultHaveReconnectCallBack; -import com.netsdk.lib.enumeration.ENUMERROR; import com.netsdk.module.entity.DeviceInfo; +import com.sun.jna.Pointer; +import com.sun.jna.Structure; +import com.sun.jna.ptr.IntByReference; + +import java.io.UnsupportedEncodingException; /** * 登陆接口实现 * 主要有 ：初始化、登陆、登出功能 */ public class LoginModule { - /** - * \if ENGLISH_LANG - * Login Device - * \else - * 登录设备 - * \endif - */ - public static boolean login(String m_strIp, int m_nPort, String m_strUser, String m_strPassword) { - BaseModule baseModule = new BaseModule(); - baseModule.init(DefaultDisconnectCallback.getINSTANCE(), DefaultHaveReconnectCallBack.getINSTANCE(), true); - DeviceInfo info = baseModule.login(m_strIp, m_nPort, m_strUser, m_strPassword); - if (info.getLoginHandler() != 0L) { - System.out.println("login success."); + /** + * \if ENGLISH_LANG + * Login Device + * \else + * 登录设备 + * \endif + */ + public static boolean login(String m_strIp, int m_nPort, String m_strUser, String m_strPassword) { + BaseModule baseModule = new BaseModule(); + baseModule.init(DefaultDisconnectCallback.getINSTANCE(), DefaultHaveReconnectCallBack.getINSTANCE(), true); + DeviceInfo info = baseModule.login(m_strIp, m_nPort, m_strUser, m_strPassword); + if (info.getLoginHandler() != 0L) { + System.out.println("login success."); - // 登出 + // 登出 // if (baseModule.logout(info.getLoginHandler())) { // System.out.println("logout success."); // } else { // System.out.println("logout failed.error is " + ENUMERROR.getErrorMessage()); // } - return true; - } + return true; + } - return false; - } + return false; + } + + public static boolean GetDevConfig(NetSDKLib netsdkapi, NetSDKLib.LLong hLoginHandle, int nChn, String strCmd, Structure cmdObject) { + boolean result = false; + IntByReference error = new IntByReference(0); + IntByReference retLen = new IntByReference(0); + int nBufferLen = 2097152; + byte[] strBuffer = new byte[nBufferLen]; + if (netsdkapi.CLIENT_GetNewDevConfig(hLoginHandle, strCmd, nChn, strBuffer, nBufferLen, error, 5000, (Pointer) null)) { + cmdObject.write(); + if (NetSDKLib.CONFIG_INSTANCE.CLIENT_ParseData(strCmd, strBuffer, cmdObject.getPointer(), cmdObject.size(), retLen.getPointer())) { + cmdObject.read(); + result = true; + } else { + System.err.println("Parse " + strCmd + " Config Failed!" + getErrorCode()); + result = false; + } + } else { + System.err.printf("Get %s Config Failed!Last Error = %x\n", strCmd, netsdkapi.CLIENT_GetLastError()); + result = false; + } + + String strOut = (new String(strBuffer)).trim(); + System.out.println("Get:" + strOut); + return result; + } + + public static String getErrorCode() { + return " { error code: ( 0x80000000|" + (NetSDKLib.NETSDK_INSTANCE.CLIENT_GetLastError() & 2147483647) + " ). 参考 LastError.java }"; + } + + public static void main(String[] args) { + System.out.println(LoginModule.login("192.168.83.171", 37777, "admin", "admin123")); + } } diff --git a/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/Test.java b/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/Test.java index a4bd2fb..a154e06 100644 --- a/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/Test.java +++ b/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/Test.java @@ -1,7 +1,11 @@ package com.netsdk.module; +import java.util.List; + public class Test { public static void main(String[] args) { - +// List channelNames = ChannelModule.getAllChannelName("192.168.83.171", 37777, "admin", "admin123"); +// ChannelModule.getAllChannel("192.168.83.171", 37777, "admin", "admin123"); + ChannelModule.CLIENT_QueryRemotDevState("192.168.83.171", 37777, "admin", "admin123"); } } diff --git a/.gitignore b/.gitignore index d0ce846..0f36585 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ logs/ **/hiklib/** *.iml +**/sdk_log/** diff --git a/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/LoginModule.java b/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/LoginModule.java index 546535c..58c5a94 100644 --- a/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/LoginModule.java +++ b/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/LoginModule.java @@ -4,37 +4,74 @@ import com.netsdk.lib.ToolKits; import com.netsdk.lib.callback.impl.DefaultDisconnectCallback; import com.netsdk.lib.callback.impl.DefaultHaveReconnectCallBack; -import com.netsdk.lib.enumeration.ENUMERROR; import com.netsdk.module.entity.DeviceInfo; +import com.sun.jna.Pointer; +import com.sun.jna.Structure; +import com.sun.jna.ptr.IntByReference; + +import java.io.UnsupportedEncodingException; /** * 登陆接口实现 * 主要有 ：初始化、登陆、登出功能 */ public class LoginModule { - /** - * \if ENGLISH_LANG - * Login Device - * \else - * 登录设备 - * \endif - */ - public static boolean login(String m_strIp, int m_nPort, String m_strUser, String m_strPassword) { - BaseModule baseModule = new BaseModule(); - baseModule.init(DefaultDisconnectCallback.getINSTANCE(), DefaultHaveReconnectCallBack.getINSTANCE(), true); - DeviceInfo info = baseModule.login(m_strIp, m_nPort, m_strUser, m_strPassword); - if (info.getLoginHandler() != 0L) { - System.out.println("login success."); + /** + * \if ENGLISH_LANG + * Login Device + * \else + * 登录设备 + * \endif + */ + public static boolean login(String m_strIp, int m_nPort, String m_strUser, String m_strPassword) { + BaseModule baseModule = new BaseModule(); + baseModule.init(DefaultDisconnectCallback.getINSTANCE(), DefaultHaveReconnectCallBack.getINSTANCE(), true); + DeviceInfo info = baseModule.login(m_strIp, m_nPort, m_strUser, m_strPassword); + if (info.getLoginHandler() != 0L) { + System.out.println("login success."); - // 登出 + // 登出 // if (baseModule.logout(info.getLoginHandler())) { // System.out.println("logout success."); // } else { // System.out.println("logout failed.error is " + ENUMERROR.getErrorMessage()); // } - return true; - } + return true; + } - return false; - } + return false; + } + + public static boolean GetDevConfig(NetSDKLib netsdkapi, NetSDKLib.LLong hLoginHandle, int nChn, String strCmd, Structure cmdObject) { + boolean result = false; + IntByReference error = new IntByReference(0); + IntByReference retLen = new IntByReference(0); + int nBufferLen = 2097152; + byte[] strBuffer = new byte[nBufferLen]; + if (netsdkapi.CLIENT_GetNewDevConfig(hLoginHandle, strCmd, nChn, strBuffer, nBufferLen, error, 5000, (Pointer) null)) { + cmdObject.write(); + if (NetSDKLib.CONFIG_INSTANCE.CLIENT_ParseData(strCmd, strBuffer, cmdObject.getPointer(), cmdObject.size(), retLen.getPointer())) { + cmdObject.read(); + result = true; + } else { + System.err.println("Parse " + strCmd + " Config Failed!" + getErrorCode()); + result = false; + } + } else { + System.err.printf("Get %s Config Failed!Last Error = %x\n", strCmd, netsdkapi.CLIENT_GetLastError()); + result = false; + } + + String strOut = (new String(strBuffer)).trim(); + System.out.println("Get:" + strOut); + return result; + } + + public static String getErrorCode() { + return " { error code: ( 0x80000000|" + (NetSDKLib.NETSDK_INSTANCE.CLIENT_GetLastError() & 2147483647) + " ). 参考 LastError.java }"; + } + + public static void main(String[] args) { + System.out.println(LoginModule.login("192.168.83.171", 37777, "admin", "admin123")); + } } diff --git a/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/Test.java b/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/Test.java index a4bd2fb..a154e06 100644 --- a/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/Test.java +++ b/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/Test.java @@ -1,7 +1,11 @@ package com.netsdk.module; +import java.util.List; + public class Test { public static void main(String[] args) { - +// List channelNames = ChannelModule.getAllChannelName("192.168.83.171", 37777, "admin", "admin123"); +// ChannelModule.getAllChannel("192.168.83.171", 37777, "admin", "admin123"); + ChannelModule.CLIENT_QueryRemotDevState("192.168.83.171", 37777, "admin", "admin123"); } } diff --git a/casic-video-sdk/casic-video-sdk-hik/pom.xml b/casic-video-sdk/casic-video-sdk-hik/pom.xml index 88707e6..735cc24 100644 --- a/casic-video-sdk/casic-video-sdk-hik/pom.xml +++ b/casic-video-sdk/casic-video-sdk-hik/pom.xml @@ -29,6 +29,11 @@ 4.1.36.Final + io.swagger + swagger-models + 1.6.0 + + com.casic casic-admin-support ${admin.version} @@ -46,16 +51,17 @@ ${boot.version} provided - - net.java.dev.jna - jna - ${jna.version} - + com.sun.jna.examples jna 3.0.0 + + net.java.dev.jna + jna + ${jna.version} + diff --git a/.gitignore b/.gitignore index d0ce846..0f36585 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ logs/ **/hiklib/** *.iml +**/sdk_log/** diff --git a/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/LoginModule.java b/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/LoginModule.java index 546535c..58c5a94 100644 --- a/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/LoginModule.java +++ b/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/LoginModule.java @@ -4,37 +4,74 @@ import com.netsdk.lib.ToolKits; import com.netsdk.lib.callback.impl.DefaultDisconnectCallback; import com.netsdk.lib.callback.impl.DefaultHaveReconnectCallBack; -import com.netsdk.lib.enumeration.ENUMERROR; import com.netsdk.module.entity.DeviceInfo; +import com.sun.jna.Pointer; +import com.sun.jna.Structure; +import com.sun.jna.ptr.IntByReference; + +import java.io.UnsupportedEncodingException; /** * 登陆接口实现 * 主要有 ：初始化、登陆、登出功能 */ public class LoginModule { - /** - * \if ENGLISH_LANG - * Login Device - * \else - * 登录设备 - * \endif - */ - public static boolean login(String m_strIp, int m_nPort, String m_strUser, String m_strPassword) { - BaseModule baseModule = new BaseModule(); - baseModule.init(DefaultDisconnectCallback.getINSTANCE(), DefaultHaveReconnectCallBack.getINSTANCE(), true); - DeviceInfo info = baseModule.login(m_strIp, m_nPort, m_strUser, m_strPassword); - if (info.getLoginHandler() != 0L) { - System.out.println("login success."); + /** + * \if ENGLISH_LANG + * Login Device + * \else + * 登录设备 + * \endif + */ + public static boolean login(String m_strIp, int m_nPort, String m_strUser, String m_strPassword) { + BaseModule baseModule = new BaseModule(); + baseModule.init(DefaultDisconnectCallback.getINSTANCE(), DefaultHaveReconnectCallBack.getINSTANCE(), true); + DeviceInfo info = baseModule.login(m_strIp, m_nPort, m_strUser, m_strPassword); + if (info.getLoginHandler() != 0L) { + System.out.println("login success."); - // 登出 + // 登出 // if (baseModule.logout(info.getLoginHandler())) { // System.out.println("logout success."); // } else { // System.out.println("logout failed.error is " + ENUMERROR.getErrorMessage()); // } - return true; - } + return true; + } - return false; - } + return false; + } + + public static boolean GetDevConfig(NetSDKLib netsdkapi, NetSDKLib.LLong hLoginHandle, int nChn, String strCmd, Structure cmdObject) { + boolean result = false; + IntByReference error = new IntByReference(0); + IntByReference retLen = new IntByReference(0); + int nBufferLen = 2097152; + byte[] strBuffer = new byte[nBufferLen]; + if (netsdkapi.CLIENT_GetNewDevConfig(hLoginHandle, strCmd, nChn, strBuffer, nBufferLen, error, 5000, (Pointer) null)) { + cmdObject.write(); + if (NetSDKLib.CONFIG_INSTANCE.CLIENT_ParseData(strCmd, strBuffer, cmdObject.getPointer(), cmdObject.size(), retLen.getPointer())) { + cmdObject.read(); + result = true; + } else { + System.err.println("Parse " + strCmd + " Config Failed!" + getErrorCode()); + result = false; + } + } else { + System.err.printf("Get %s Config Failed!Last Error = %x\n", strCmd, netsdkapi.CLIENT_GetLastError()); + result = false; + } + + String strOut = (new String(strBuffer)).trim(); + System.out.println("Get:" + strOut); + return result; + } + + public static String getErrorCode() { + return " { error code: ( 0x80000000|" + (NetSDKLib.NETSDK_INSTANCE.CLIENT_GetLastError() & 2147483647) + " ). 参考 LastError.java }"; + } + + public static void main(String[] args) { + System.out.println(LoginModule.login("192.168.83.171", 37777, "admin", "admin123")); + } } diff --git a/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/Test.java b/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/Test.java index a4bd2fb..a154e06 100644 --- a/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/Test.java +++ b/casic-video-sdk/casic-video-sdk-dh/src/main/java/com/netsdk/module/Test.java @@ -1,7 +1,11 @@ package com.netsdk.module; +import java.util.List; + public class Test { public static void main(String[] args) { - +// List channelNames = ChannelModule.getAllChannelName("192.168.83.171", 37777, "admin", "admin123"); +// ChannelModule.getAllChannel("192.168.83.171", 37777, "admin", "admin123"); + ChannelModule.CLIENT_QueryRemotDevState("192.168.83.171", 37777, "admin", "admin123"); } } diff --git a/casic-video-sdk/casic-video-sdk-hik/pom.xml b/casic-video-sdk/casic-video-sdk-hik/pom.xml index 88707e6..735cc24 100644 --- a/casic-video-sdk/casic-video-sdk-hik/pom.xml +++ b/casic-video-sdk/casic-video-sdk-hik/pom.xml @@ -29,6 +29,11 @@ 4.1.36.Final + io.swagger + swagger-models + 1.6.0 + + com.casic casic-admin-support ${admin.version} @@ -46,16 +51,17 @@ ${boot.version} provided - - net.java.dev.jna - jna - ${jna.version} - + com.sun.jna.examples jna 3.0.0 + + net.java.dev.jna + jna + ${jna.version} + diff --git a/casic-video-sdk/casic-video-sdk-hik/src/main/java/com/casic/missiles/modular/video/service/impl/HCNetServiceImpl.java b/casic-video-sdk/casic-video-sdk-hik/src/main/java/com/casic/missiles/modular/video/service/impl/HCNetServiceImpl.java index 0d432a4..d62681d 100644 --- a/casic-video-sdk/casic-video-sdk-hik/src/main/java/com/casic/missiles/modular/video/service/impl/HCNetServiceImpl.java +++ b/casic-video-sdk/casic-video-sdk-hik/src/main/java/com/casic/missiles/modular/video/service/impl/HCNetServiceImpl.java @@ -242,7 +242,7 @@ int sum = (0x01 + 0x00 + 0x08 + 0x00 + speed) % 0x100; int[] command = {0xff, 0x01, 0x00, 0x08, 0x00, speed, sum}; Pointer pointer = intArrayToPointer(command); - return serialSend(serialHandle, pointer, (int) ((Memory) pointer).getSize()); + return serialSend(serialHandle, pointer, (int) ((Memory) pointer).size()); } /** @@ -256,42 +256,42 @@ int sum = (0x01 + 0x00 + 0x10 + 0x00 + speed) % 0x100; int[] command = {0xff, 0x01, 0x00, 0x10, 0x00, speed, sum}; Pointer pointer = intArrayToPointer(command); - return serialSend(serialHandle, pointer, (int) ((Memory) pointer).getSize()); + return serialSend(serialHandle, pointer, (int) ((Memory) pointer).size()); } private boolean sendLeftCommand(Long serialHandle, int speed) { int sum = (0x01 + 0x00 + 0x04 + speed + 0x00) % 0x100; int[] command = {0xff, 0x01, 0x00, 0x04, speed, 0x00, sum}; Pointer pointer = intArrayToPointer(command); - return serialSend(serialHandle, pointer, (int) ((Memory) pointer).getSize()); + return serialSend(serialHandle, pointer, (int) ((Memory) pointer).size()); } private boolean sendRightCommand(Long serialHandle, int speed) { int sum = (0x01 + 0x00 + 0x02 + speed + 0x00) % 0x100; int[] command = {0xff, 0x01, 0x00, 0x02, speed, 0x00, sum}; Pointer pointer = intArrayToPointer(command); - return serialSend(serialHandle, pointer, (int) ((Memory) pointer).getSize()); + return serialSend(serialHandle, pointer, (int) ((Memory) pointer).size()); } private boolean sendStopCommand(Long serialHandle) { int sum = (0x01 + 0x00 + 0x00 + 0x00 + 0x00) % 0x100; int[] command = {0xff, 0x01, 0x00, 0x00, 0x00, 0x00, sum}; Pointer pointer = intArrayToPointer(command); - return serialSend(serialHandle, pointer, (int) ((Memory) pointer).getSize()); + return serialSend(serialHandle, pointer, (int) ((Memory) pointer).size()); } private boolean sendStartCleanCommand(Long serialHandle) { int sum = (0x01 + 0x00 + 0x09 + 0x00 + 0x01) % 0x100; int[] command = {0xff, 0x01, 0x00, 0x09, 0x00, 0x01, sum}; Pointer pointer = intArrayToPointer(command); - return serialSend(serialHandle, pointer, (int) ((Memory) pointer).getSize()); + return serialSend(serialHandle, pointer, (int) ((Memory) pointer).size()); } private boolean sendStopCleanCommand(Long serialHandle) { int sum = (0x01 + 0x00 + 0x0b + 0x00 + 0x01) % 0x100; int[] command = {0xff, 0x01, 0x00, 0x0b, 0x00, 0x01, sum}; Pointer pointer = intArrayToPointer(command); - return serialSend(serialHandle, pointer, (int) ((Memory) pointer).getSize()); + return serialSend(serialHandle, pointer, (int) ((Memory) pointer).size()); } @@ -300,7 +300,7 @@ int sum = (0x01 + 0x00 + 0x03 + index / 256 + index % 256) % 0x100; int[] command = {0xff, 0x01, 0x00, 0x03, index / 256, index % 256, sum}; Pointer pointer = intArrayToPointer(command); - return serialSend(serialHandle, pointer, (int) ((Memory) pointer).getSize()); + return serialSend(serialHandle, pointer, (int) ((Memory) pointer).size()); } //插入预置位 @@ -308,7 +308,7 @@ int sum = (0x01 + 0x80 + 0x03 + index / 256 + index % 256) % 0x100; int[] command = {0xff, 0x01, 0x08, 0x03, index / 256, index % 256, sum}; Pointer pointer = intArrayToPointer(command); - return serialSend(serialHandle, pointer, (int) ((Memory) pointer).getSize()); + return serialSend(serialHandle, pointer, (int) ((Memory) pointer).size()); } //调用预置位 @@ -316,7 +316,7 @@ int sum = (0x01 + 0x00 + 0x07 + index / 256 + index % 256) % 0x100; int[] command = {0xff, 0x01, 0x00, 0x07, index / 256, index % 256, sum}; Pointer pointer = intArrayToPointer(command); - return serialSend(serialHandle, pointer, (int) ((Memory) pointer).getSize()); + return serialSend(serialHandle, pointer, (int) ((Memory) pointer).size()); } //删除预置位 @@ -324,7 +324,7 @@ int sum = (0x01 + 0x00 + 0x05 + index / 256 + index % 256) % 0x100; int[] command = {0xff, 0x01, 0x00, 0x05, index / 256, index % 256, sum}; Pointer pointer = intArrayToPointer(command); - return serialSend(serialHandle, pointer, (int) ((Memory) pointer).getSize()); + return serialSend(serialHandle, pointer, (int) ((Memory) pointer).size()); } @@ -339,7 +339,7 @@ int sum = (0x01 + 0x00 + 0x93 + index + 0x00) % 0x100; int[] command = {0xff, 0x01, 0x00, 0x93, index, 0x00, sum}; Pointer pointer = intArrayToPointer(command); - return serialSend(serialHandle, pointer, (int) ((Memory) pointer).getSize()); + return serialSend(serialHandle, pointer, (int) ((Memory) pointer).size()); } @@ -354,7 +354,7 @@ int sum = (0x01 + 0x00 + 0x94 + index + 0x00) % 0x100; int[] command = {0xff, 0x01, 0x00, 0x94, index, 0x00, sum}; Pointer pointer = intArrayToPointer(command); - return serialSend(serialHandle, pointer, (int) ((Memory) pointer).getSize()); + return serialSend(serialHandle, pointer, (int) ((Memory) pointer).size()); } @@ -369,7 +369,7 @@ int sum = (0x01 + 0x00 + 0x95 + index + 0x00) % 0x100; int[] command = {0xff, 0x01, 0x00, 0x95, index, 0x00, sum}; Pointer pointer = intArrayToPointer(command); - return serialSend(serialHandle, pointer, (int) ((Memory) pointer).getSize()); + return serialSend(serialHandle, pointer, (int) ((Memory) pointer).size()); } @@ -388,7 +388,7 @@ int sum = (0x01 + 0x00 + 0x96 + index / 256 + index % 256 + stopTime + speed + alarmValue / 100) % 0x100; int[] command = {0xff, 0x01, 0x00, 0x96, index / 256, index % 256, stopTime, speed, alarmValue / 100, sum}; Pointer pointer = intArrayToPointer(command); - return serialSend(serialHandle, pointer, (int) ((Memory) pointer).getSize()); + return serialSend(serialHandle, pointer, (int) ((Memory) pointer).size()); } @@ -397,7 +397,7 @@ int sum = (0x01 + 0x00 + 0x97 + index + 0x00) % 0x100; int[] command = {0xff, 0x01, 0x00, 0x97, index, 0x00, sum}; Pointer pointer = intArrayToPointer(command); - return serialSend(serialHandle, pointer, (int) ((Memory) pointer).getSize()); + return serialSend(serialHandle, pointer, (int) ((Memory) pointer).size()); } //一键巡检速度设置FF add 00 99 XX 00 SUM,add需要实时读取 @@ -405,7 +405,7 @@ int sum = (0x01 + 0x00 + 0x99 + index + 0x00) % 0x100; int[] command = {0xff, 0x01, 0x00, 0x99, index, 0x00, sum}; Pointer pointer = intArrayToPointer(command); - return serialSend(serialHandle, pointer, (int) ((Memory) pointer).getSize()); + return serialSend(serialHandle, pointer, (int) ((Memory) pointer).size()); } //一键巡检驻留时间设置FF add 00 9A XX 00 SUM,add需要实时读取 @@ -413,7 +413,7 @@ int sum = (0x01 + 0x00 + 0x9A + index + 0x00) % 0x100; int[] command = {0xff, 0x01, 0x00, 0x9A, index, 0x00, sum}; Pointer pointer = intArrayToPointer(command); - return serialSend(serialHandle, pointer, (int) ((Memory) pointer).getSize()); + return serialSend(serialHandle, pointer, (int) ((Memory) pointer).size()); } //打开指示激光指令格式：FF add 00 91 01 00 SUM @@ -422,7 +422,7 @@ int sum = (0x01 + 0x00 + 0x91 + index + 0x00) % 0x100; int[] command = {0xff, 0x01, 0x00, 0x91, index, 0x00, sum}; Pointer pointer = intArrayToPointer(command); - return serialSend(serialHandle, pointer, (int) ((Memory) pointer).getSize()); + return serialSend(serialHandle, pointer, (int) ((Memory) pointer).size()); } //打开本地报警指令格式：FF add 00 90 02 00 SUM @@ -431,7 +431,7 @@ int sum = (0x01 + 0x00 + 0x90 + index + 0x00) % 0x100; int[] command = {0xff, 0x01, 0x00, 0x90, index, 0x00, sum}; Pointer pointer = intArrayToPointer(command); - return serialSend(serialHandle, pointer, (int) ((Memory) pointer).getSize()); + return serialSend(serialHandle, pointer, (int) ((Memory) pointer).size()); } //设备标定指令FF add 00 92 01 00 SUM,add需要实时读取 @@ -439,7 +439,7 @@ int sum = (index + 0x00 + 0x92 + 0x01 + 0x00) % 0x100; int[] command = {0xff, index, 0x00, 0x92, 0x01, 0x00, sum}; Pointer pointer = intArrayToPointer(command); - return serialSend(serialHandle, pointer, (int) ((Memory) pointer).getSize()); + return serialSend(serialHandle, pointer, (int) ((Memory) pointer).size()); } //宇视通 软复位 add 00 9C 00 00 SUM,add需要实时读取 @@ -447,7 +447,7 @@ int sum = (0x01 + 0x00 + 0x9C + 0x00 + 0x00) % 0x100; int[] command = {0xff, 0x01, 0x00, 0x9C, 0x00, 0x00, sum}; Pointer pointer = intArrayToPointer(command); - return serialSend(serialHandle, pointer, (int) ((Memory) pointer).getSize()); + return serialSend(serialHandle, pointer, (int) ((Memory) pointer).size()); } @Override @@ -806,8 +806,8 @@ int[] verticalCommand = {0xff, 0x01, 0x00, 0x53, 0x00, 0x00, 0x54}; Pointer horizontalPointer = intArrayToPointer(horizontalCommand); Pointer verticalPointer = intArrayToPointer(verticalCommand); - boolean hres = serialSend(serialHandle, horizontalPointer, (int) ((Memory) horizontalPointer).getSize()); - boolean vres = serialSend(serialHandle, verticalPointer, (int) ((Memory) verticalPointer).getSize()); + boolean hres = serialSend(serialHandle, horizontalPointer, (int) ((Memory) horizontalPointer).size()); + boolean vres = serialSend(serialHandle, verticalPointer, (int) ((Memory) verticalPointer).size()); return hres & vres; } @@ -853,14 +853,14 @@ Pointer horizontalPointer = intArrayToPointer(horizontalCommand); Pointer verticalPointer = intArrayToPointer(verticalCommand); logger.info("serical send horizon " + horizontalAngle); - boolean hres = serialSend(serialHandle, horizontalPointer, (int) ((Memory) horizontalPointer).getSize()); + boolean hres = serialSend(serialHandle, horizontalPointer, (int) ((Memory) horizontalPointer).size()); try { Thread.sleep(30); } catch (InterruptedException e) { e.printStackTrace(); } logger.info("serical send vertical " + verticalAngle); - boolean vres = serialSend(serialHandle, verticalPointer, (int) ((Memory) verticalPointer).getSize()); + boolean vres = serialSend(serialHandle, verticalPointer, (int) ((Memory) verticalPointer).size()); return hres & vres; } @@ -887,7 +887,7 @@ int[] Command = {0xff, 0x01, 0x00, 0x4c, hData1, hData2, vData1, vData2, vSum}; Pointer verticalPointer = intArrayToPointer(Command); logger.info("serical send horizon " + horizontalAngle + "-->serical send vertical " + verticalAngle); - return serialSend(serialHandle, verticalPointer, (int) ((Memory) verticalPointer).getSize()); + return serialSend(serialHandle, verticalPointer, (int) ((Memory) verticalPointer).size()); }