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/A5LightBrightnessReqInnerFrame.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/A5LightBrightnessReqInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/A5LightBrightnessReqInnerFrame.java
index 07b0a01..47bd2fa 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/A5LightBrightnessReqInnerFrame.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/A5LightBrightnessReqInnerFrame.java
@@ -21,15 +21,20 @@
/**
* @param lightLevel 浜害绛夌骇 [0,100]
*/
- public A5LightBrightnessReqInnerFrame(Integer lightLevel) {
- String destinationAddress = "FFFF";
+ public A5LightBrightnessReqInnerFrame(Integer lightLevel, String lightAddress) {
+ String destinationAddress;
+ if (lightAddress == null || (!lightAddress.equals("0001") && !lightAddress.equals("0002"))) {
+ destinationAddress = "FFFF";
+ } else {
+ destinationAddress = lightAddress;
+ }
// 灏嗘暣鍨嬩寒搴﹁浆鎹负Hex
if (lightLevel < 0) {
lightLevel = 0;
} else if (lightLevel > 100) {
lightLevel = 100;
}
- payload = destinationAddress + SupplementUtils.suppleZero(Integer.toHexString(lightLevel), 2);
+ payload = destinationAddress + SupplementUtils.suppleZero(Integer.toHexString(lightLevel).toUpperCase(), 2);
}
@Override
--
Gitblit v1.9.3