wxr
2020-12-21 f25c6122eb7e26be5e7f036cf29b9019c4953be2
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -165,10 +165,11 @@
                                string keyVlaue = "set_temp";
                                string set_temp_value = temperature.Replace("℃", "");
                                LogicMethod.dictionary(dic, "value", set_temp_value);
                                selectedState = device.functionType + "_set_temp";
                                AddDictionaryData(dicSateteList, keyVlaue, dic);
                                selectedState = device.functionType + "_set_temp";
                                RemView(frame);
                                temperatureView.btnState.Text = temperature;
                            };
                        };
@@ -741,61 +742,31 @@
            };
            this.AddChidren(frame);
            LogicView.SwitchView switchView = new LogicView.SwitchView();
            switchView.FLayoutView(frame, len);
            switchView.FLayoutView(frame, len, button.Text, (strValue) =>
            {
                int id = 0;
                switch (strValue) {
                    case "on": {
                            id = StringId.onLogic;
                        }
                        break;
                    case "off": {
                            id = StringId.offLogic;
                        } break;
                    case "stop": {
                            id = StringId.stop;
                        } break;
                }
                button.TextID = id;
                Dictionary<string, string> dic = new Dictionary<string, string>();
                LogicMethod.dictionary(dic, "key", "on_off");
                string keyVlaue = "on_off";
                LogicMethod.dictionary(dic, "value", strValue);
                AddDictionaryData(dicSateteList, keyVlaue, dic);
                selectedState = device.functionType + "_" + strValue;
            });
            #endregion
            #region 点击事件
            Dictionary<string, string> dic = new Dictionary<string, string>();
            LogicMethod.dictionary(dic, "key", "on_off");
            string keyVlaue = "on_off";
            //开-点击事件
            switchView.btnOn.MouseUpEventHandler += (sender2, e2) =>
            {
                LogicMethod.dictionary(dic, "value", "on");
                button.TextID = StringId.onLogic;
                selectedState = device.functionType + "_on";
                AddDictionaryData(dicSateteList, keyVlaue, dic);
                RemView(frame);
            };
            //关-点击事件
            switchView.btnOff.MouseUpEventHandler += (sender3, e3) =>
            {
                LogicMethod.dictionary(dic, "value", "off");
                button.TextID = StringId.offLogic;
                selectedState = device.functionType + "_off";
                AddDictionaryData(dicSateteList, keyVlaue, dic);
                RemView(frame);
            };
            //暂停-点击事件
            switchView.btnStop.MouseUpEventHandler += (sender3, e3) =>
            {
                LogicMethod.dictionary(dic, "value", "stop");
                button.TextID = StringId.stop;
                selectedState = device.functionType + "_stop";
                AddDictionaryData(dicSateteList, keyVlaue, dic);
                RemView(frame);
            };
            ///显示之前状态
            if (button.Text != "")
            {
                if (button.Text == switchView.btnOn.Text)
                {
                    switchView.btnOn.TextColor = CSS.CSS_Color.textConfirmColor;
                }
                else if (button.Text == switchView.btnOff.Text)
                {
                    switchView.btnOff.TextColor = CSS.CSS_Color.textConfirmColor;
                }
                else if (button.Text == switchView.btnStop.Text)
                {
                    switchView.btnOff.TextColor = CSS.CSS_Color.textConfirmColor;
                }
            }
            #endregion
        }
        /// <summary>
        /// 亮度/百分比=功能下一级界面
@@ -811,85 +782,36 @@
            };
            this.AddChidren(frame);
            LogicView.BrightnessView brightness = new LogicView.BrightnessView();
            brightness.btnTitle.Text = titleName;
            brightness.FLayoutView(frame);
            #endregion
            #region 点击事件
            int brightnesValue = 0;
            Dictionary<string, string> dic = new Dictionary<string, string>();
            string keyVlaue = "";
            switch (device.functionType)
            brightness.FLayoutView(frame, titleName, button.Text, (brightnesValue) =>
            {
                //开关灯光 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) =>
            {
                if (brightnesValue > 0)
                button.Text = brightnesValue;
                Dictionary<string, string> dic = new Dictionary<string, string>();
                string keyVlaue = "";
                switch (device.functionType)
                {
                    brightnesValue -= 1;
                    brightness.seekBarVol.Progress = brightnesValue;
                    //开关灯光 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_add_click.MouseUpEventHandler += (sende2, e2) =>
            {
                if (brightnesValue < 100)
                {
                    brightnesValue += 1;
                    brightness.seekBarVol.Progress = brightnesValue;
                }
            };
            //进度条滑动点击事件
            EventHandler<int> progressclick = (sender2, e2) =>
            {
                brightnesValue = brightness.seekBarVol.Progress;
            };
            brightness.seekBarVol.OnProgressChangedEvent += progressclick;
            brightness.seekBarVol.OnStopTrackingTouchEvent += progressclick;
            //确定点击事件
            brightness.btnConfirm.MouseUpEventHandler += (sende2, e2) =>
            {
                if (brightnesValue == 0)
                {
                    return;
                }
                LogicMethod.dictionary(dic, "value", brightnesValue.ToString());
                selectedState = device.functionType + brightnesValue.ToString();
                AddDictionaryData(dicSateteList, keyVlaue, dic);
                button.Text = brightnesValue.ToString();
                RemView(frame);
            };
            //显示之前状态
            if (button.Text != "")
            {
                brightnesValue = int.Parse(button.Text);
                brightness.seekBarVol.Progress = brightnesValue;
            }
                selectedState = device.functionType + brightnesValue.ToString();
            });
            #endregion
        }
        /// <summary>