Merge remote-tracking branch 'origin/wjc' into release0123

wxr

2022-03-08 f8bafd162ad7adf2f21986389568d650b71f976b

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

@@ -494,74 +494,119 @@
    public List<string> GetDeviceTypeFunctionList(string deviceType)
    {
      List<string> functionTypeList = new List<string>();
      ///灯光类
      if (deviceType == Language.StringByID(StringId.Lights))
      {
        functionTypeList.Add(SPK.LightSwitch);
        functionTypeList.Add(SPK.LightDimming);
        functionTypeList.Add(SPK.LightRGB);
        functionTypeList.Add(SPK.LightRGBW);
        functionTypeList.Add(SPK.LightCCT);
        functionTypeList.Add(SPK.AirSwitch);
        functionTypeList.Add(SPK.PanelSocket);
        functionTypeList.Add(SPK.ElectricSocket);
      }
      ///窗帘类
      else if (deviceType == Language.StringByID(StringId.Curtain))
      {
        functionTypeList.Add(SPK.CurtainSwitch);
        functionTypeList.Add(SPK.CurtainRoller);
        functionTypeList.Add(SPK.CurtainTrietex);
      }
      ///空调类
      else if (deviceType == Language.StringByID(StringId.AC))
      {
        functionTypeList.Add(SPK.AcStandard);
        functionTypeList.Add(SPK.HvacAC);
      }
      ///地暖类
      else if (deviceType == Language.StringByID(StringId.FloorHeating))
      {
        functionTypeList.Add(SPK.FloorHeatStandard); functionTypeList.Add(SPK.HvacFloorHeat);
      }
      ///新风类
      else if (deviceType == Language.StringByID(StringId.AirFresh))
      {
        functionTypeList.Add(SPK.AirFreshStandard); functionTypeList.Add(SPK.HvacAirFresh);
      }
      ///传感器类
      else if (deviceType == Language.StringByID(StringId.Sensor))
      {
        functionTypeList.Add(SPK.SensorSmoke);
        functionTypeList.Add(SPK.SensorWater);
        functionTypeList.Add(SPK.SensorGas);
        functionTypeList.Add(SPK.SensorDryContact); functionTypeList.Add(SPK.SensorDryContact2);
        functionTypeList.Add(SPK.SensorShanLan);
        functionTypeList.Add(SPK.SensorDuiShe);
        functionTypeList.Add(SPK.SensorPir);
        functionTypeList.Add(SPK.SensorDoorWindow);
        functionTypeList.Add(SPK.SensorUtrasonic);
        functionTypeList.Add(SPK.SenesorMegahealth);
        functionTypeList.Add(SPK.SenesorMegahealth2);
        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);
        functionTypeList.Add(SPK.SensorHcho);
            ///灯光类
            if (deviceType == Language.StringByID(StringId.Lights))
            {
                functionTypeList.Add(SPK.LightSwitch);
                functionTypeList.Add(SPK.LightDimming);
                functionTypeList.Add(SPK.LightRGB);
                functionTypeList.Add(SPK.LightRGBW);
                functionTypeList.Add(SPK.LightCCT);
                functionTypeList.Add(SPK.AirSwitch);
                functionTypeList.Add(SPK.PanelSocket);
                functionTypeList.Add(SPK.ElectricSocket);
            }
            ///窗帘类
            else if (deviceType == Language.StringByID(StringId.Curtain))
            {
                functionTypeList.Add(SPK.CurtainSwitch);
                functionTypeList.Add(SPK.CurtainRoller);
                functionTypeList.Add(SPK.CurtainTrietex);
            }
            ///空调类
            else if (deviceType == Language.StringByID(StringId.AC))
            {
                functionTypeList.Add(SPK.AcStandard);
                functionTypeList.Add(SPK.HvacAC);
            }
            ///地暖类
            else if (deviceType == Language.StringByID(StringId.FloorHeating))
            {
                functionTypeList.Add(SPK.FloorHeatStandard); functionTypeList.Add(SPK.HvacFloorHeat);
            }
            ///新风类
            else if (deviceType == Language.StringByID(StringId.AirFresh))
            {
                functionTypeList.Add(SPK.AirFreshStandard); functionTypeList.Add(SPK.HvacAirFresh);
            }
            ///传感器类
            else if (deviceType == Language.StringByID(StringId.Sensor))
            {
                functionTypeList.Add(SPK.SensorSmoke);
                functionTypeList.Add(SPK.SensorWater);
                functionTypeList.Add(SPK.SensorGas);
                functionTypeList.Add(SPK.SensorDryContact); functionTypeList.Add(SPK.SensorDryContact2);
                functionTypeList.Add(SPK.SensorShanLan);
                functionTypeList.Add(SPK.SensorDuiShe);
                functionTypeList.Add(SPK.SensorPir);
                functionTypeList.Add(SPK.SensorDoorWindow);
                functionTypeList.Add(SPK.SensorUtrasonic);
                functionTypeList.Add(SPK.SenesorMegahealth);
                functionTypeList.Add(SPK.SenesorMegahealth2);
                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);
                functionTypeList.Add(SPK.SensorHcho);


      }
      ///家电类
      else if (deviceType == Language.StringByID(StringId.Electric))
      {
        functionTypeList.Add(SPK.AirSwitch);
        functionTypeList.Add(SPK.PanelSocket);
        functionTypeList.Add(SPK.ElectricSocket);
      }
            }
            ///家电类
            else if (deviceType == Language.StringByID(StringId.Electric))
            {
                functionTypeList.Add(SPK.AirSwitch);
                functionTypeList.Add(SPK.PanelSocket);
                functionTypeList.Add(SPK.ElectricSocket);
            }
            else {
                functionTypeList.Add(SPK.LightSwitch);
                functionTypeList.Add(SPK.LightDimming);
                functionTypeList.Add(SPK.LightRGB);
                functionTypeList.Add(SPK.LightRGBW);
                functionTypeList.Add(SPK.LightCCT);
                functionTypeList.Add(SPK.AirSwitch);
                functionTypeList.Add(SPK.PanelSocket);
                functionTypeList.Add(SPK.ElectricSocket);
                functionTypeList.Add(SPK.CurtainSwitch);
                functionTypeList.Add(SPK.CurtainRoller);
                functionTypeList.Add(SPK.CurtainTrietex);
                functionTypeList.Add(SPK.AcStandard);
                functionTypeList.Add(SPK.HvacAC);
                functionTypeList.Add(SPK.FloorHeatStandard);
                functionTypeList.Add(SPK.HvacFloorHeat);
                functionTypeList.Add(SPK.AirFreshStandard);
                functionTypeList.Add(SPK.HvacAirFresh);
                functionTypeList.Add(SPK.SensorSmoke);
                functionTypeList.Add(SPK.SensorWater);
                functionTypeList.Add(SPK.SensorGas);
                functionTypeList.Add(SPK.SensorDryContact);
                functionTypeList.Add(SPK.SensorDryContact2);
                functionTypeList.Add(SPK.SensorShanLan);
                functionTypeList.Add(SPK.SensorDuiShe);
                functionTypeList.Add(SPK.SensorPir);
                functionTypeList.Add(SPK.SensorDoorWindow);
                functionTypeList.Add(SPK.SensorUtrasonic);
                functionTypeList.Add(SPK.SenesorMegahealth);
                functionTypeList.Add(SPK.SenesorMegahealth2);
                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);
                functionTypeList.Add(SPK.SensorHcho);
                functionTypeList.Add(SPK.AirSwitch);
                functionTypeList.Add(SPK.PanelSocket);
                functionTypeList.Add(SPK.ElectricSocket);


            }


      return functionTypeList;