wxr
2023-10-17 46a177eb1acf7ce91af7fe9ff57af87228de938d
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -181,7 +181,7 @@
                                        }
                                    }
                                    break;
                                //传感器
                                //紧急求助传感器
                                case SPK.SensorHelp:
                                    {
                                        string value = this.GetKeyValue("alarm_status", dicList);
@@ -1055,6 +1055,7 @@
                                        }
                                    }
                                    break;
                                case SPK.OtherCommon:
                                case SPK.AirSwitch:
                                case SPK.LightSwitch:
                                //插座
@@ -1509,22 +1510,21 @@
                                    break;
                                case SPK.ElectricalTvHisense:
                                    {
                                        string on_off = GetKeyValue("on_off", dicList);
                                        string on = GetKeyValue("wol", dicList);
                                        string off = GetKeyValue("on_off", dicList);
                                        string volumet = GetKeyValue("set_volume", dicList);
                                        string signal = GetKeyValue("signal", dicList);
                                        if (!string.IsNullOrEmpty(on_off))
                                        {
                                            if (on_off == "on")
                                            {
                                                stateStr = Language.StringByID(StringId.onLogic);
                                            }
                                            else
                                            {
                                                stateStr = Language.StringByID(StringId.offLogic);
                                                //如果关了,其它属性不显示
                                                break;
                                            }
                                        if (!string.IsNullOrEmpty(off))
                                        {
                                            stateStr = Language.StringByID(StringId.offLogic);
                                            //如果关了,其它属性不显示
                                            break;
                                        }
                                        if (!string.IsNullOrEmpty(on))
                                        {
                                            stateStr = Language.StringByID(StringId.onLogic);
                                        }
                                        if (!string.IsNullOrEmpty(stateStr))
                                        {
@@ -1716,6 +1716,7 @@
                    break;
                case SPK.ElectricSocket:
                //开关灯光
                case SPK.OtherCommon:
                case SPK.AirSwitch:
                case SPK.LightSwitch:
                //机械手
@@ -2525,19 +2526,22 @@
                            {
                                case "on_off":
                                    {
                                        switch (value)
                                        if (value == "off")
                                        {
                                            case "on":
                                                {
                                                    button1.Text = Language.StringByID(StringId.onLogic);
                                                }
                                                break;
                                            case "off":
                                                {
                                                    button1.Text = Language.StringByID(StringId.offLogic);
                                                }
                                                break;
                                            button1.Text = Language.StringByID(StringId.offLogic);
                                        }
                                    }
                                    break;
                                case "wol":
                                    {
                                        if (value == "on")
                                        {
                                            button1.Text = Language.StringByID(StringId.onLogic);
                                        }
                                    }
                                    break;