From b531004a3cbd33d7bb9f5b7dce06ddd4f5e7ec9a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 18 十一月 2022 11:57:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xm-20221107' into xm-20221107
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/A5LightTimerReqInnerFrame.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 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..c821ef3 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
@@ -18,22 +18,30 @@
*/
public class A5LightTimerReqInnerFrame implements IRequestInnerFrame {
- private final String payload;
- private final String functionCode = A5LightDataEnum.LightTimer.getCode();
- private final String payloadLength;
+ private String payload;
/**
* @param framePayload 澶氫釜璺伅瀹氭椂鎸囦护锛�
*/
- public A5LightTimerReqInnerFrame(String framePayload) {
- String destinationAddress = "FFFF";
- payload = destinationAddress + framePayload;
- this.payloadLength = SupplementUtils.suppleZero(Integer.toHexString((payload.length() / 2)).toUpperCase(), 4);
+ 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 ;
+// payload = getEncodeFrame();
+
+
}
@Override
public String getEncodeFrame() {
+ String functionCode = A5LightDataEnum.LightTimer.getCode();
+ String payloadLength = SupplementUtils.suppleZero(Integer.toHexString((payload.length() / 2)).toUpperCase(), 4);
String frame = functionCode + payloadLength + payload;
+
return MQTTConnectTypeEnum.SYNCHRONIZATION.getCode() + frame.toUpperCase() + CRC32Utils.getCRC32(frame.toUpperCase());
}
--
Gitblit v1.9.3