Merge remote-tracking branch 'origin/WJC' into NewFilePath

wei

2020-12-11 82423359112f65458fd9a80418da0bda5e9364d9

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

@@ -363,8 +363,10 @@
        public static List<FunctionType> GetSupportEquipment(string if_type)  
        {
            List<FunctionType> deviceTypeList = new List<FunctionType>();
            switch (if_type) {
                case condition_if: {
            switch (if_type)
            {
                case condition_if:
                    {
                        deviceTypeList.Add(FunctionType.Relay);
                        deviceTypeList.Add(FunctionType.RGB);
                        deviceTypeList.Add(FunctionType.RGBW);