diff --git a/src/main/java/com/yzx/impl/HKVersion.java b/src/main/java/com/yzx/impl/HKVersion.java index ab37620..1f22769 100644 --- a/src/main/java/com/yzx/impl/HKVersion.java +++ b/src/main/java/com/yzx/impl/HKVersion.java @@ -42,6 +42,11 @@ public class HKVersion implements IHardwareEquipment { /**加载日志*/ hCNetSDK.NET_DVR_SetLogToFile(3, "../sdklog", false); } + + public HardwareEquipmentInfo getHardwareEquipmentInfo() { + return info; + } + private HardwareEquipmentInfo info; public HKVersion(HardwareEquipmentInfo info,boolean deploy){ this.info = info; @@ -103,7 +108,7 @@ public class HKVersion implements IHardwareEquipment { } } - private void closeAlarm() { + public void closeAlarm() { if (lAlarmHandle < 0)//尚未布防,需要布防 { //报警布防参数设置 @@ -116,10 +121,10 @@ public class HKVersion implements IHardwareEquipment { lAlarmHandle = hCNetSDK.NET_DVR_SetupAlarmChan_V41(lUserID, m_strAlarmInfo); System.out.println("lAlarmHandle: " + lAlarmHandle); if (lAlarmHandle == -1) { - System.out.println("布防失败,错误码为" + hCNetSDK.NET_DVR_GetLastError()); + System.out.println("撤防失败,错误码为" + hCNetSDK.NET_DVR_GetLastError()); return; } else { - System.out.println("布防成功"); + System.out.println("撤防成功"); } } else {