From d80afe7ba1163f30d443f1e148ebb87a0fca064f Mon Sep 17 00:00:00 2001
From: haidong <chenloveguitar@qq.com>
Date: Fri, 18 Nov 2022 14:19:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=95=B0=E6=8D=AE=E8=A7=A3?=
 =?UTF-8?q?=E6=9E=90=E5=A4=84=E7=90=86=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: haidong <chenloveguitar@qq.com>
---
 src/main/java/com/hkversion/AlarmDataParse.java | 1 +
 src/main/java/com/yzx/Main.java                 | 5 ++++-
 src/main/java/com/yzx/pojo/AlarmDataInfo.java   | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/hkversion/AlarmDataParse.java b/src/main/java/com/hkversion/AlarmDataParse.java
index 8c35732..ffaf786 100644
--- a/src/main/java/com/hkversion/AlarmDataParse.java
+++ b/src/main/java/com/hkversion/AlarmDataParse.java
@@ -427,6 +427,7 @@ public class AlarmDataParse {
                 String year = Integer.toString(strACSInfo.struTime.dwYear);
                 String SwipeTime = year + strACSInfo.struTime.dwMonth + strACSInfo.struTime.dwDay + strACSInfo.struTime.dwHour + strACSInfo.struTime.dwMinute +
                         strACSInfo.struTime.dwSecond;
+                info.setAlarmTime(SwipeTime);
                 if (strACSInfo.dwPicDataLen > 0) {
                         //将字节写入文件
                         long offset = 0;
diff --git a/src/main/java/com/yzx/Main.java b/src/main/java/com/yzx/Main.java
index b8b45d2..899a0e2 100644
--- a/src/main/java/com/yzx/Main.java
+++ b/src/main/java/com/yzx/Main.java
@@ -1,6 +1,5 @@
 package com.yzx;
 
-import com.alibaba.fastjson.JSONObject;
 import com.yzx.callback.AlarmCallback;
 import com.yzx.impl.HKVersion;
 import com.yzx.impl.HardwareEquipmentInfo;
@@ -30,6 +29,8 @@ public class Main {
             if(hardwareEquipment1.getStatus() ==  1){
                 String deployInfo1 = hardwareEquipment1.getDeployInfo();
                 System.out.println("deployInfo = " + deployInfo1);
+                hardwareEquipmentList.add(hardwareEquipment1);
+                while(true){}
             }
         }).start();
 
@@ -38,6 +39,8 @@ public class Main {
             if(hardwareEquipment2.getStatus() == 1){
                 String deployInfo2 = hardwareEquipment2.getDeployInfo();
                 System.out.println("deployInfo = " + deployInfo2);
+                hardwareEquipmentList.add(hardwareEquipment2);
+                while(true){}
             }
         }).start();
     }
diff --git a/src/main/java/com/yzx/pojo/AlarmDataInfo.java b/src/main/java/com/yzx/pojo/AlarmDataInfo.java
index fde2fc5..8ec435d 100644
--- a/src/main/java/com/yzx/pojo/AlarmDataInfo.java
+++ b/src/main/java/com/yzx/pojo/AlarmDataInfo.java
@@ -16,4 +16,5 @@ public class AlarmDataInfo {
     private String serialNumber;
     private int serialNo;
     private int picTransType;
+    private String alarmTime;
 }