升级jar包到2.0.5

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.yzx.hardware-access</groupId>
     <artifactId>hardware-access</artifactId>
-    <version>2.0.4</version>
+    <version>2.0.5</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

src/main/java/com/yzx/Main.java

@@ -25,7 +25,7 @@ public class Main {
         //3.如果文件上传失败,需要重试,如果失败了,先存在本地,利用数据库的id作为标识,写一个定时任务,重新更新和上传.
 
         new Thread(() -> {
-            IHardwareEquipment hardwareEquipment1 = new HKVersion(new HardwareEquipmentInfo("192.168.69.64",(short) 8000,"admin","yzx123456.",alarmCallback),true);
+            IHardwareEquipment hardwareEquipment1 = new HKVersion(new HardwareEquipmentInfo("192.168.69.64",(short) 8000,"admin","yzx123456.",alarmCallback),true,0);
             while (true){}
 //            if(hardwareEquipment1.getStatus() ==  1){
 //                String deployInfo1 = hardwareEquipment1.getDeployInfo();

src/main/java/com/yzx/impl/HKVersion.java

@@ -43,16 +43,16 @@ public class HKVersion implements IHardwareEquipment {
         hCNetSDK.NET_DVR_SetLogToFile(3, "../sdklog", false);
     }
     private HardwareEquipmentInfo info;
-    public HKVersion(HardwareEquipmentInfo info,boolean deploy){
+    public HKVersion(HardwareEquipmentInfo info,boolean deploy,int deployType){
         this.info = info;
         if(deploy){
-            this.alarm(info.getAlarmCallback());
+            this.alarm(info.getAlarmCallback(),deployType);
         }else{
             this.Login_V40(this.info.getIp(),this.info.getPort(),this.info.getUsername(),this.info.getPassword());
         }
     }
 
-    private void alarm(AlarmCallback callback){
+    private void alarm(AlarmCallback callback,int deployType){
         //设置报警回调函数
         if (fMSFCallBack_V31 == null) {
             fMSFCallBack_V31 = new FMSGCallBack_V31(callback);
@@ -75,10 +75,10 @@ public class HKVersion implements IHardwareEquipment {
         Pointer pStrNET_DVR_LOCAL_GENERAL_CFG = struNET_DVR_LOCAL_GENERAL_CFG.getPointer();
         hCNetSDK.NET_DVR_SetSDKLocalCfg(17, pStrNET_DVR_LOCAL_GENERAL_CFG);
         this.Login_V40(info.getIp(), info.getPort(), info.getUsername(), info.getPassword());  //登录设备
-        this.SetAlarm();//报警布防，和报警监听二选一即可
+        this.SetAlarm(deployType);//报警布防，和报警监听二选一即可
     }
 
-    private void SetAlarm() {
+    private void SetAlarm(int deployType) {
         if (lAlarmHandle < 0)//尚未布防,需要布防
         {
             //报警布防参数设置
@@ -86,7 +86,7 @@ public class HKVersion implements IHardwareEquipment {
             m_strAlarmInfo.dwSize = m_strAlarmInfo.size();
             m_strAlarmInfo.byLevel = 0;  //布防等级
             m_strAlarmInfo.byAlarmInfoType = 1;   // 智能交通报警信息上传类型：0- 老报警信息（NET_DVR_PLATE_RESULT），1- 新报警信息(NET_ITS_PLATE_RESULT)
-            m_strAlarmInfo.byDeployType = 0;   //布防类型：0-客户端布防，1-实时布防
+            m_strAlarmInfo.byDeployType = (byte)deployType;   //布防类型：0-客户端布防，1-实时布防
             m_strAlarmInfo.write();
             lAlarmHandle = hCNetSDK.NET_DVR_SetupAlarmChan_V41(lUserID, m_strAlarmInfo);
             System.out.println("lAlarmHandle: " + lAlarmHandle);