blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
JLChen
2020-12-14 9c8baf7e7e1169ebdf7d5f7ed33ab29dd5fcbf18 
 HDL_ON/Entity/FunctionList.cs


@@ -185,23 +185,10 @@


            }


        }






        /// <summary>


        /// 获取所有功能列表


        /// </summary>


        public List<Function> GetAllFunction()


        {


            var fs = new List<Function>();


            fs.AddRange(GetAllDeviceFunctionList());


            return fs;


        }




        //public void 




        /// <summary>


        /// 获取设备功能列表


        /// </summary>


        public List<Function> GetAllDeviceFunctionList()


        public List<Function> GetDeviceFunctionList()


        {


            if (deviceFunctionList == null || deviceFunctionList.Count == 0)


            {


@@ -227,18 +214,19 @@


        /// <summary>


        /// 清空设备功能列表


        /// </summary>


        public void ClearAllDeviceFunctionList()


        public void Clear()


        {


            aCs = new List<AC>();


            lights = new List<Light>();


            curtains = new List<Curtain>();


            floorHeatings = new List<FloorHeating>();


            tVs = new List<TV>();


            switchSockets = new List<SwitchSocket>();


            fans = new List<Fan>();


            sensorsEnvironmentalScience = new List<Sensor>();


            scenes = new List<Scene>();


            deviceFunctionList = null;


            _FunctionList.aCs = new List<AC>();


            _FunctionList.lights = new List<Light>();


            _FunctionList.curtains = new List<Curtain>();


            _FunctionList.floorHeatings = new List<FloorHeating>();


            _FunctionList.tVs = new List<TV>();


            _FunctionList.switchSockets = new List<SwitchSocket>();


            _FunctionList.fans = new List<Fan>();


            _FunctionList.sensorsEnvironmentalScience = new List<Sensor>();


            _FunctionList.scenes = new List<Scene>();


            _FunctionList.deviceFunctionList = null;


            _FunctionList = null;


        }




        /// <summary>


@@ -252,41 +240,41 @@


            {


                case FunctionType.AC:


                    var sidObj =  Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));


                    DB_ResidenceData.functionList.aCs.Add(sidObj);


                    List.aCs.Add(sidObj);


                    sidObj.SaveFunctionData(false);


                    break;


                case FunctionType.FloorHeating:


                    var sidObj1 =  Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));


                    DB_ResidenceData.functionList.floorHeatings.Add(sidObj1);


                    List.floorHeatings.Add(sidObj1);


                    sidObj1.SaveFunctionData(false);


                    break;


                case FunctionType.Dimmer:


                case FunctionType.RGB:


                case FunctionType.Relay:


                    var sidObj2 =  Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));


                    DB_ResidenceData.functionList.lights.Add(sidObj2);


                    List.lights.Add(sidObj2);


                    sidObj2.SaveFunctionData(false);


                    break;


                case FunctionType.Curtain:


                case FunctionType.RollingShutter:


                case FunctionType.MotorCurtain:


                    var sidObj3 =  Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));


                    DB_ResidenceData.functionList.curtains.Add(sidObj3 );


                    List.curtains.Add(sidObj3 );


                    sidObj3.SaveFunctionData(false);


                    break;


                case FunctionType.TV:


                    var sidObj4 =  Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));


                    DB_ResidenceData.functionList.tVs.Add(sidObj4);


                    List.tVs.Add(sidObj4);


                    sidObj4.SaveFunctionData(false);


                    break;


                case FunctionType.Socket:


                    var sidObj5 =  Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));


                    DB_ResidenceData.functionList.switchSockets.Add(sidObj5);


                    List.switchSockets.Add(sidObj5);


                    sidObj5.SaveFunctionData(false);


                    break;


                case FunctionType.Fan:


                    var sidObj6 =  Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));


                    DB_ResidenceData.functionList.fans.Add(sidObj6);


                    List.fans.Add(sidObj6);


                    sidObj6.SaveFunctionData(false);


                    break;


                case FunctionType.CO2:


@@ -295,7 +283,7 @@


                case FunctionType.Temp:


                case FunctionType.Humidity:


                    var sidObj7 =  Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));


                    DB_ResidenceData.functionList.sensorsEnvironmentalScience.Add(sidObj7);


                    List.sensorsEnvironmentalScience.Add(sidObj7);


                    sidObj7.SaveFunctionData(false);


                    break;


            }


@@ -390,22 +378,9 @@


                    var deviceList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(pack.Data.ToString());


                    if (deviceList != null)


                    {


                        foreach(var serverFunction in deviceList.list)


                        for (int i =0;i < List.GetDeviceFunctionList().Count;)


                        {


                            MainPage.Log($"deviceId:{serverFunction.deviceId}");


                        }




                        ////将下载到到数据全部保存


                        //new Thread(() => {


                        //    foreach (var temp in deviceList.list)


                        //    {


                        //        temp.SaveFunctionData();


                        //    }


                        //})


                        //{ IsBackground = true }.Start();


                        for (int i =0;i < List.GetAllDeviceFunctionList().Count;)


                        {


                            var localFunction = List.GetAllDeviceFunctionList()[i];


                            var localFunction = List.GetDeviceFunctionList()[i];


                            var newFunction = deviceList.list.Find((obj) => obj.deviceId == localFunction.deviceId);


                            if (newFunction == null)//如果云端最新数据没有该条数据，则本地需要删掉该数据记录


                            {


@@ -416,6 +391,7 @@


                                i++;


                                if (localFunction.modifyTime != newFunction.modifyTime)


                                {


                                    MainPage.Log($"local:{localFunction.modifyTime}\r\n server:{newFunction.modifyTime}");


                                    localFunction.name = newFunction.name;


                                    localFunction.collect = newFunction.collect;


                                    localFunction.modifyTime = newFunction.modifyTime;


@@ -505,21 +481,6 @@


        }






        /// <summary>


        /// 删除手机存储都所有缓存功能数据


        /// </summary>


        public void DelAllFunctionData()


        {


            var filePathList = Common.FileUtlis.Files.ReadFiles();


            foreach (var filePath in filePathList)


            {


                if (filePath.StartsWith("FunctionData_") && filePath.Length == 13 + 28)


                {


                    Common.FileUtlis.Files.DeleteFile(filePath);


                }


            }


            _FunctionList = new FunctionList();


        }


        /// <summary>


        /// 删除场景


        /// </summary>


@@ -621,7 +582,7 @@


                    if (DriverLayer.Control.Ins.IsRemote)


                    {


                        var functionIds = new List<string>();


                        foreach (var function in GetAllDeviceFunctionList())


                        foreach (var function in GetDeviceFunctionList())


                        {


                            functionIds.Add(function.deviceId);


                        }


@@ -629,7 +590,7 @@


                    }


                    else


                    {


                        foreach (var function in GetAllDeviceFunctionList())


                        foreach (var function in GetDeviceFunctionList())


                        {


                            switch (function.functionCategory)


                            {