20201210

wei

2020-12-11 680d96f157e4609af3e7af6f8d01ee0bf3f55063

 HDL_ON/Entity/FunctionList.cs

@@ -97,7 +97,7 @@
        /// <summary>
        /// 功能列表
        /// </summary>
        List<Function> deviceFunctionList;
        List<Function> deviceFunctionList = new List<Function>();


        /// <summary>
@@ -131,19 +131,23 @@
                        case SPK.LightRGBW:
                        case SPK.LightCCT:
                            _FunctionList.lights.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(functionDataString));
                            deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(functionDataString));
                            break;
                        case SPK.CurtainRoller:
                        case SPK.CurtainShades:
                        case SPK.CurtainSwitch:
                        case SPK.CurtainTrietex:
                            _FunctionList.curtains.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(functionDataString));
                            deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(functionDataString));
                            break;
                        case SPK.AcStandard:
                            _FunctionList.aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(functionDataString));
                            deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(functionDataString));
                            break;
                        case SPK.FloorHeatStandard:
                            //恢复地热数据
                            _FunctionList.floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(functionDataString));
                            deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(functionDataString));
                            break;
                        case SPK.SensorPm25:
                        case SPK.SensorCO2:
@@ -152,18 +156,22 @@
                        case SPK.SensorHumidity:
                            //恢复环境数据
                            _FunctionList.sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(functionDataString));
                            deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(functionDataString));
                            break;
                        case SPK.ElectricSocket:
                            //恢复插座数据
                            _FunctionList.switchSockets.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(functionDataString));
                            deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(functionDataString));
                            break;
                        case SPK.ElectricTV:
                            //恢复电视数据
                            _FunctionList.tVs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(functionDataString));
                            deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(functionDataString));
                            break;
                        case SPK.ElectricFan:
                            //恢复风扇数据
                            _FunctionList.fans.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(functionDataString));
                            deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(functionDataString));
                            break;
                    }
                }
@@ -187,6 +195,8 @@
            fs.AddRange(GetAllDeviceFunctionList());
            return fs;
        }

        //public void 

        /// <summary>
        /// 获取设备功能列表
@@ -380,6 +390,11 @@
                    var deviceList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(pack.Data.ToString());
                    if (deviceList != null)
                    {
                        foreach(var serverFunction in deviceList.list)
                        {
                            MainPage.Log($"deviceId:{serverFunction.deviceId}");
                        }

                        ////将下载到到数据全部保存
                        //new Thread(() => {
                        //    foreach (var temp in deviceList.list)
@@ -573,6 +588,11 @@
                    _FunctionList.fans.Remove(_FunctionList.fans.Find((obj) => obj.deviceId == delTemp.deviceId));
                    break;
            }
            var removeTemp = deviceFunctionList.Find((obj) => obj.deviceId == delTemp.deviceId);
            if(removeTemp!= null)
            {
                deviceFunctionList.Remove(removeTemp);
            }
            Common.FileUtlis.Files.DeleteFile(delTemp.savePath);
        }