Merge branch 'dev-tzy' into NewFilePath

wxr

2021-01-28 48c07e0a371f67b97abc7c2e61d7f23d060324fc

 HDL_ON/Entity/FunctionList.cs

old mode 100644
new mode 100755
@@ -67,10 +67,20 @@
                {
                    tVs = new List<TV>();
                }
                if (airCleaners == null)

                {

                    airCleaners = new List<AirCleaner>();

                }

                if (weepRobots == null)

                {

                    weepRobots = new List<WeepRobot>();

                }
                var list = new List<Function>();
                list.AddRange(fans);
                list.AddRange(switchSockets);
                list.AddRange(tVs);
                list.AddRange(tVs);

                list.AddRange(airCleaners);

                list.AddRange(weepRobots);
                return list;
            }
        }
@@ -85,7 +95,16 @@
        /// <summary>
        /// 家电列表
        /// </summary>
        public List<SwitchSocket> switchSockets = new List<SwitchSocket>();
        public List<SwitchSocket> switchSockets = new List<SwitchSocket>();

        /// <summary>
        /// 空气净化器列表
        /// </summary>
        public List<AirCleaner> airCleaners = new List<AirCleaner>();

        /// <summary>
        /// 扫地机器人列表
        /// </summary>
        public List<WeepRobot> weepRobots = new List<WeepRobot>();

        #endregion
        /// <summary>
        /// 环境传感器列表
@@ -189,6 +208,21 @@
                            var fan = Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(functionDataString);
                            List.fans.Add(fan);
                            deviceFunctionList.Add(fan);
                            break;

                        case SPK.ElectricTuyaAirCleaner:
                            var airCleaner = Newtonsoft.Json.JsonConvert.DeserializeObject<AirCleaner>(functionDataString);
                            List.airCleaners.Add(airCleaner);
                            deviceFunctionList.Add(airCleaner);

                            break;

                        case SPK.ElectricTuyaFan:
                            var tuyaFan = Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(functionDataString);
                            List.fans.Add(tuyaFan);
                            deviceFunctionList.Add(tuyaFan);

                            break;

                        case SPK.ElectricTuyaWeepRobot:
                            var tuyaWeepRobot = Newtonsoft.Json.JsonConvert.DeserializeObject<WeepRobot>(functionDataString);
                            List.weepRobots.Add(tuyaWeepRobot);
                            deviceFunctionList.Add(tuyaWeepRobot);
                            break;
                        case SPK.SensorSmoke:
                        case SPK.SensorWater: