Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project...

wei

2021-08-27 eda3fb873e59544ff36301b51e05aef64f87b0f9

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

@@ -344,6 +344,11 @@
                        strPath = "LogicIcon/heatlogic.png";
                    }
                    break;
                case SPK.AirFreshStandard:
                    {
                        strPath = "LogicIcon/heatlogic.png";
                    }
                    break;
                case SPK.SensorSmoke:
                case SPK.SensorWater:
                case SPK.SensorGas:
@@ -357,6 +362,11 @@
                case SPK.SensorEnvironment:
                case SPK.SensorEnvironment2:
                case SPK.SensorEnvironment3:
                case SPK.SensorTemperature:
                case SPK.SensorHumidity:
                case SPK.SensorCO2:
                case SPK.SensorPm25:
                case SPK.SensorTVOC:
                    {
                        strPath = "LogicIcon/sensor.png";
                    }
@@ -404,6 +414,11 @@
            {
                deviceStrTypeList.Add(Language.StringByID(StringId.FloorHeating));
            }
            var airFresh = deviceList.Find((device) => device.spk == SPK.AirFreshStandard);
            if (airFresh != null)
            {
                deviceStrTypeList.Add(Language.StringByID(StringId.AirFresh));
            }
            var sensor = deviceList.Find((device) =>
            device.spk == SPK.SensorWater
            || device.spk == SPK.SensorGas
@@ -418,6 +433,11 @@
            || device.spk == SPK.SensorEnvironment
             || device.spk == SPK.SensorEnvironment2
              || device.spk == SPK.SensorEnvironment3
                || device.spk == SPK.SensorTemperature
                  || device.spk == SPK.SensorHumidity
                    || device.spk == SPK.SensorCO2
                      || device.spk == SPK.SensorPm25
                        || device.spk == SPK.SensorTVOC
            );
            if (sensor != null)
            {
@@ -456,6 +476,10 @@
            {
                functionTypeList.Add(SPK.FloorHeatStandard);
            }
            else if (deviceType == Language.StringByID(StringId.AirFresh))
            {
                functionTypeList.Add(SPK.AirFreshStandard);
            }
            else if (deviceType == Language.StringByID(StringId.Sensor))
            {
                functionTypeList.Add(SPK.SensorSmoke);
@@ -471,6 +495,11 @@
                functionTypeList.Add(SPK.SensorEnvironment);
                functionTypeList.Add(SPK.SensorEnvironment2);
                functionTypeList.Add(SPK.SensorEnvironment3);
                functionTypeList.Add(SPK.SensorTemperature);
                functionTypeList.Add(SPK.SensorHumidity);
                functionTypeList.Add(SPK.SensorCO2);
                functionTypeList.Add(SPK.SensorPm25);
                functionTypeList.Add(SPK.SensorTVOC);


            }
@@ -511,6 +540,11 @@
                        deviceTypeList.Add(SPK.SensorEnvironment);
                        deviceTypeList.Add(SPK.SensorEnvironment2);
                        deviceTypeList.Add(SPK.SensorEnvironment3);
                        deviceTypeList.Add(SPK.SensorTemperature);
                        deviceTypeList.Add(SPK.SensorHumidity);
                        deviceTypeList.Add(SPK.SensorCO2);
                        deviceTypeList.Add(SPK.SensorPm25);
                        deviceTypeList.Add(SPK.SensorTVOC);

                    }
                    break;
@@ -526,6 +560,7 @@
                        deviceTypeList.Add(SPK.CurtainTrietex);
                        deviceTypeList.Add(SPK.AcStandard);
                        deviceTypeList.Add(SPK.FloorHeatStandard);
                        deviceTypeList.Add(SPK.AirFreshStandard);
                    }
                    break;
            }