Merge remote-tracking branch 'origin/Dev-Branch' into wjc

wjc

2022-04-08 13faa230078dcf13bee96a101849e256c186de6e

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

@@ -356,6 +356,9 @@
            strPath = "LogicIcon/airconditionerlogic.png";
          }
          break;
        case SPK.HvacCac:
            strPath = "FunctionIcon/Icon/hvaccac.png";
            break;
        case SPK.FloorHeatStandard:
        case SPK.HvacFloorHeat:
          {
@@ -518,6 +521,7 @@
            {
                functionTypeList.Add(SPK.AcStandard);
                functionTypeList.Add(SPK.HvacAC);
                functionTypeList.Add(SPK.HvacCac);
            }
            ///地暖类
            else if (deviceType == Language.StringByID(StringId.FloorHeating))
@@ -604,7 +608,7 @@
                functionTypeList.Add(SPK.AirSwitch);
                functionTypeList.Add(SPK.PanelSocket);
                functionTypeList.Add(SPK.ElectricSocket);

                functionTypeList.Add(SPK.HvacCac);

            }

@@ -657,6 +661,7 @@
            deviceTypeList.Add(SPK.AirSwitch);
            deviceTypeList.Add(SPK.PanelSocket);
            deviceTypeList.Add(SPK.ElectricSocket);
                        deviceTypeList.Add(SPK.HvacCac);

          }
          break;