紧急求助按钮备份

wxr

2022-04-21 3f45dd0172305bef0008e4e5a8725dedec2340c9

 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;
@@ -930,9 +935,9 @@
                continue;
              }
              //自动化配置输入条件纬度
              double lat = Convert.ToDouble(logicDate.geo_fence.latitude);
              double lat = Convert.ToDouble(logicDate.geo_fence.latitude.Replace(",", "."));
              //自动化配置输入条件经度
              double lon = Convert.ToDouble(logicDate.geo_fence.longitude);
              double lon = Convert.ToDouble(logicDate.geo_fence.longitude.Replace(",", "."));
              //自动化配置输入条件<地理围栏半径><单位，公里、千米.米>
              int radius = int.Parse(logicDate.geo_fence.radius);
              //计算2个经纬度之间的距离