20201218-6

wei

2020-12-18 d53f7315de145266e6465d9f95d11d1712b9a91b

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

@@ -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);
@@ -137,7 +137,6 @@

                            //加载数据界面的设置方法(列表互不联动)
                            view.mUIPickerView.setNPicker(temperatureList, null, null);

                            //默认初始选中状态
                            view.mUIPickerView.setCurrentItems(9, 0, 0);
                            //定义一个局部变量记录选中时间
@@ -278,7 +277,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;
@@ -506,7 +505,41 @@
                    Output outputDevice = new Output();
                    outputDevice.target_type = "1";
                    outputDevice.sid = device.sid;

                    switch (device.functionType)
                    {
                        case FunctionType.Dimmer:
                        case FunctionType.RGB:
                        case FunctionType.RGBW:
                        case FunctionType.ColorTemperature:
                            {
                                //调光做了一个特殊处理；
                                if (dicSateteList.Count > 1)
                                {
                                    foreach (var dictionary in dicSateteList)
                                    {
                                        string keyValue = dictionary["key"];
                                        if (keyValue == "on_off")
                                        {
                                            if (dictionary["value"] == "off")
                                            {
                                                //移除列表所有数据
                                                dicSateteList.Clear();
                                                //重新添加开光属性数据
                                                Dictionary<string, string> diction = new Dictionary<string, string>();
                                                diction.Add("key", "on_off");
                                                diction.Add("value", "off");
                                                dicSateteList.Add(diction);
                                                break;
                                            }
                                        }
                                    }
                                }
                                break;
                            }
                    }
                    outputDevice.status = dicSateteList;

                    if (edit)
                    {
                        //移除旧数据
@@ -664,7 +697,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 +920,7 @@
                case FunctionType.Dimmer:
                case FunctionType.RGB:
                case FunctionType.RGBW:
                case FunctionType.CCT:
                case FunctionType.ColorTemperature:
                    {
                        foreach (var dic in dicList)
                        {
@@ -943,8 +976,8 @@
                        }
                    }
                    break;
                case FunctionType.TrietexCurtain:
                case FunctionType.RollerCurtain:
                case FunctionType.MotorCurtain:
                case FunctionType.RollingShutter:
                    {

                        foreach (var dic in dicList)
@@ -1155,7 +1188,6 @@
                    }
                    break;
            }

        }
        /// <summary>
        /// 添加处理选中数据