修改启动屏幕

wxr

2023-04-11 cd70a2a8a2bdebf51259d8f39ed110a34b9be9e5

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

@@ -162,6 +162,7 @@
                                //空调
                                case SPK.AcStandard:
                                case SPK.HvacAC:
                                case SPK.AcIr:
                                //地热
                                case SPK.HvacFloorHeat:
                                case SPK.FloorHeatStandard:
@@ -311,7 +312,7 @@
                                        }
                                    }
                                    break;
                                case SPK.SensorEnvironment:
                                case SPK.SensorEnvironment:case SPK.SensorEnvironmentHailin:
                                case SPK.SensorEnvironment2:
                                case SPK.SensorEnvironment3:
                                    {
@@ -404,6 +405,12 @@
                                        {
                                            inputView.btnState.Text = Language.StringByID(StringId.kaiqi);
                                        }
                                    }
                                    break;
                                case SPK.VideoDoorLock:
                                    {
                                        string value = this.GetValue(dicList);
                                        inputView.btnState.Text = value;
                                    }
                                    break;
                                case SPK.doorgate:
@@ -672,7 +679,7 @@
                            {
                                //用sid找到设备；
                                var device = LogicMethod.Current.GetDevice(inputCondition.sid);
                                if (device.spk == SPK.SensorEnvironment
                                if (device.spk == SPK.SensorEnvironment || device.spk == SPK.SensorEnvironmentHailin
                                || device.spk == SPK.SensorEnvironment2
                                || device.spk == SPK.SensorEnvironment3
                                )
@@ -757,6 +764,12 @@
                                {

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

                                }
                                else if (device.spk == SPK.SensorPm10)
                                {

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

                                }
                                else if (device.spk == SPK.SensorPm25)
@@ -1075,6 +1088,7 @@
                                    break;
                                case SPK.AcStandard:
                                case SPK.HvacAC:
                                case SPK.AcIr:
                                    {
                                        string on_off = GetKeyValue("on_off", dicList);
                                        string set_temp = GetKeyValue("set_temp", dicList);
@@ -1656,6 +1670,7 @@
                    break;
                case SPK.AcStandard:
                case SPK.HvacAC:
                case SPK.AcIr:
                    {
                        foreach (var dic in dicList)
                        {
@@ -2122,6 +2137,15 @@
                        }
                    }
                    break;
                case SPK.VideoDoorLock:
                    {
                        foreach (var dic in dicList)
                        {
                            string value = dic["value"];
                            button1.Text = value;
                        }
                    }
                    break;
                case SPK.MusicStandard:
                case SPK.AvMusic:
                    {
@@ -2321,6 +2345,7 @@
                                    break;
                                case SPK.AcStandard:
                                case SPK.HvacAC:
                                case SPK.AcIr:
                                case SPK.FloorHeatStandard:
                                case SPK.HvacFloorHeat:
                                    {
@@ -2514,6 +2539,11 @@
                            strtext = Language.StringByID(StringId.co2) + new PublicInterface { }.GetString("co2", value);
                        }
                        break;
                    case "pm10":
                        {
                            strtext = Language.StringByID(StringId.pm10) + new PublicInterface { }.GetString("pm25", value);
                        }
                        break;
                    case "pm25":
                        {
                            strtext = Language.StringByID(StringId.pm25) + new PublicInterface { }.GetString("pm25", value);
@@ -2540,8 +2570,9 @@
            Input inputedit = Logic.currlogic.input[indexVulae];
            ///状态值
            string stateValue = "";
            foreach (var dic in inputedit.condition)
            for (int i=0;i<inputedit.condition.Count;i++)
            {
                var dic = inputedit.condition[i];
                string comparator = dic["comparator"];
                stateValue = dic["value"];
                switch (key)
@@ -2580,6 +2611,11 @@
                            ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "co2", StringId.co2, indexVulae, true, stateValue);
                        }
                        break;
                    case "pm10":
                        {
                            ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "pm10", StringId.pm10, indexVulae, true, stateValue);
                        }
                        break;
                    case "pm25":
                        {
                            ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "pm25", StringId.pm25, indexVulae, true, stateValue);