blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
wei
2020-12-23 d814c978efc068425c500a553cf7ec6b4f628219 
 HDL_ON/Entity/FunctionList.cs


@@ -2,6 +2,7 @@


using System.Collections.Generic;


using System.Linq;


using System.Threading;


using HDL_ON.Common;


using HDL_ON.DAL;


using HDL_ON.DAL.Server;


using Shared;


@@ -91,10 +92,18 @@


        /// </summary>


        public List<Sensor> sensorsEnvironmentalScience = new List<Sensor>();




        public List<Scene> scenes = new List<Scene>();


        /// <summary>


        /// 场景列表


        /// </summary>


        public List<Scene> scenes = new List<Scene>();


        //public List<Scene> Scenes


        //{


        //    get


        //    {


        //        List.scenes = List.scenes.OrderByDescending(o => o.createTime).ToList();


        //        return List.scenes;


        //    }


        //}


        /// <summary>


        /// 功能列表


        /// </summary>


@@ -207,7 +216,7 @@


            }


            try


            {


                deviceFunctionList.OrderByDescending(o => o.usageCount).ToList();


                deviceFunctionList = deviceFunctionList.OrderByDescending(o => o.controlCounter).ToList();


            }


            catch (Exception ex)


            {


@@ -245,41 +254,41 @@


                case FunctionType.AC:


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


                    List.aCs.Add(sidObj);


                    sidObj.SaveFunctionData(false);


                    sidObj.SaveFunctionFile();


                    break;


                case FunctionType.FloorHeating:


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


                    List.floorHeatings.Add(sidObj1);


                    sidObj1.SaveFunctionData(false);


                    sidObj1.SaveFunctionFile();


                    break;


                case FunctionType.Dimmer:


                case FunctionType.RGB:


                case FunctionType.Relay:


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


                    List.lights.Add(sidObj2);


                    sidObj2.SaveFunctionData(false);


                    sidObj2.SaveFunctionFile();


                    break;


                case FunctionType.Curtain:


                case FunctionType.RollingShutter:


                case FunctionType.MotorCurtain:


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


                    List.curtains.Add(sidObj3 );


                    sidObj3.SaveFunctionData(false);


                    sidObj3.SaveFunctionFile();


                    break;


                case FunctionType.TV:


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


                    List.tVs.Add(sidObj4);


                    sidObj4.SaveFunctionData(false);


                    sidObj4.SaveFunctionFile();


                    break;


                case FunctionType.Socket:


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


                    List.switchSockets.Add(sidObj5);


                    sidObj5.SaveFunctionData(false);


                    sidObj5.SaveFunctionFile();


                    break;


                case FunctionType.Fan:


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


                    List.fans.Add(sidObj6);


                    sidObj6.SaveFunctionData(false);


                    sidObj6.SaveFunctionFile();


                    break;


                case FunctionType.CO2:


                case FunctionType.TVOC:


@@ -288,7 +297,7 @@


                case FunctionType.Humidity:


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


                    List.sensorsEnvironmentalScience.Add(sidObj7);


                    sidObj7.SaveFunctionData(false);


                    sidObj7.SaveFunctionFile();


                    break;


            }


        }


@@ -363,7 +372,7 @@


            }


            else


            {


                Utlis.ShowTip(Shared.Language.StringByID(StringId.EditFunctionInfoFail) + "\r\nCode:" + pack.Code);


                IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);


            }


            return pack.Code;


        }


@@ -399,16 +408,16 @@


                                }


                                else


                                {


                                    MainPage.Log($"deviceType:{localFunction.spk} local:{localFunction.modifyTime} server:{newFunction.modifyTime}");


                                    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;


                                        localFunction.roomIds = newFunction.roomIds;


                                        localFunction.bus = newFunction.bus;


                                        localFunction.SaveFunctionData(false);


                                        localFunction.SaveFunctionFile();


                                    }


                                    deviceList.list.Remove(newFunction);//操作完的数据清理掉，剩下的就是新增的功能


                                }


@@ -417,7 +426,7 @@


                        //处理剩下的新增功能


                        foreach (var newFunction in deviceList.list)


                        {


                            newFunction.SaveFunctionData(false);


                            newFunction.SaveFunctionFile();


                            List.IniFunctionList(newFunction.savePath);


                        }


                    }


@@ -490,8 +499,10 @@


        }








        /// <summary>


        /// 删除场景


        /// todo


        /// </summary>


        public void DeleteScene(Scene scene,bool upSevser)


        {


@@ -501,22 +512,22 @@


                var packCode = pm.DeleteScene(scene.userSceneId);


                if (packCode == StateCode.SUCCESS)


                {


                    Common.FileUtlis.Files.DeleteFile(scene.savePath);


                    FileUtlis.Files.DeleteFile(scene.savePath);


                    List.scenes.Remove(scene);


                }


                else


                {


                    Utlis.ShowTip(Shared.Language.StringByID(StringId.DeleteSceneFail) + "Code:" + packCode);


                    IMessageCommon.Current.ShowErrorInfoAlter(packCode);


                }


            }


            else


            {


                Common.FileUtlis.Files.DeleteFile(scene.savePath);


                FileUtlis.Files.DeleteFile(scene.savePath);


                List.scenes.Remove(scene);


            }


        }


        /// <summary>


        /// 删除本地功能文件


        /// 删除本地功能及文件


        /// </summary>


        public void DeleteFunction(Function delTemp)


        {


@@ -590,12 +601,21 @@


                {


                    if (DriverLayer.Control.Ins.IsRemote)


                    {


                        var functionIds = new List<string>();


                        var page = new List<string>();


                        int count = 0;




                        foreach (var function in GetDeviceFunctionList())


                        {


                            functionIds.Add(function.deviceId);


                            page.Add(function.deviceId);


                            count++;


                            if (count > 9)


                            {


                                DriverLayer.Control.Ins.SendApiReadCommand(page);


                                page.Clear();


                                count = 0;


                            }


                        }


                        DriverLayer.Control.Ins.SendApiReadCommand(functionIds);


                        DriverLayer.Control.Ins.SendApiReadCommand(page);


                    }


                    else


                    {


@@ -630,7 +650,7 @@


        /// <summary>


        /// 添加场景


        /// </summary>


        public Scene AddScene(Scene scene,out string result)


        public string AddScene(Scene scene, out Scene result)


        {


            Scene tempScene = null;


            var pm = new HttpServerRequest();


@@ -638,14 +658,47 @@


            if (revPack.Code == StateCode.SUCCESS)


            {


                var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(revPack.Data.ToString());


                tempScene = sceneList.Find((obj) => obj.userSceneId == scene.userSceneId);


                tempScene = sceneList.Find((obj) => obj.sid == scene.sid);


                var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(tempScene));


                Common.FileUtlis.Files.WriteFileByBytes(scene.savePath, ssd);


                FileUtlis.Files.WriteFileByBytes(scene.savePath, ssd);


                result = tempScene;


            }


            result = revPack.Code;


            return tempScene;


            else


            {


                result = tempScene;


            }


            return revPack.Code;


        }


        #endregion




        #region 收藏功能


     


        /// <summary>


        /// 收藏场景


        /// </summary>


        public string CollectScene(Scene scene)


        {


            var result = "";


            if (scene.collect)


            {


                result = ApiUtlis.Ins.HttpRequest.CollectDevice(scene.userSceneId).Code;


            }


            else


            {


                result = ApiUtlis.Ins.HttpRequest.CancelCollectDevice(scene.userSceneId).Code;


            }




            //提示错误


            if (result != StateCode.SUCCESS)


            {


                IMessageCommon.Current.ShowErrorInfoAlter(result);


            }




            return result;


        }




        #endregion 






        #region 功能文本相关


        /// <summary>


@@ -687,6 +740,9 @@


                case FunctionAttributeKey.Percent:


                    text = Language.StringByID(StringId.PercentAdjustment);


                    break;


                case FunctionAttributeKey.FadeTime:


                    text = Language.StringByID(StringId.FadeSpeed);


                    break;


            }


            return text;


        }