wxr
2022-07-08 f16e7e4df7e7813e4a3052dae752aae3e6937b30
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -338,7 +338,11 @@
                                                    {
                                                        if (value == "true")
                                                        {
                                                            inputView.btnState.Text = Language.StringByID(StringId.shi);
                                                            inputView.btnState.Text = Language.StringByID(StringId.youren);
                                                        }
                                                        else
                                                        {
                                                            inputView.btnState.Text = Language.StringByID(StringId.wuren);
                                                        }
                                                    }
@@ -1084,6 +1088,25 @@
                                        }
                                    }
                                    break;
                                case SPK.CurtainDream:
                                    {
                                        string percent = GetKeyValue("percent", dicList);
                                        string angle = GetKeyValue("angle", dicList);
                                        if (percent != "" && angle != "")
                                        {
                                            stateStr += Language.StringByID(StringId.onLogic) + percent + "%;";
                                            stateStr +=Language.StringByID(StringId.Angle)+angle + "°";
                                        }
                                        else if (percent != "")
                                        {
                                            stateStr = Language.StringByID(StringId.onLogic) + percent + "%";
                                        }
                                        else if (angle != "")
                                        {
                                            stateStr = Language.StringByID(StringId.onLogic) + Language.StringByID(StringId.Angle) + angle + "°";
                                        }
                                    }
                                    break;
                                case SPK.AcStandard:
                                case SPK.HvacAC:
                                    {
@@ -1591,6 +1614,39 @@
                        
                    }
                    break;
                case SPK.CurtainDream:
                    {
                        foreach (var dic in dicList)
                        {
                            string value = dic["value"];
                            switch (dic["key"])
                            {
                                case "percent":
                                    {
                                        if (button1 == null)
                                        {
                                            //怕调试软件乱上东西导致抛异常
                                            break;
                                        }
                                        button1.Text = value + "%";
                                    }
                                    break;
                                case "angle":
                                    {
                                        if (button2 == null)
                                        {
                                            //怕调试软件乱上东西导致抛异常
                                            break;
                                        }
                                        button2.Text = value + "°";
                                    }
                                    break;
                            }
                        }
                    }
                    break;
                case SPK.AcStandard:
                case SPK.HvacAC:
                    {
@@ -2005,7 +2061,10 @@
                                    {
                                        if (value == "true")
                                        {
                                            button1.Text = Language.StringByID(StringId.shi);
                                            button1.Text = Language.StringByID(StringId.youren);
                                        }
                                        else {
                                            button1.Text = Language.StringByID(StringId.wuren);
                                        }
                                        
                                    }