Merge branch 'WJC' into NewFilePath

wxr

2020-12-21 ae9061e8e648af95393d96d6f5e59c434aed1558

Merge branch 'WJC' into NewFilePath

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

@@ -260,7 +260,7 @@
                                    }
                                    break;
                                case FunctionType.Curtain:
                                    {//开关灯
                                    {
                                        foreach (var dic in dicList)
                                        {
                                            string value = dic["value"];
@@ -288,48 +288,32 @@
                                    break;
                                case FunctionType.MotorCurtain:
                                case FunctionType.RollingShutter:
                                    {//开关灯
                                    {
                                        string on_off = GetKeyValue("on_off", dicList);
                                        string brightness = GetKeyValue("brightness", dicList);
                                        if (on_off != "")
                                        string percent = GetKeyValue("percent", dicList);

                                        if (on_off == "off")
                                        {
                                            switch (on_off)
                                            {
                                                case "on":
                                                    {
                                                        stateStr = Language.StringByID(StringId.onLogic);
                                                       
                                                    }
                                                    break;
                                                case "off":
                                                    {
                                                        stateStr = Language.StringByID(StringId.offLogic);
                                                       
                                                    }
                                                    break;
                                                case "stop":
                                                    {
                                                        stateStr = Language.StringByID(StringId.stop);
                                                    }
                                                    break;
                                            }
                                            stateStr = Language.StringByID(StringId.offLogic);
                                        }
                                        if (brightness != "")
                                        else if (on_off == "stop")
                                        {
                                            stateStr += brightness + "%";
                                            stateStr = Language.StringByID(StringId.stop);
                                        }
                                        else if (on_off == "on" && percent != "")
                                        {
                                            stateStr = Language.StringByID(StringId.onLogic) + percent + "%";

                                        }

                                        if (on_off != "" && on_off == "stop"|| on_off != "" && on_off == "off")
                                        else if (on_off == "on")
                                        {
                                            targetView.btnState.Text = Language.StringByID(StringId.stop);
                                            stateStr = Language.StringByID(StringId.onLogic);
                                        }
                                        else
                                        else if (percent != "")
                                        {
                                            targetView.btnState.Text = stateStr;

                                            stateStr = percent + "%";
                                        }

                                        targetView.btnState.Text = stateStr;
                                    }
                                    break;
                                case FunctionType.AC: {

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

@@ -817,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) =>
            {
@@ -1007,7 +1029,7 @@
                                        }
                                    }
                                    break;
                                case "brightness":
                                case "percent":
                                    {

                                        button2.Text = value;