From b9f73f7363bef95fc5ba445ee2fd749f3639443f Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期一, 14 十一月 2022 15:21:29 +0800
Subject: [PATCH] 新增本地MQTT模块,新增xm本地开发配置环境,启用了心跳包自动插入单灯设备,覆写了原rrpc方法,原阿里云自定义事件调用已注释掉

---
 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