20201221-3

wei

2020-12-21 1887ea937010ff8caba39622e8246a2802ca02c5

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

old mode 100755
new mode 100644
@@ -137,7 +137,6 @@

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

                            //默认初始选中状态
                            view.mUIPickerView.setCurrentItems(9, 0, 0);
                            //定义一个局部变量记录选中时间
@@ -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)
                    {
                        //移除旧数据
@@ -784,8 +817,30 @@
            #region 点击事件
            int brightnesValue = 0;
            Dictionary<string, string> dic = new Dictionary<string, string>();
            LogicMethod.dictionary(dic, "key", "brightness");
            string keyVlaue = "brightness";
            string keyVlaue = "";

            switch (device.functionType)
            {
                //开关灯光 light.Switch
                case FunctionType.Dimmer:
                case FunctionType.RGB:
                case FunctionType.RGBW:
                case FunctionType.ColorTemperature:
                    {
                        LogicMethod.dictionary(dic, "key", "brightness");
                        keyVlaue = "brightness";
                    }
                    break;
               
                case FunctionType.MotorCurtain:
                case FunctionType.RollingShutter:
                    {
                        LogicMethod.dictionary(dic, "key", "percent");
                        keyVlaue = "percent";
                    }
                    break;
            }
            
            //—点击事件
            brightness.btn_subtract_click.MouseUpEventHandler += (sender2, e2) =>
            {
@@ -974,7 +1029,7 @@
                                        }
                                    }
                                    break;
                                case "brightness":
                                case "percent":
                                    {

                                        button2.Text = value;