2020-10-20 1.增加RGB和CCT灯控制协议

JLChen

2020-10-20 c9978ac37e3e9817ab07b25dbb499b28918403fd

 hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Parser/DeviceParser.java

@@ -40,11 +40,18 @@
            appliancesInfo.setDeviceName(Configuration.UNKNOW_TYPE);
            appliancesInfoList.add(appliancesInfo);
        }

        int curCount = 0;//循环遍历所有设备次数
        while (curCount < sumCount) {
            int bigType = addBytes[21 + (2 * curCount) + (curCount + 1)] & 0xFF;
            int littleType = addBytes[21 + (2 * curCount) + (curCount + 2)] & 0xFF;
            int channelNum = addBytes[21 + (2 * curCount) + (curCount + 3)] & 0xFF;
            if(bigType == Configuration.LIGTH_BIG_TYPE && (littleType == 7 || littleType == 8)){
                //2020-10-20 如果是RGBhuozCCT先只使用1回路，后面看需要再修改，因为发现简易编程搜索，我发现这CCT或者RGB设备只用1，2个回路，但是他还是回复有60多个回路，后面讨论再处理
                //回路总数强制修改成1先
                channelNum = 1;
            }

            curCount++;
            int curChannelNum = 0;
            while (curChannelNum < channelNum) {
@@ -126,6 +133,12 @@
                        isWant = true;
                        break;
                    case 1:
                        isWant = true;
                        break;
                    case 7:
                        isWant = true;
                        break;
                    case 8:
                        isWant = true;
                        break;
                    case 9:
@@ -288,9 +301,11 @@
                break;
            case 7:
                appliancesInfo.setDeviceName("DALI");
                appliancesInfo.setDeviceType(HDLApConfig.TYPE_LIGHT_CCT);
                break;
            case 8:
                appliancesInfo.setDeviceName("自定义逻辑灯");
                appliancesInfo.setDeviceName("自定义逻辑灯RGB");
                appliancesInfo.setDeviceType(HDLApConfig.TYPE_LIGHT_RGB);
                break;
            case 9:
                appliancesInfo.setDeviceName("混合调光类");
@@ -317,6 +332,14 @@
            appliancesInfo.setParentRemarks(parentRemarks);
            appliancesInfo.setPort(port);
            appliancesInfo.setIpAddress(ipAddress);

            if(littleType == 7 || littleType == 8){
                appliancesInfo.setCtrlCommand(Configuration.LIGHT_RGB_CTRL_COMMAND);
                appliancesInfo.setCtrlBackCommand(Configuration.LIGHT_RGB_CTRL_BACK_COMMAND);
                appliancesInfo.setStateCommand(Configuration.LIGHT_RGB_STATE_COMMAND);
                appliancesInfo.setStateBackCommand(Configuration.LIGHT_RGB_STATE_BACK_COMMAND);
            }

        }
    }