Merge branch 'master' into wjc

陈嘉乐

2021-03-03 375751523a86b9ba0b3a27f04c3d3c4f19538690

 Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingDevicePage.cs

@@ -201,6 +201,9 @@
        {
            deviceScrolView.RemoveAll ();
            foreach (Function function in CommonConfig.Current.FunctionList) {
                //过滤通用开关不允许显示和添加
                if (function.spk == SPK.UniversalDevice) continue;

                AddRowView (function);
            }