Merge branch 'Dev-Branch' into wxr0114

wxr

2022-06-13 da1a17600b9ca8c8980ba64447688ee0a6718756

 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:
          {
@@ -389,8 +392,14 @@
        case SPK.SensorPm25:
        case SPK.SensorTVOC:
        case SPK.SensorHcho:
                case SPK.SensorHelp:
          {
            strPath = "LogicIcon/sensor.png";
                    }
                    break;
                case SPK.DoorLock:
                    {
                        strPath = "FunctionIcon/DoorLock/DoorLock.png";
          }
          break;

@@ -468,6 +477,7 @@
                || device.spk == SPK.SensorPm25
                  || device.spk == SPK.SensorTVOC
                    || device.spk == SPK.SensorHcho
                          || device.spk == SPK.SensorHelp
      );
      if (sensor != null)
      {
@@ -482,6 +492,12 @@
      if (electric != null)
      {
        deviceStrTypeList.Add(Language.StringByID(StringId.Electric));
            }
            ///门锁类
            var doorlock = deviceList.Find((device) => device.spk == SPK.DoorLock);
            if (doorlock != null)
            {
                deviceStrTypeList.Add(Language.StringByID(StringId.DoorLock));
      }
      return deviceStrTypeList;

@@ -518,6 +534,7 @@
            {
                functionTypeList.Add(SPK.AcStandard);
                functionTypeList.Add(SPK.HvacAC);
                functionTypeList.Add(SPK.HvacCac);
            }
            ///地暖类
            else if (deviceType == Language.StringByID(StringId.FloorHeating))
@@ -552,6 +569,7 @@
                functionTypeList.Add(SPK.SensorPm25);
                functionTypeList.Add(SPK.SensorTVOC);
                functionTypeList.Add(SPK.SensorHcho);
                functionTypeList.Add(SPK.SensorHelp);


            }
@@ -562,7 +580,13 @@
                functionTypeList.Add(SPK.PanelSocket);
                functionTypeList.Add(SPK.ElectricSocket);
            }
            else {
            ///门锁类
            else if (deviceType == Language.StringByID(StringId.DoorLock))
            {
                functionTypeList.Add(SPK.DoorLock); 
            }
            else
            {
                functionTypeList.Add(SPK.LightSwitch);
                functionTypeList.Add(SPK.LightDimming);
                functionTypeList.Add(SPK.LightRGB);
@@ -604,8 +628,9 @@
                functionTypeList.Add(SPK.AirSwitch);
                functionTypeList.Add(SPK.PanelSocket);
                functionTypeList.Add(SPK.ElectricSocket);


                functionTypeList.Add(SPK.HvacCac);
                functionTypeList.Add(SPK.SensorHelp);
                functionTypeList.Add(SPK.DoorLock);
            }


@@ -657,6 +682,9 @@
            deviceTypeList.Add(SPK.AirSwitch);
            deviceTypeList.Add(SPK.PanelSocket);
            deviceTypeList.Add(SPK.ElectricSocket);
                        deviceTypeList.Add(SPK.HvacCac);
                        deviceTypeList.Add(SPK.SensorHelp);
                        deviceTypeList.Add(SPK.DoorLock);

          }
          break;