From c29162ba504fecb72ccbc90353b0b64512980c1c Mon Sep 17 00:00:00 2001 From: haidong Date: Wed, 11 Oct 2023 12:07:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=A7=E5=8D=8E=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: haidong --- src/main/java/com/yzx/impl/DaHua.java | 8 +++++++- src/main/java/com/yzx/impl/HardwareEquipmentInfo.java | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/yzx/impl/DaHua.java b/src/main/java/com/yzx/impl/DaHua.java index 77163a3..502fa22 100644 --- a/src/main/java/com/yzx/impl/DaHua.java +++ b/src/main/java/com/yzx/impl/DaHua.java @@ -58,7 +58,7 @@ public class DaHua implements IHardwareEquipment { public DaHua(HardwareEquipmentInfo info){ this.info = info; - this.login(); +// this.login(); } public boolean downloadPersonPic(String szFileName, String pszFileDst) { @@ -448,7 +448,13 @@ public class DaHua implements IHardwareEquipment { } } + public HardwareEquipmentInfo getInfo(){ + return this.info; + } + public void setInfo(HardwareEquipmentInfo info){ + this.info = info; + } @Override public void cleanup() { diff --git a/src/main/java/com/yzx/impl/HardwareEquipmentInfo.java b/src/main/java/com/yzx/impl/HardwareEquipmentInfo.java index c950ac7..b222e40 100644 --- a/src/main/java/com/yzx/impl/HardwareEquipmentInfo.java +++ b/src/main/java/com/yzx/impl/HardwareEquipmentInfo.java @@ -5,11 +5,14 @@ import com.yzx.callback.AlarmCallback; import lombok.AllArgsConstructor; import lombok.Data; +import java.io.Serializable; + /** * 设备信息,包含ip,端口,用户名,密码等信息 */ @Data -public class HardwareEquipmentInfo { +public class HardwareEquipmentInfo implements Serializable { + private String ip; private short port; private String username;