From 566ddb2ea03e2514de50f2ca861a2674f6e840ac Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期一, 27 十一月 2023 13:32:27 +0800
Subject: [PATCH] 新增科技系统、门锁、新风和地暖支持
---
HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLDeviceManger/Bean/AppliancesInfo.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLDeviceManger/Bean/AppliancesInfo.java b/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLDeviceManger/Bean/AppliancesInfo.java
index 1568fae..63dd7a8 100644
--- a/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLDeviceManger/Bean/AppliancesInfo.java
+++ b/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLDeviceManger/Bean/AppliancesInfo.java
@@ -203,13 +203,12 @@
// }
public String getDeviceKey() {
- if (deviceKey == null) {
- deviceKey = "K" + this.bigType
- + "-" + this.littleType
- + "-" + this.deviceSubnetID
- + "-" + this.deviceDeviceID
- + "-" + this.channelNum;
- }
+ deviceKey = this.bigType
+ + "-" + this.littleType
+ + "-" + this.deviceSubnetID
+ + "-" + this.deviceDeviceID
+ + "-" + this.channelNum;
+
return deviceKey;
}
@@ -223,10 +222,10 @@
"deviceName='" + deviceName + '\'' +
", bigType=" + bigType +
", littleType=" + littleType +
- ", ctrlCommand=" + ctrlCommand +
- ", ctrlBackCommand=" + ctrlBackCommand +
- ", stateCommand=" + stateCommand +
- ", stateBackCommand=" + stateBackCommand +
+ ", ctrlCommand=" + Integer.toHexString(ctrlCommand) +
+ ", ctrlBackCommand=" + Integer.toHexString(ctrlBackCommand) +
+ ", stateCommand=" + Integer.toHexString(stateCommand) +
+ ", stateBackCommand=" + Integer.toHexString(stateBackCommand) +
", channelNum=" + channelNum +
", deviceSubnetID=" + deviceSubnetID +
", deviceDeviceID=" + deviceDeviceID +
--
Gitblit v1.8.0