2024年07月25日17:24:45

mac

2024-07-25 3f6685c77beeb12baf840733fb890860f4c26e7c

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

@@ -48,7 +48,7 @@
                {
                    case "1":
                        {
                           

                            inputView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
                            foreach (var dic in dicList)
                            {
@@ -130,7 +130,7 @@
                    case "2":
                        {
                            inputView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
                            string value= this.GetKeyValue("timesection", dicList);
                            string value = this.GetKeyValue("timesection", dicList);
                            inputView.btnText.Text = Language.StringByID(StringId.timeHorizon) + ": " + value;
                        }
                        break;
@@ -181,7 +181,7 @@
                                        }
                                    }
                                    break;
                                //传感器
                                //紧急求助传感器
                                case SPK.SensorHelp:
                                    {
                                        string value = this.GetKeyValue("alarm_status", dicList);
@@ -218,9 +218,9 @@
                                case SPK.SensorDryContact2:
                                    {

                                        string value = this.GetKeyValue("on_off", dicList);
                                        string value = this.GetKeyValue("contact_status", dicList);
                                        inputView.btnState.Text = Language.StringByID(StringId.offLogic);
                                        if (value == "on")
                                        if (value == "open")
                                        {
                                            inputView.btnState.Text = Language.StringByID(StringId.onLogic);
                                        }
@@ -400,6 +400,13 @@
                                        inputView.btnState.Text = str;
                                    }
                                    break;
                                case SPK.SensorLight:
                                    {
                                        string str = this.GetText(dicList, "illuminance");
                                        inputView.btnState.Text = str;

                                    }
                                    break;
                                case SPK.DoorLock:
                                    {
                                        string value = this.GetValue(dicList);
@@ -411,7 +418,7 @@
                                    break;
                                case SPK.VideoDoorLock:
                                    {
                                        string s = string.Empty;
                                        string userName = string.Empty;
                                        string tag = string.Empty;
                                        for (int b = 0; b < dicList.Count; b++)
                                        {
@@ -422,45 +429,56 @@
                                            //s += ",";
                                            //tag += FaceItem.userId;
                                            //tag += "_";
                                            var userName = dic["value"].ToString();
                                            s += userName;
                                            s += ",";
                                            userName = dic["value"].ToString();
                                        }
                                        inputView.btnState.Text = s;
                                        inputView.btnState.Text = RemoveLastStr(userName);
                                    }
                                    break;
                                case SPK.doorgate:
                                    {
                                        string s = string.Empty;
                                        if (inputCondition.identifier == "door_call_cloud_event")
                                        {
                                            s = Language.StringByID(StringId.shipintonghuahujiao);
                                        }
                                        else
                                        {
                                            for (int b = 0; b < dicList.Count; b++)
                                            {
                                                var dic = dicList[b];
                                                var key = dic["key"].ToString();
                                                if (key != "user_id")
                                                {
                                                    continue;
                                                }
                                                var userId = dic["value"].ToString();
                                                var FaceItem = this.GetFaceItem(userId, device.deviceId);
                                                s += FaceItem.userName;
                                                s += ",";

                                        string s = string.Empty;
                                        try
                                        {
                                            if (inputCondition.identifier == "door_call_cloud_event")
                                            {
                                                s = Language.StringByID(StringId.shipintonghuahujiao);
                                            }
                                            else
                                            {
                                                for (int b = 0; b < dicList.Count; b++)
                                                {
                                                    var dic = dicList[b];
                                                    var key = dic["key"].ToString();
                                                    if (key != "user_id")
                                                    {
                                                        continue;
                                                    }
                                                    var value = dic["value"].ToString();
                                                    if (!string.IsNullOrEmpty(value))
                                                    {
                                                        var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(value);
                                                        for (int a = 0; a < list.Count; a++)
                                                        {

                                                            var FaceItem = this.GetFaceItem(list[a], device.deviceId);
                                                            s += FaceItem.userName;
                                                            s += ",";

                                                        }
                                                    }

                                                }

                                            }

                                        }
                                        catch { }
                                        inputView.btnState.Text = s;
                                    }
                                    break;
                                case SPK.IpCam_Imou:
                                    {
                                        if (inputCondition.identifier == "door_caipcam_region_alram_eventll_cloud_event")
                                        if (inputCondition.identifier == "ipcam_region_alram_event")
                                        {
                                            inputView.btnState.Text = Language.StringByID(StringId.quyuruqingaojing);
                                        }
@@ -468,9 +486,15 @@
                                    }
                                    break;
                                case SPK.Ev_Ipcam:
                                    if (inputCondition.identifier == Constant.intelligentDetection_event)
                                    {
                                        inputView.btnState.Text = Language.StringByID(StringId.shi);
                                    }
                                    break;
                                case SPK.Peephole:
                                    if (inputCondition.identifier == "pir_event")
                                    {
                                        inputView.btnState.Text = Language.StringByID(StringId.On);
                                        inputView.btnState.Text = Language.StringByID(StringId.shi);
                                    }
                                    break;
                                case SPK.SensorPirHold:
@@ -478,11 +502,11 @@
                                        string value = this.GetKeyValue("people_status", dicList);
                                        if (string.IsNullOrEmpty(value))
                                        {
                                            inputView.btnState.Text = inputCondition.hold_time + "s";
                                            inputView.btnState.Text = LogicMethod.Current.getTimeStr(inputCondition.hold_time).Replace("0s", "");
                                            break;

                                        }
                  

                                        inputView.btnState.Text = Language.StringByID(StringId.wuren);
                                        if (value == "true")
                                        {
@@ -491,8 +515,19 @@
                                        }
                                        if (!string.IsNullOrEmpty(inputCondition.hold_time) && int.Parse(inputCondition.hold_time) > 0)
                                        {

                                            inputView.btnState.Text += "持续" + inputCondition.hold_time + "s";
                                            int time = int.Parse(inputCondition.hold_time);
                                            inputView.btnState.Text += "持续" + LogicMethod.Current.getTimeStr(inputCondition.hold_time).Replace("0s", "");
                                        }
                                        if (!string.IsNullOrEmpty(inputCondition.detect_type))
                                        {
                                            if (inputCondition.detect_type == "1")
                                            {
                                                inputView.btnState.Text += "," + Language.StringByID(StringId.gaibiancaizhixing);
                                            }
                                            else
                                            {
                                                inputView.btnState.Text += "," + Language.StringByID(StringId.shoudaojiuzhixing);
                                            }
                                        }


@@ -744,6 +779,7 @@
                                if (device.spk == SPK.SensorEnvironment || device.spk == SPK.SensorEnvironmentHailin
                                || device.spk == SPK.SensorEnvironment2
                                || device.spk == SPK.SensorEnvironment3
                                || device.spk == SPK.SensorLight
                                )
                                {
                                    ///当前的索引值数据对象
@@ -758,6 +794,20 @@
                                        switch (key)
                                        {

                                            case "illuminance":
                                                {
                                                    int titleInt = 0;
                                                    if (comparator == ">")
                                                    {
                                                        titleInt = StringId.zhaomingdugaoyu;
                                                    }
                                                    else if (comparator == "<")
                                                    {
                                                        titleInt = StringId.zhaomingdudiyu;
                                                    }
                                                    ConditionDeviceFunList.Current.InputBoxAction(device, titleInt, indexVulae, true, stateValue);
                                                }
                                                break;
                                            case "temperature":
                                                {
                                                    int titleInt = 0;
@@ -813,7 +863,7 @@
                                else if (device.spk == SPK.SensorTemperature)
                                {

                                   this.SensorView(thisView, device, "temperature", indexVulae);
                                    this.SensorView(thisView, device, "temperature", indexVulae);

                                }
                                else if (device.spk == SPK.SensorHumidity)
@@ -1009,7 +1059,7 @@
                            //区别不同设备，显示不同设备状态
                            switch (device.spk)
                            {
                               

                                case SPK.CommonSeries:
                                    targetView.btnIcon.UnSelectedImagePath = "FunctionIcon/Icon/groupControl.png";
                                    stateStr = GetKeyValue("on_off", dicList) == "on" ? Language.StringByID(StringId.onLogic) : Language.StringByID(StringId.offLogic);
@@ -1017,7 +1067,8 @@
                                //插座(有USB)
                                case SPK.PanelSocket:
                                    {
                                        string on_off = GetKeyValue("on_off_master", dicList);
                                        //string on_off = GetKeyValue("on_off_master", dicList);
                                        string on_off = GetKeyValue("on_off", dicList);
                                        if (on_off == "on")
                                        {
                                            stateStr = Language.StringByID(StringId.onLogic);
@@ -1028,6 +1079,7 @@
                                        }
                                    }
                                    break;
                                case SPK.OtherCommon:
                                case SPK.AirSwitch:
                                case SPK.LightSwitch:
                                //插座
@@ -1051,14 +1103,14 @@
                                        }
                                    }
                                    break;
                               
                              


                                case SPK.LightRGB:
                                case SPK.LightRGBW:
                                case SPK.LightCCT:
                                case SPK.LightDimming:
                                    {
                                        

                                        string on_off = GetKeyValue("on_off", dicList);
                                        string brightness = GetKeyValue("brightness", dicList);
                                        if (on_off == "on" && brightness != "")
@@ -1082,7 +1134,7 @@
                                            //色温这个属性才有效
                                            if (stateStr != Language.StringByID(StringId.offLogic) && GetKeyValue("cct", dicList) != "")
                                            {
                                                stateStr += "," +GetKeyValue("cct", dicList) + "k";
                                                stateStr += "," + GetKeyValue("cct", dicList) + "k";
                                            }
                                        }
                                        if (device.spk == SPK.LightRGB)
@@ -1112,7 +1164,11 @@
                                        string on_off = GetKeyValue("on_off", dicList);
                                        string brightness = GetKeyValue("brightness", dicList);
                                        string cct = GetKeyValue(FunctionAttributeKey.CCT, dicList);
                                        string colorful = GetKeyValue(FunctionAttributeKey.Colorful, dicList);
                                        //自动化组控 炫彩功能
                                        //string colorful = GetKeyValue(FunctionAttributeKey.Colorful, dicList);
                                        string rgb = GetKeyValue("rgb", dicList);


                                        if (on_off == "on" && brightness != "")
                                        {
                                            stateStr = Language.StringByID(StringId.onLogic) + brightness + "%";
@@ -1135,22 +1191,19 @@
                                            stateStr += "," + Language.StringByID(StringId.ColorTemperature) + cct + "k";
                                        }

                                        if (!string.IsNullOrEmpty(colorful))
                                        {
                                            stateStr += "," + Language.StringByID(StringId.ColorfulFunction);
                                            if (colorful == "on")
                                            {
                                                stateStr += Language.StringByID(StringId.onLogic);
                                            }
                                            else if (colorful == "off")
                                            {
                                                stateStr += Language.StringByID(StringId.offLogic);
                                            }
                                        //if (!string.IsNullOrEmpty(colorful))
                                        //{
                                        //    stateStr += "," + Language.StringByID(StringId.ColorfulFunction);
                                        //    if (colorful == "on")
                                        //    {
                                        //        stateStr += Language.StringByID(StringId.onLogic);
                                        //    }
                                        //    else if (colorful == "off")
                                        //    {
                                        //        stateStr += Language.StringByID(StringId.offLogic);
                                        //    }
                                        //}

                                            break;
                                        }

                                        string rgb = GetKeyValue("rgb", dicList);
                                        if (!string.IsNullOrEmpty(rgb) && rgb.Length > 6)
                                        {
                                            targetView.btnStateColor.Visible = true;
@@ -1257,11 +1310,7 @@

                                        if (set_temp != "")
                                        {
                                            string unit = device.GetAttribute("temperature_type") == null ? "℃" : device.GetAttribute("temperature_type").state;
                                            if (string.IsNullOrEmpty(unit))
                                            {
                                                unit = "℃";
                                            }
                                            string unit = GetTemperatureUnit(device);
                                            stateStr += set_temp + unit + ",";
                                        }

@@ -1359,11 +1408,7 @@
                                        }
                                        if (set_temp != "")
                                        {
                                            string unit = device.GetAttribute("temperature_type") == null ? "℃" : device.GetAttribute("temperature_type").state;
                                            if (string.IsNullOrEmpty(unit))
                                            {
                                                unit = "℃";
                                            }
                                            string unit = GetTemperatureUnit(device);
                                            stateStr += set_temp + unit + ",";
                                        }
                                        if (mode != "")
@@ -1474,16 +1519,72 @@
                                case SPK.MusicStandard:
                                case SPK.AvMusic:
                                    {
                                        string on_off = GetKeyValue("on_off", dicList);
                                        string song_name = GetKeyValue("song_name", dicList);
                                        string volume = GetKeyValue("volume", dicList);
                                        stateStr = song_name + ";" +Language.StringByID(StringId.volumeMusic)+volume;
                                        if (stateStr.StartsWith(";"))

                                        if (!string.IsNullOrEmpty(on_off))
                                        {
                                            stateStr = stateStr.Substring(1, stateStr.Length - 1);
                                        }else if (stateStr.EndsWith(Language.StringByID(StringId.volumeMusic)))
                                        {
                                            stateStr = stateStr.Substring(0, stateStr.Length - 3);
                                            if (on_off == "on")
                                            {
                                                stateStr = Language.StringByID(StringId.onLogic);
                                            }
                                            else
                                            {
                                                stateStr = Language.StringByID(StringId.offLogic);
                                            }
                                        }

                                        if (!string.IsNullOrEmpty(song_name))
                                        {
                                            stateStr += "," + song_name;
                                        }

                                        if (!string.IsNullOrEmpty(volume))
                                        {
                                            stateStr += "," + volume;
                                        }

                                    }
                                    break;
                                case SPK.ElectricalTvHisense:
                                    {
                                        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(off))
                                        {
                                            stateStr = Language.StringByID(StringId.offLogic);
                                            //如果关了，其它属性不显示
                                            break;
                                        }

                                        if (!string.IsNullOrEmpty(on))
                                        {
                                            stateStr = Language.StringByID(StringId.onLogic);
                                        }
                                        if (!string.IsNullOrEmpty(stateStr))
                                        {
                                            stateStr += ",";
                                        }
                                        if (!string.IsNullOrEmpty(volumet))
                                        {
                                            stateStr += Language.StringByID(StringId.yinliang) + volumet;
                                        }

                                        if (!string.IsNullOrEmpty(stateStr))
                                        {
                                            stateStr += ",";
                                        }
                                        if (!string.IsNullOrEmpty(signal))
                                        {
                                            var p = new PublicInterface();
                                            string key = p.GetKey(p.GetHisenseSignalSourceDic(), signal);
                                            stateStr += key;
                                        }
                                        stateStr = stateStr.TrimEnd(',');
                                    }
                                    break;
                            }
@@ -1532,7 +1633,10 @@
                        break;
                }

                if (outputTarget.target_type == "1" || outputTarget.target_type == "3")
                if (outputTarget.target_type == "1"
                    || outputTarget.target_type == "3"
                    || outputTarget.target_type == "5"
                    )
                {
                    targetView.btnState.Text = this.GetTimeText(outputTarget.delay) + stateStr;
                }
@@ -1562,6 +1666,7 @@
                    switch (button.Name)
                    {
                        case "1":
                        case "5":
                            {
                                //用sid找到设备；
                                var device = LogicMethod.Current.GetDevice(outputTarget.sid);
@@ -1598,7 +1703,8 @@
                    this.Delayed(thisView, outputTarget.delay, (value) =>
                     {
                         outputTarget.delay = value.ToString();
                         if (outputTarget.target_type == "1")
                         if (outputTarget.target_type == "1"
                         || outputTarget.target_type == "5")
                         {
                             targetView.btnState.Text = this.GetTimeText(outputTarget.delay) + stateStr;
                         }
@@ -1624,8 +1730,9 @@
        /// <param name="button1">显示Btn</param>
        /// <param name="button2">显示Btn</param>
        /// <param name="button3">显示Btn</param>
        /// <param name="button4">显示Btn</param> 
        public void EditDeviceState(Entity.Function device, List<Dictionary<string, string>> dicList, Button button1, Button button2, Button button3, Button button4)
        /// <param name="button4">显示Btn</param>
        /// <param name="attribute">属性索引</param>
        public void EditDeviceState(Entity.Function device, List<Dictionary<string, string>> dicList, Button button1, Button button2, Button button3, Button button4, string attribute)
        {
            switch (device.spk)
            {
@@ -1648,6 +1755,7 @@
                    break;
                case SPK.ElectricSocket:
                //开关灯光
                case SPK.OtherCommon:
                case SPK.AirSwitch:
                case SPK.LightSwitch:
                //机械手
@@ -1734,8 +1842,13 @@
                    {
                        foreach (var dic in dicList)
                        {
                            string key = dic["key"];
                            if (key != attribute)
                            {
                                continue;
                            }
                            string value = dic["value"];
                            switch (dic["key"])
                            switch (key)
                            {
                                case "on_off":
                                case "colorful":
@@ -1785,9 +1898,11 @@
                                    }
                                    break;

                            }


                            }
                        }

                    }
                    break;
                case SPK.CurtainSwitch:
@@ -1928,7 +2043,7 @@
                                            //怕调试软件乱上东西导致抛异常
                                            break;
                                        }
                                        button2.Text = value + "℃";
                                        button2.Text = value + GetTemperatureUnit(device); ;
                                    }
                                    break;
                                case "mode":
@@ -2041,7 +2156,7 @@
                                            //怕调试软件乱上东西导致抛异常
                                            break;
                                        }
                                        button2.Text = value + "℃";
                                        button2.Text = value + GetTemperatureUnit(device); ;
                                    }
                                    break;
                                case "mode":
@@ -2176,7 +2291,7 @@
                        }
                    }
                    break;
              

                case SPK.SensorGas:
                case SPK.SensorSmoke:
                    {
@@ -2216,7 +2331,7 @@
                        foreach (var dic in dicList)
                        {
                            string value = dic["value"];
                            if (value == "on")
                            if (value == "on" || value == "open")
                            {
                                button1.Text = Language.StringByID(StringId.onLogic);
                            }
@@ -2384,7 +2499,7 @@
                    break;
                case SPK.VideoDoorLock:
                    {
                        string s = string.Empty;
                        string userName = string.Empty;
                        string tag = string.Empty;
                        for (int b = 0; b < dicList.Count; b++)
                        {
@@ -2395,11 +2510,10 @@
                            //s += ",";
                            //tag += FaceItem.userId;
                            //tag += "_";
                            var userName = dic["value"].ToString();
                            s += userName;
                            s += ",";
                            userName = dic["value"].ToString();

                        }
                        button1.Text = s;
                        button1.Text = RemoveLastStr(userName);
                        button1.Tag = tag;
                    }
                    break;
@@ -2408,40 +2522,119 @@
                    {
                        foreach (var dic in dicList)
                        {
                            if (dic["key"] == "song_name")
                            if (dic["key"] == "on_off")
                            {
                                button1.Text = dic["value"]?.ToString();
                                if (dic["value"] == "on")
                                {
                                    button1.Text = Language.StringByID(StringId.onLogic);
                                }
                                else
                                {
                                    button1.Text = Language.StringByID(StringId.offLogic);
                                }
                            }
                            else if (dic["key"] == "song_name")
                            {
                                button2.Text = dic["value"]?.ToString();
                            }
                            else if (dic["key"] == "volume")
                            {
                                button2.Text = dic["value"]?.ToString();
                                button3.Text = dic["value"]?.ToString();
                            }
                        }
                    }
                    break;
                case SPK.doorgate:
                    {
                        string s = string.Empty;
                        string tag = string.Empty;
                        for (int b = 0; b < dicList.Count; b++)
                        try
                        {
                            var dic = dicList[b];
                            var key = dic["key"].ToString();
                            if (key != "user_id")
                            string userNameStr = string.Empty; 
                            string tag = string.Empty;
                            for (int b = 0; b < dicList.Count; b++)
                            {
                                continue;
                                var dic = dicList[b];
                                var key = dic["key"].ToString();
                                if (key != "user_id")
                                {
                                    continue;
                                }
                                var value = dic["value"].ToString();
                                if (!string.IsNullOrEmpty(value))
                                {
                                    var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(value);
                                    for (int i = 0; i < list.Count; i++)
                                    {

                                        var FaceItem = this.GetFaceItem(list[i], device.deviceId);
                                        userNameStr += FaceItem.userName;
                                        userNameStr += ",";
                                        tag += FaceItem.userId;
                                        tag += "_";
                                    }
                                }
                            }
                            var userId = dic["value"].ToString();
                            var FaceItem = this.GetFaceItem(userId, device.deviceId);
                            s += FaceItem.userName;
                            s += ",";
                            tag += FaceItem.userId;
                            tag += "_";
                            button2.Text = RemoveLastStr(userNameStr);
                            button2.Tag = tag;
                        }
                        button2.Text = s;
                        button2.Tag = tag;
                        catch { }
                    }
                    break;
                case SPK.ElectricalTvHisense:
                    {
                        foreach (var dic in dicList)
                        {
                            string value = dic["value"];
                            switch (dic["key"])
                            {
                                case "on_off":
                                    {
                                        if (value == "off")
                                        {
                                            button1.Text = Language.StringByID(StringId.offLogic);

                                        }

                                    }
                                    break;
                                case "wol":
                                    {
                                        if (value == "on")
                                        {
                                            button1.Text = Language.StringByID(StringId.onLogic);

                                        }

                                    }
                                    break;

                                case "set_volume":
                                    {
                                        if (button2 == null)
                                        {
                                            //怕调试软件乱上东西导致抛异常
                                            break;
                                        }
                                        button2.Text = value;
                                    }
                                    break;
                                case "signal":
                                    {
                                        if (button3 == null)
                                        {
                                            //怕调试软件乱上东西导致抛异常
                                            break;
                                        }
                                        var p = new PublicInterface();
                                        string key = p.GetKey(p.GetHisenseSignalSourceDic(), value);
                                        button3.Text = key;
                                    }
                                    break;
                            }

                        }
                    }
                    break;


            }
        }
@@ -2491,6 +2684,25 @@
                return "";
            }
            return dicList[0]["value"].ToString();
        }
        /// <summary>
        /// 获取温度单位
        /// </summary>
        /// <param name="device"></param>
        /// <returns></returns>
        public string GetTemperatureUnit(Entity.Function device)
        {
            string unit = string.Empty;
            if (device.GetAttribute("temperature_type") != null)
            {
                unit = device.GetAttribute("temperature_type").unit;
            }
            if (string.IsNullOrEmpty(unit))
            {
                //调试软件有空能上传为空
                unit = "℃";
            }
            return unit;
        }
        /// <summary>
        ///获取自动化名称
@@ -2739,33 +2951,35 @@
        {
            //因为调试软件上传为空过;
            string intTimeValue = string.IsNullOrEmpty(strTimeValue) ? "0" : strTimeValue;
            var timeValue = int.Parse(intTimeValue);
            int timeValue = 0;
            int.TryParse(intTimeValue,out timeValue);
            string state = "";
            var minutes = timeValue / 60;
            var seconds = timeValue % 60;
            if (minutes != 0)
            {
                if (seconds == 0)
                {
                    state = minutes.ToString() + Language.StringByID(StringId.minute);
                }
                else
                {
                    state = minutes.ToString() + Language.StringByID(StringId.minute) + seconds.ToString() + Language.StringByID(StringId.s);
                }
            }
            else
            {
                if (seconds != 0)
                {
                    state = seconds.ToString() + Language.StringByID(StringId.s);
                }
            }
            if (!string.IsNullOrEmpty(state))
            {
                state = Language.StringByID(StringId.delayLogic) + state;
            }
            return state;
            return LogicMethod.Current.getTimeStr(strTimeValue).Replace("0s","");
            //if (minutes != 0)
            //{
            //    if (seconds == 0)
            //    {
            //        state = minutes.ToString() + Language.StringByID(StringId.minute);
            //    }
            //    else
            //    {
            //        state = minutes.ToString() + Language.StringByID(StringId.minute) + seconds.ToString() + Language.StringByID(StringId.s);
            //    }
            //}
            //else
            //{
            //    if (seconds != 0)
            //    {
            //        state = seconds.ToString() + Language.StringByID(StringId.s);
            //    }
            //}
            //if (!string.IsNullOrEmpty(state))
            //{
            //    state = Language.StringByID(StringId.delayLogic) + state;
            //}
            //return state;
        }
        /// <summary>
        /// 获取显示面熟文本
@@ -2782,6 +2996,19 @@
                switch (key)
                {

                    case "illuminance":
                        {
                            if (comparator == ">")
                            {
                                strtext = ">" + value;
                            }
                            else if (comparator == "<")
                            {
                                strtext = "<" + value;
                            }

                        }
                        break;
                    case "temperature":
                        {
                            if (comparator == ">")
@@ -2844,7 +3071,7 @@
            Input inputedit = Logic.currlogic.input[indexVulae];
            ///状态值
            string stateValue = "";
            for (int i=0;i<inputedit.condition.Count;i++)
            for (int i = 0; i < inputedit.condition.Count; i++)
            {
                var dic = inputedit.condition[i];
                string comparator = dic["comparator"];
@@ -2945,6 +3172,20 @@
            return face;
        }

        /// <summary>
        /// 删除最后一个 ","
        /// </summary>
        /// <param name="s">字符串</param>
        /// <returns></returns>
        public string RemoveLastStr(string s)
        {
            if (string.IsNullOrEmpty(s))
            {
                return string.Empty;
            }
            return s.Replace("[","").Replace("]","").Replace("\"","").TrimEnd(',');
        }

    }
}