20200811

wxr

2020-08-11 2bec9c838d2d688025698de8ec1de401ffd7dd1f

 HDL_ON/Entity/FunctionList.cs

@@ -84,6 +84,7 @@
            deviceFunctionList.AddRange(floorHeatings);
            deviceFunctionList.AddRange(electricals);
            deviceFunctionList.AddRange(sensorsEnvironmentalScience);
            deviceFunctionList.AddRange(HDL_ON.UI.Music.A31MusicModel.A31MusicModelList);

            return deviceFunctionList.OrderByDescending(o => o.usageCount).ToList();
        }
@@ -132,7 +133,7 @@
                        case FunctionType.CO2:
                        case FunctionType.PM25:
                        case FunctionType.Humidity:
                        case FunctionType.Noise:
                        //case FunctionType.Noise:
                            sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(obj.ToString()));
                            break;
                    }