2022年06月30日13:59:08

wjc

2022-06-30 56dfdc1bf7e7f2bb2456f29c3686dfa935a89e80

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

@@ -1084,6 +1084,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 +1610,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:
                    {