完成筛选房间的功能

黄学彪

2020-12-19 f4c86f68b900bd506ef7214b2ae9bd23a9d2ffa8

 HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs

old mode 100644
new mode 100755
@@ -49,7 +49,7 @@
                case FunctionType.Dimmer:
                case FunctionType.RGB:
                case FunctionType.RGBW:
                case FunctionType.CCT:
                case FunctionType.ColorTemperature:
                    {
                        //2表示(开，关)功能
                        SwitchBrightnessView(fLayout, device, index, edit, 2);
@@ -68,8 +68,8 @@
                        SwitchView(fLayout, device, index, edit, 3);
                    }
                    break;
                case FunctionType.TrietexCurtain:
                case FunctionType.RollerCurtain:
                case FunctionType.MotorCurtain:
                case FunctionType.RollingShutter:
                    {
                        //3表示(开，关，暂停)功能
                        SwitchBrightnessView(fLayout, device, index, edit, 3);
@@ -278,7 +278,7 @@
                                speedTypeView.btnText.Text = speedStr[i];
                                speedTypeView.btnClick.Tag = speedStr[i];//标记

                                if (acModehView.btnState.Text == speedStr[i])
                                if (acSpeedView.btnState.Text == speedStr[i])
                                {
                                    //显示之前的选中状态
                                    checkBtn.IsSelected = false;
@@ -664,7 +664,7 @@
            ///亮度
            LogicView.FunTypeView brightnessView = new LogicView.FunTypeView();
            brightnessView.frameLayout.Y = lightSwitchView.frameLayout.Bottom;
            if (device.functionType == FunctionType.TrietexCurtain || device.functionType == FunctionType.RollerCurtain)
            if (device.functionType == FunctionType.MotorCurtain || device.functionType == FunctionType.RollingShutter)
            {

                brightnessView.btnText.TextID = StringId.percentum;
@@ -887,7 +887,7 @@
                case FunctionType.Dimmer:
                case FunctionType.RGB:
                case FunctionType.RGBW:
                case FunctionType.CCT:
                case FunctionType.ColorTemperature:
                    {
                        foreach (var dic in dicList)
                        {
@@ -943,8 +943,8 @@
                        }
                    }
                    break;
                case FunctionType.TrietexCurtain:
                case FunctionType.RollerCurtain:
                case FunctionType.MotorCurtain:
                case FunctionType.RollingShutter:
                    {

                        foreach (var dic in dicList)