Merge branch 'wxr0114' of http://59.41.255.150:6688/r/~wxr/OnPro into wxr0114

lss

2022-06-27 ea285ffe71284f5499e870f89c65b710d2d6a79c

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

@@ -176,23 +176,6 @@
                                    }
                                    break;
                                //传感器
                                case SPK.SensorHelp:
                                    {
                                        foreach (var dic in dicList)
                                        {
                                            string value = dic["value"];
                                            if (value == "alarm")
                                            {
                                                inputView.btnState.Text = Language.StringByID(StringId.qiujiu);

                                            }
                                            else
                                            {
                                                inputView.btnState.Text = Language.StringByID(StringId.zhengchang);
                                            }
                                        }
                                    }
                                    break;
                                case SPK.SensorSmoke:
                                case SPK.SensorGas:
                                    {
@@ -420,31 +403,31 @@
                                    }
                                    break;
                                case SPK.SensorCO2:
                                    {
                                        string str = new InpOrOutLogicMethod { }.GetText(dicList, "co2");
                                        inputView.btnState.Text = str;

                                    }
                                    break;
                                case SPK.SensorPm25:
                                    {
                                        string str = new InpOrOutLogicMethod { }.GetText(dicList, "pm25");
                                        inputView.btnState.Text = str;

                                    }
                                    break;
                                case SPK.SensorTVOC:
                                    {
                                        string str = new InpOrOutLogicMethod { }.GetText(dicList, "tvoc");
                                        inputView.btnState.Text = str;

                                    }
                                    break;
                                case SPK.SensorHcho:
                                    {
                                        string str = new InpOrOutLogicMethod { }.GetText(dicList, "hcho");
                                        string strvalue = ""; 
                                        foreach (var dic in dicList)
                                        {
                                            strvalue = dic["value"];
                                            break;
                                        }
                                        string str = new PublicInterface().GetSensorLevelText(device, strvalue, true);
                                        inputView.btnState.Text = str;
                                    }
                                    break;
                                case SPK.DoorLock:
                                    {
                                        foreach (var dic in dicList)
                                        {
                                            string value = dic["value"];
                                            if (value == "open")
                                            {
                                                inputView.btnState.Text = Language.StringByID(StringId.kaiqi);
                                            }

                                        }
                                    }
                                    break;
                            }
@@ -1009,6 +992,8 @@
                                    }
                                    break;
                                case SPK.CurtainSwitch:
                                case SPK.CurtainTrietex:
                                case SPK.CurtainRoller:
                                    {
                                        foreach (var dic in dicList)
                                        {
@@ -1031,29 +1016,6 @@
                                                    }
                                                    break;
                                            }
                                        }
                                    }
                                    break;
                                case SPK.CurtainTrietex:
                                case SPK.CurtainRoller:
                                    {
                                        string on_off = GetKeyValue("on_off", dicList);
                                        string percent = GetKeyValue("percent", dicList); 
                                        if (on_off == "on" && percent != "")
                                        {
                                            stateStr = Language.StringByID(StringId.onLogic) + percent + "%";
                                        }
                                        else if (on_off == "on")
                                        {
                                            stateStr = Language.StringByID(StringId.onLogic);
                                        }
                                        else if (on_off == "off")
                                        {
                                            stateStr = Language.StringByID(StringId.offLogic);
                                        }
                                        else if (percent != "")
                                        {
                                            stateStr = percent + "%";
                                        }
                                    }
                                    break;
@@ -1493,6 +1455,8 @@
                    }
                    break;
                case SPK.CurtainSwitch:
                case SPK.CurtainTrietex:
                case SPK.CurtainRoller:
                    {
                        foreach (var dic in dicList)
                        {
@@ -1516,52 +1480,6 @@
                                    break;
                            }
                        }
                    }
                    break;
                case SPK.CurtainTrietex:
                case SPK.CurtainRoller:
                    {
                        foreach (var dic in dicList)
                        {
                            string value = dic["value"];
                            switch (dic["key"])
                            {
                                case "on_off":
                                    {
                                        switch (value)
                                        {
                                            case "on":
                                                {
                                                    button1.Text = Language.StringByID(StringId.onLogic);
                                                }
                                                break;
                                            case "off":
                                                {
                                                    button1.Text = Language.StringByID(StringId.offLogic);
                                                }
                                                break;
                                            case "stop":
                                                {
                                                    button1.Text = Language.StringByID(StringId.stop);
                                                }
                                                break;
                                        }
                                    }
                                    break;
                                case "percent":
                                    {
                                        if (button2 == null)
                                        {
                                            //怕调试软件乱上东西导致抛异常
                                            break;
                                        }
                                        button2.Text = value + "%";
                                    }
                                    break;
                            }

                        }
                        
                    }
                    break;
                case SPK.AcStandard:
@@ -1827,22 +1745,6 @@

                    }
                    break;
                case SPK.SensorHelp:
                    {
                        foreach (var dic in dicList)
                        {
                            string value = dic["value"];
                            if (value == "alarm")
                            {
                                button1.Text = Language.StringByID(StringId.qiujiu);
                            }
                            else
                            {
                                button1.Text = Language.StringByID(StringId.zhengchang);
                            }
                        }
                    }
                    break;
                case SPK.SensorGas:
                case SPK.SensorSmoke:
                    {
@@ -1981,6 +1883,19 @@
                            {
                                button1.Text = Language.StringByID(StringId.wuren);
                            }
                        }
                    }
                    break;
                case SPK.DoorLock:
                    {
                        foreach (var dic in dicList)
                        {
                            string value = dic["value"];
                            if (value == "open")
                            {
                                button1.Text = Language.StringByID(StringId.shi);
                            }
                           
                        }
                    }
                    break;
@@ -2245,11 +2160,11 @@
            //确定点击事件
            timePointView.btnConfirm.MouseUpEventHandler += (sender, e3) =>
            {
                //if (timepoint == 0)
                //{
                //    //提示
                //    return;
                //}
                if (timepoint == 0)
                {
                    //提示
                    return;
                }
                fLayout.RemoveFromParent();
                action(timepoint);
            };