2021-02-01 1.增加丰林可视对讲测试

JLChen

2021-02-02 c90de55be7a33e196029c1f4a1bb7f84ea449f29

 HDL_ON/Entity/FunctionList.cs

@@ -110,6 +110,10 @@
        /// 环境传感器列表
        /// </summary>
        public List<Sensor> sensorsEnvironmentalScience = new List<Sensor>();
        /// <summary>
        /// 安防设备列表
        /// </summary>
        public List<Sensor> sensorsArm = new List<Sensor>();

        public List<Scene> scenes = new List<Scene>();
        /// <summary>
@@ -201,7 +205,7 @@
                            deviceFunctionList.Add(tv);
                            break;
                        case SPK.ElectricFan:
                            var  fan = Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(functionDataString);
                            var fan = Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(functionDataString);
                            List.fans.Add(fan);
                            deviceFunctionList.Add(fan);
                            break;

@@ -219,6 +223,13 @@
                            var tuyaWeepRobot = Newtonsoft.Json.JsonConvert.DeserializeObject<WeepRobot>(functionDataString);
                            List.weepRobots.Add(tuyaWeepRobot);
                            deviceFunctionList.Add(tuyaWeepRobot);
                            break;
                        case SPK.SensorSmoke:
                        case SPK.SensorWater:
                        case SPK.SensorGas:
                            var ser = Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(functionDataString);
                            List.sensorsArm.Add(ser);
                            deviceFunctionList.Add(ser);
                            break;
                    }
                }
@@ -246,6 +257,7 @@
                deviceFunctionList.AddRange(floorHeatings);
                deviceFunctionList.AddRange(electricals);
                deviceFunctionList.AddRange(sensorsEnvironmentalScience);
                deviceFunctionList.AddRange(sensorsArm);
                deviceFunctionList.AddRange(UI.Music.A31MusicModel.A31MusicModelList);
            }
            try
@@ -384,7 +396,7 @@
                    }
                    break;
                case FunctionCategory.Sensor:
                    switch(f.spk)
                    switch (f.spk)
                    {
                        case SPK.SensorTVOC:
                        case SPK.SensorCO2:
@@ -393,6 +405,17 @@
                        case SPK.SensorTemperature:
                            List.sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(obj.ToString()));
                            break;
                        case SPK.SensorWater:
                        case SPK.SensorSmoke:
                        case SPK.SensorGas:
                        case SPK.SensorDryContact:
                        case SPK.SensorShanLan:
                        case SPK.SensorDuiShe:
                        case SPK.SensorPir:
                        case SPK.SensorDoorWindow:
                        case SPK.SensoruUtrasonic:
                            List.sensorsArm.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(obj.ToString()));
                            break;
                    }
                    break;
            }