Merge remote-tracking branch 'origin/master'

liuhaonan

2022-04-27 4aaab689ed4e94dd9e34ec22c661b3227befe8a8

 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;