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

wxr

2022-06-07 3afa6b622356b974a42ff29b1e4f0e35d2bf68f0

 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;
      }