水阀功能

wei

2021-02-01 8da70e1a39328e1769b02bb1e05303916bb30eb5

 HDL_ON/Entity/FunctionList.cs

old mode 100755
new mode 100644
@@ -75,12 +75,17 @@
                {

                    weepRobots = new List<WeepRobot>();

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

                list.AddRange(airCleaners);

                list.AddRange(weepRobots);
                list.AddRange(waterValveList);
                return list;
            }
        }
@@ -104,6 +109,10 @@
        /// 扫地机器人列表
        /// </summary>
        public List<WeepRobot> weepRobots = new List<WeepRobot>();
        /// <summary>
        /// 水阀列表
        /// </summary>
        public List<Function> waterValveList = new List<Function>();

        #endregion
        /// <summary>
@@ -140,6 +149,7 @@
        /// <param name="filePath"></param>
        public void IniFunctionList(string filePath)
        {
            // todo 增加设备，增加功能进功能列表
            if (filePath.StartsWith("FunctionData_"))
            {
                var functionDataBytes = Common.FileUtlis.Files.ReadFile(filePath);
@@ -224,6 +234,11 @@
                            List.weepRobots.Add(tuyaWeepRobot);
                            deviceFunctionList.Add(tuyaWeepRobot);
                            break;
                        case SPK.ElectricTuyaWaterValve:
                            var tuyaWaterValve = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(functionDataString);
                            List.waterValveList.Add(tuyaWaterValve);
                            deviceFunctionList.Add(tuyaWaterValve);
                            break;
                        case SPK.SensorSmoke:
                        case SPK.SensorWater:
                        case SPK.SensorGas: