2020-12-12 1.解锁逻辑优化

JLChen

2020-12-12 b3abfd30576871c32f2839a322fa3bb783f96498

 HDL_ON/Entity/FunctionList.cs

@@ -18,7 +18,7 @@
                {
                    _FunctionList = new FunctionList();
                    #region 恢复数据
                    var filePathList = FileUtils.ReadFiles();
                    var filePathList = Common.FileUtlis.Files.ReadFiles();
                    foreach (var filePath in filePathList)
                    {
                        _FunctionList.IniFunctionList(filePath);
@@ -97,7 +97,7 @@
        /// <summary>
        /// 功能列表
        /// </summary>
        List<Function> deviceFunctionList;
        List<Function> deviceFunctionList = new List<Function>();


        /// <summary>
@@ -109,9 +109,14 @@
        {
            if (filePath.StartsWith("FunctionData_"))
            {
                var functionDataBytes = FileUtils.ReadFile(filePath);
                var functionDataBytes = Common.FileUtlis.Files.ReadFile(filePath);
                var functionDataString = System.Text.Encoding.UTF8.GetString(functionDataBytes);
                var tempFunction = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(functionDataString);
                if (tempFunction == null)
                {
                    Common.FileUtlis.Files.DeleteFile(filePath);
                    return;
                }
                if (tempFunction.DeleteSign)
                {
                    //todo 删除云端数据 20201203--App不能删除功能数据
@@ -126,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:
@@ -147,25 +156,29 @@
                        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;
                    }
                }
            }
            if (filePath.StartsWith("SceneData_"))
            {
                var sceneDataBytes = FileUtils.ReadFile(filePath);
                var sceneDataBytes = Common.FileUtlis.Files.ReadFile(filePath);
                var sceneDataString = System.Text.Encoding.UTF8.GetString(sceneDataBytes);
                var tempScene = Newtonsoft.Json.JsonConvert.DeserializeObject<Scene>(sceneDataString);
                List.scenes.Add(tempScene);
@@ -183,12 +196,14 @@
            return fs;
        }

        //public void 

        /// <summary>
        /// 获取设备功能列表
        /// </summary>
        public List<Function> GetAllDeviceFunctionList()
        {
            //if (deviceFunctionList == null)
            if (deviceFunctionList == null || deviceFunctionList.Count == 0)
            {
                deviceFunctionList = new List<Function>();
                deviceFunctionList.AddRange(aCs);
@@ -344,6 +359,24 @@
        }

        /// <summary>
        /// 功能绑定房间
        /// </summary>
        public string FunctionsBindRooms(List<string> roomIds,List<string> deviceIds)
        {
            var pm = new HttpServerRequest();
            var pack = pm.BindDeviceToRoom(deviceIds, roomIds);
            if(pack.Code == StateCode.SUCCESS)
            {

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

        /// <summary>
        /// 下来云端设备数据
        /// </summary>
        public void DownloadFunctionList()
@@ -357,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)
@@ -365,8 +403,9 @@
                        //    }
                        //})
                        //{ IsBackground = true }.Start();
                        foreach (var localFunction in List.GetAllDeviceFunctionList())
                        for (int i =0;i < List.GetAllDeviceFunctionList().Count;)
                        {
                            var localFunction = List.GetAllDeviceFunctionList()[i];
                            var newFunction = deviceList.list.Find((obj) => obj.deviceId == localFunction.deviceId);
                            if (newFunction == null)//如果云端最新数据没有该条数据，则本地需要删掉该数据记录
                            {
@@ -374,6 +413,7 @@
                            }
                            else
                            {
                                i++;
                                if (localFunction.modifyTime != newFunction.modifyTime)
                                {
                                    localFunction.name = newFunction.name;
@@ -393,7 +433,7 @@
                            List.IniFunctionList(newFunction.savePath);
                        }
                    }
                    MainPage.Log($"读取云端设备数据:\r\n{ pack.Data.ToString()}");
                    //MainPage.Log($"读取云端设备数据:\r\n{ pack.Data.ToString()}");
                }
                else
                {
@@ -414,7 +454,7 @@
                var pack = pm.GetSceneList();
                if(pack.Code == StateCode.SUCCESS)
                {
                    MainPage.Log($"读取云端场景数据:\r\n{pack.Data.ToString()}");
                    //MainPage.Log($"读取云端场景数据:\r\n{pack.Data.ToString()}");
                    var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
                    if (sceneList != null)
                    {
@@ -426,8 +466,9 @@
                        //    }
                        //})
                        //{ IsBackground = true }.Start();
                        foreach (var localScene in List.scenes)
                        for(int i=0;i<List.scenes.Count;)
                        {
                            var localScene = List.scenes[i];
                            var newScene = sceneList.Find((obj) => obj.userSceneId == localScene.userSceneId);
                            if (newScene == null)//如果云端最新数据没有该条数据，则本地需要删掉该数据记录
                            {
@@ -435,6 +476,7 @@
                            }
                            else
                            {
                                i++;
                                if (localScene.modifyTime != newScene.modifyTime)
                                {
                                    localScene.name = newScene.name;
@@ -468,12 +510,12 @@
        /// </summary>
        public void DelAllFunctionData()
        {
            var filePathList = FileUtils.ReadFiles();
            var filePathList = Common.FileUtlis.Files.ReadFiles();
            foreach (var filePath in filePathList)
            {
                if (filePath.StartsWith("FunctionData_") && filePath.Length == 13 + 28)
                {
                    FileUtils.DeleteFile(filePath);
                    Common.FileUtlis.Files.DeleteFile(filePath);
                }
            }
            _FunctionList = new FunctionList();
@@ -489,7 +531,7 @@
                var packCode = pm.DeleteScene(scene.userSceneId);
                if (packCode == StateCode.SUCCESS)
                {
                    FileUtils.DeleteFile(scene.savePath);
                    Common.FileUtlis.Files.DeleteFile(scene.savePath);
                    List.scenes.Remove(scene);
                }
                else
@@ -499,7 +541,7 @@
            }
            else
            {
                FileUtils.DeleteFile(scene.savePath);
                Common.FileUtlis.Files.DeleteFile(scene.savePath);
                List.scenes.Remove(scene);
            }
        }
@@ -546,7 +588,12 @@
                    _FunctionList.fans.Remove(_FunctionList.fans.Find((obj) => obj.deviceId == delTemp.deviceId));
                    break;
            }
            FileUtils.DeleteFile(delTemp.savePath);
            var removeTemp = deviceFunctionList.Find((obj) => obj.deviceId == delTemp.deviceId);
            if(removeTemp!= null)
            {
                deviceFunctionList.Remove(removeTemp);
            }
            Common.FileUtlis.Files.DeleteFile(delTemp.savePath);
        }

        bool lockReadFunctionStatus = false;
@@ -571,17 +618,29 @@
                lockReadFunctionStatus = true;
                try
                {
                    foreach (var function in GetAllDeviceFunctionList())
                    if (DriverLayer.Control.Ins.IsRemote)
                    {
                        switch (function.functionCategory)
                        var functionIds = new List<string>();
                        foreach (var function in GetAllDeviceFunctionList())
                        {
                            case FunctionCategory.Light:
                            case FunctionCategory.Electrical:
                            case FunctionCategory.SwitchDevice:
                            case FunctionCategory.Curtain:
                            case FunctionCategory.Thermostat:
                                DriverLayer.Control.Ins.SendReadCommand(function);
                                break;
                            functionIds.Add(function.deviceId);
                        }
                        DriverLayer.Control.Ins.SendApiReadCommand(functionIds);
                    }
                    else
                    {
                        foreach (var function in GetAllDeviceFunctionList())
                        {
                            switch (function.functionCategory)
                            {
                                case FunctionCategory.Light:
                                case FunctionCategory.Electrical:
                                case FunctionCategory.SwitchDevice:
                                case FunctionCategory.Curtain:
                                case FunctionCategory.Thermostat:
                                    DriverLayer.Control.Ins.SendReadCommand(function);
                                    break;
                            }
                        }
                    }
                }