2023年09月01日18:06:42

mac

2023-09-01 0a11352dffeb8d5f31dd40b9728fe1abf4537f04

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

@@ -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);
@@ -750,6 +757,7 @@
                                if (device.spk == SPK.SensorEnvironment || device.spk == SPK.SensorEnvironmentHailin
                                || device.spk == SPK.SensorEnvironment2
                                || device.spk == SPK.SensorEnvironment3
                                || device.spk == SPK.SensorLight
                                )
                                {
                                    ///当前的索引值数据对象
@@ -764,6 +772,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;
@@ -1510,7 +1532,7 @@
                                        }
                                        if (!string.IsNullOrEmpty(volumet))
                                        {
                                            stateStr += Language.StringByID(StringId.yinliang)+ volumet;
                                            stateStr += Language.StringByID(StringId.yinliang) + volumet;
                                        }

                                        if (!string.IsNullOrEmpty(stateStr))
@@ -1519,7 +1541,9 @@
                                        }
                                        if (!string.IsNullOrEmpty(signal))
                                        {
                                            stateStr += signal.Replace("_", " ");
                                            var p = new PublicInterface();
                                            string key = p.GetKey(p.GetHisenseSignalSourceDic(), signal);
                                            stateStr += key;
                                        }
                                        stateStr = stateStr.TrimEnd(',');
                                    }
@@ -2535,7 +2559,9 @@
                                            //怕调试软件乱上东西导致抛异常
                                            break;
                                        }
                                        button3.Text = value.Replace("_", " ");
                                        var p = new PublicInterface();
                                        string key = p.GetKey(p.GetHisenseSignalSourceDic(), value);
                                        button3.Text = key;
                                    }
                                    break;
                            }
@@ -2903,6 +2929,19 @@
                switch (key)
                {

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

                        }
                        break;
                    case "temperature":
                        {
                            if (comparator == ">")