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

wxr

2022-04-21 df93e50c747a585aa3acad599ba9be7d9617872d

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

@@ -392,6 +392,7 @@
        case SPK.SensorPm25:
        case SPK.SensorTVOC:
        case SPK.SensorHcho:
                case SPK.SensorHelp:
          {
            strPath = "LogicIcon/sensor.png";
          }
@@ -471,6 +472,7 @@
                || device.spk == SPK.SensorPm25
                  || device.spk == SPK.SensorTVOC
                    || device.spk == SPK.SensorHcho
                          || device.spk == SPK.SensorHelp
      );
      if (sensor != null)
      {
@@ -556,6 +558,7 @@
                functionTypeList.Add(SPK.SensorPm25);
                functionTypeList.Add(SPK.SensorTVOC);
                functionTypeList.Add(SPK.SensorHcho);
                functionTypeList.Add(SPK.SensorHelp);


            }
@@ -566,7 +569,8 @@
                functionTypeList.Add(SPK.PanelSocket);
                functionTypeList.Add(SPK.ElectricSocket);
            }
            else {
            else
            {
                functionTypeList.Add(SPK.LightSwitch);
                functionTypeList.Add(SPK.LightDimming);
                functionTypeList.Add(SPK.LightRGB);
@@ -609,6 +613,7 @@
                functionTypeList.Add(SPK.PanelSocket);
                functionTypeList.Add(SPK.ElectricSocket);
                functionTypeList.Add(SPK.HvacCac);
                functionTypeList.Add(SPK.SensorHelp);

            }

@@ -662,6 +667,7 @@
            deviceTypeList.Add(SPK.PanelSocket);
            deviceTypeList.Add(SPK.ElectricSocket);
                        deviceTypeList.Add(SPK.HvacCac);
                        deviceTypeList.Add(SPK.SensorHelp);

          }
          break;