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

wxr

2022-06-10 cf145d2d389c9d45ec0fd8bfa853d3481c29910e

 HDL_ON/UI/MainPage.cs

@@ -133,6 +133,7 @@
          _RoomNotSupportFunctionList.Add(SPK.ElectricEnergy);
          _RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList());
          _RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList());
          _RoomNotSupportFunctionList.AddRange(SPK.PanelSpkList());
        }
        return _RoomNotSupportFunctionList;
      }