From 4aaab689ed4e94dd9e34ec22c661b3227befe8a8 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 27 四月 2022 18:25:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/A5LightTimerReqInnerFrame.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/A5LightTimerReqInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/A5LightTimerReqInnerFrame.java
index 24b0b51..5cc7f92 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/A5LightTimerReqInnerFrame.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/A5LightTimerReqInnerFrame.java
@@ -25,8 +25,13 @@
/**
* @param framePayload 澶氫釜璺伅瀹氭椂鎸囦护锛�
*/
- public A5LightTimerReqInnerFrame(String framePayload) {
- String destinationAddress = "FFFF";
+ public A5LightTimerReqInnerFrame(String framePayload, String lightAddress) {
+ String destinationAddress;
+ if (lightAddress == null || (!lightAddress.equals("0001") && !lightAddress.equals("0002"))) {
+ destinationAddress = "FFFF";
+ } else {
+ destinationAddress = lightAddress;
+ }
payload = destinationAddress + framePayload;
this.payloadLength = SupplementUtils.suppleZero(Integer.toHexString((payload.length() / 2)).toUpperCase(), 4);
}
--
Gitblit v1.9.3