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/A5LightBrightnessReqInnerFrame.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/A5LightBrightnessReqInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/A5LightBrightnessReqInnerFrame.java
index 07b0a01..16a53a5 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,8 +21,13 @@
/**
* @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;
--
Gitblit v1.9.3